Merge tag 'blackfin-for-linus' of... (951a730a) · Commits · 戴 / test

arch/blackfin/boot/.gitignore

+1 −0

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* arch/blackfin/mach-common/scb-init.c - reprogram system cross bar priority
		*
		* Copyright 2012 Analog Devices Inc.
		*
		* Licensed under the GPL-2 or later.
		*/

		#define SCB_SLOT_OFFSET 24
		#define SCB_MI_MAX_SLOT 32

		struct scb_mi_prio {
		unsigned long scb_mi_arbr;
		unsigned long scb_mi_arbw;
		unsigned char scb_mi_slots;
		unsigned char scb_mi_prio[SCB_MI_MAX_SLOT];
		};

		extern struct scb_mi_prio scb_data[];

		extern void init_scb(void);

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@
		#ifdef CONFIG_BF60x
		#include <mach/pm.h>
		#endif
		#ifdef CONFIG_SCB_PRIORITY
		#include <asm/scb.h>
		#endif

		u16 _bfin_swrst;
		EXPORT_SYMBOL(_bfin_swrst);
		@@ -1101,6 +1104,9 @@ void __init setup_arch(char **cmdline_p)
		#endif
		init_exception_vectors();
		bfin_cache_init(); /* Initialize caches for the boot CPU */
		#ifdef CONFIG_SCB_PRIORITY
		init_scb();
		#endif
		}

		static int __init topology_init(void)

+1655 −0

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,4 @@

		obj-y := dma.o clock.o ints-priority.o
		obj-$(CONFIG_PM) += pm.o dpm.o
		obj-$(CONFIG_SCB_PRIORITY) += scb.o