Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951a730a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'blackfin-for-linus' of... 

Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

Pull blackfin updates from Steven Miao.

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: Ignore generated uImages
  blackfin: Add STMMAC platform data to enable dwmac1000 driver on BF60x.
  bf609: adv7343: add S-Video and Component output support
  bf609: add adv7343 video encoder support
  clock: add stmmac clock for ethernet driver
  blackfin: scb: Add SCB1 to SCB9 config options and data.
  blackfin: scb: Add system crossbar init code.
parents 0898d2aa 08b67faa

arch/blackfin/boot/.gitignore

+1 −0
Original line number Diff line number Diff line 
vmImage*

vmlinux*

uImage*

arch/blackfin/include/asm/scb.h

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);

arch/blackfin/kernel/setup.c

+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)

arch/blackfin/mach-bf609/Kconfig

+1655 −0

File changed.

Preview size limit exceeded, changes collapsed.

arch/blackfin/mach-bf609/Makefile

+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