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/030-bcm47xx-bcma-nandflash.patch | |
| parent | ab2cb9ce613c0f9de0d436926ea58ab25cff5074 (diff) | |
| download | upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.gz upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.bz2 upstream-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/030-bcm47xx-bcma-nandflash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch index 8f84bd2aba..2a127e7540 100644 --- a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch +++ b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm47xx/Kconfig +++ b/arch/mips/bcm47xx/Kconfig -@@ -24,6 +24,7 @@ config BCM47XX_BCMA - select BCMA_DRIVER_MIPS +@@ -25,6 +25,7 @@ config BCM47XX_BCMA + select BCMA_HOST_PCI if PCI select BCMA_DRIVER_PCI_HOSTMODE if PCI select BCMA_SFLASH + select BCMA_NFLASH @@ -115,7 +115,7 @@ @@ -4,6 +4,7 @@ * Copyright (C) 2006 Michael Buesch <m@bues.ch> * Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org> - * Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> + * Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de> + * Copyright (C) 2011-2012 Tathagata Das <tathagata@alumnux.com> * * This program is free software; you can redistribute it and/or modify it @@ -148,17 +148,17 @@ static void bcm47xx_machine_restart(char *command) { printk(KERN_ALERT "Please stand by while rebooting the system...\n"); -@@ -369,6 +384,9 @@ static void __init bcm47xx_register_bcma +@@ -248,6 +263,9 @@ 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); + + if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH) + bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc); - } - static int __init bcm47xx_register_flash_bcma(void) -@@ -383,6 +401,9 @@ static int __init bcm47xx_register_flash + bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); + } +@@ -264,6 +282,9 @@ static int __init bcm47xx_register_flash case BCMA_SFLASH: bcm47xx_sflash_dev.dev.platform_data = &bcm47xx_sflash; return platform_device_register(&bcm47xx_sflash_dev); |