diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
| commit | e0837a51f0deb1c30b26076779ca7a19ad8ada79 (patch) | |
| tree | 7e17f8c0309a8f8ef6dd164a6ecad804d4b81ff9 /target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch | |
| parent | ab2cb9ce613c0f9de0d436926ea58ab25cff5074 (diff) | |
| download | master-31e0f0ae-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.gz master-31e0f0ae-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.bz2 master-31e0f0ae-e0837a51f0deb1c30b26076779ca7a19ad8ada79.zip | |
brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.
SVN-Revision: 32845
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch b/target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch index 5fc568fc04..7de051dad9 100644 --- a/target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch +++ b/target/linux/brcm47xx/patches-3.3/028-bcm47xx-register-flash-drivers.patch @@ -8,9 +8,9 @@ default y help Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support. -@@ -22,6 +23,7 @@ config BCM47XX_BCMA - select BCMA_HOST_SOC +@@ -23,6 +24,7 @@ config BCM47XX_BCMA select BCMA_DRIVER_MIPS + select BCMA_HOST_PCI if PCI select BCMA_DRIVER_PCI_HOSTMODE if PCI + select BCMA_SFLASH default y @@ -64,7 +64,7 @@ static void bcm47xx_machine_restart(char *command) { printk(KERN_ALERT "Please stand by while rebooting the system...\n"); -@@ -310,6 +338,24 @@ static void __init bcm47xx_register_ssb( +@@ -156,6 +184,24 @@ static void __init bcm47xx_register_ssb( } } } @@ -89,9 +89,9 @@ #endif #ifdef CONFIG_BCM47XX_BCMA -@@ -324,6 +370,24 @@ static void __init bcm47xx_register_bcma - if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_SFLASH) - bcm47xx_sflash_struct_bcma_init(&bcm47xx_sflash, &bcm47xx_bus.bcma.bus.drv_cc); +@@ -205,6 +251,24 @@ static void __init bcm47xx_register_bcma + + bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); } + +static int __init bcm47xx_register_flash_bcma(void) @@ -114,7 +114,7 @@ #endif void __init plat_mem_setup(void) -@@ -366,3 +430,19 @@ static int __init bcm47xx_register_bus_c +@@ -247,3 +311,19 @@ static int __init bcm47xx_register_bus_c return 0; } device_initcall(bcm47xx_register_bus_complete); |