[brcm63xx] fix board patches so that new boards are withing appropriate ifdef

Some new board definitions were added within the #ifdef CONFIG_CPU_6338
section while some other were added within #ifdef CONFIG_CPU_6345, fix this

SVN-Revision: 32060

diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index f5615294340e159106fbcb17010f1fd316d652f3..c8da9932d4433d5f320069dd78b5dd58ed943537 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,12 +29,16 @@
+@@ -30,12 +30,16 @@
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
@@ -17,7 +17,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
+@@ -726,6 +730,29 @@ static int board_get_mac_address(u8 *mac
        return 0;
  }
  
@@ -47,7 +47,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -766,6 +793,11 @@ void __init board_prom_init(void)
+@@ -767,6 +794,11 @@ void __init board_prom_init(void)
                return;
        }
  

diff --git a/target/linux/brcm63xx/patches-3.3/307-MIPS-BCM63XX-explicitly-register-the-pci-bus.patch b/target/linux/brcm63xx/patches-3.3/307-MIPS-BCM63XX-explicitly-register-the-pci-bus.patch
index 284a7590e13988f2c0badcb40b1b64efa193330e..a502a66a2cab9f9dc1bbfa485d9825a61afa96b7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/307-MIPS-BCM63XX-explicitly-register-the-pci-bus.patch
+++ b/target/linux/brcm63xx/patches-3.3/307-MIPS-BCM63XX-explicitly-register-the-pci-bus.patch
@@ -16,7 +16,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -825,7 +825,6 @@ void __init board_prom_init(void)
+@@ -826,7 +826,6 @@ void __init board_prom_init(void)
  
  #ifdef CONFIG_PCI
        if (board.has_pci) {
@@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;
        }
-@@ -997,5 +996,10 @@ int __init board_register_devices(void)
+@@ -998,5 +997,10 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  

diff --git a/target/linux/brcm63xx/patches-3.3/308-MIPS-BCM63XX-move-flash-registration-out-of-board_bc.patch b/target/linux/brcm63xx/patches-3.3/308-MIPS-BCM63XX-move-flash-registration-out-of-board_bc.patch
index f62a335c0d2f67fd6741c391fb6ce8fba74caf91..35f40186ca4f74a5fdac314a5966ed9ae031c86e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/308-MIPS-BCM63XX-move-flash-registration-out-of-board_bc.patch
+++ b/target/linux/brcm63xx/patches-3.3/308-MIPS-BCM63XX-move-flash-registration-out-of-board_bc.patch
@@ -39,7 +39,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  #include <linux/ssb/ssb.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
-@@ -26,6 +23,7 @@
+@@ -27,6 +24,7 @@
  #include <bcm63xx_dev_pci.h>
  #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_dsp.h>
@@ -47,7 +47,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
-@@ -865,40 +863,6 @@ void __init board_setup(void)
+@@ -866,40 +864,6 @@ void __init board_setup(void)
                panic("unexpected CPU for bcm963xx board");
  }
  
@@ -88,7 +88,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  static struct gpio_led_platform_data bcm63xx_led_data;
  
  static struct platform_device bcm63xx_gpio_leds = {
-@@ -922,7 +886,6 @@ static struct platform_device bcm63xx_gp
+@@ -923,7 +887,6 @@ static struct platform_device bcm63xx_gp
   */
  int __init board_register_devices(void)
  {
@@ -96,7 +96,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        int button_count = 0;
        int led_count = 0;
  
-@@ -967,14 +930,7 @@ int __init board_register_devices(void)
+@@ -968,14 +931,7 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  

diff --git a/target/linux/brcm63xx/patches-3.3/312-MIPS-BCM63XX-add-basic-BCM6328-CPU-support.patch b/target/linux/brcm63xx/patches-3.3/312-MIPS-BCM63XX-add-basic-BCM6328-CPU-support.patch
index 362848b8df3c6004c4ed3138cd48a04871259202..69d8ea13f04a27efe79b331f7ded14c4b337ee8d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/312-MIPS-BCM63XX-add-basic-BCM6328-CPU-support.patch
+++ b/target/linux/brcm63xx/patches-3.3/312-MIPS-BCM63XX-add-basic-BCM6328-CPU-support.patch
@@ -33,7 +33,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        select HW_HAS_PCI
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -760,9 +760,14 @@ void __init board_prom_init(void)
+@@ -761,9 +761,14 @@ void __init board_prom_init(void)
        char cfe_version[32];
        u32 val;
  

diff --git a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch
index 636e183d7cc2f4a60034d5a517ccd94f5588be09..fc7040978840a6c5ef02ee4136a29a38d43c1dc4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch
+++ b/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch
@@ -58,7 +58,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
  obj-y         += boards/
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
  #include <bcm63xx_dev_flash.h>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
@@ -66,7 +66,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
  #include <board_bcm963xx.h>
  #include <bcm_tag.h>
  
-@@ -911,6 +912,9 @@ int __init board_register_devices(void)
+@@ -912,6 +913,9 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
  

diff --git a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch
index 5a13013b62224f22f6951e380175324dc6d14d5f..f182961e466746124b751cb4076724b6b79cdd75 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch
+++ b/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch
@@ -41,7 +41,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device.
  obj-y         += boards/
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -27,6 +27,7 @@
+@@ -28,6 +28,7 @@
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <bcm63xx_dev_usb_ohci.h>
@@ -49,7 +49,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device.
  #include <board_bcm963xx.h>
  #include <bcm_tag.h>
  
-@@ -912,6 +913,9 @@ int __init board_register_devices(void)
+@@ -913,6 +914,9 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
  

diff --git a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch
index 0f3b49b5e46d2c702b8d467e4c1daacaba5b7d34..e504552f3dffedbd3a6bb15c5f077998cc07ec6c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch
+++ b/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -850,6 +850,8 @@ void __init board_prom_init(void)
+@@ -851,6 +851,8 @@ void __init board_prom_init(void)
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G3_EXT_MII |
                                GPIO_MODE_6348_G0_EXT_MII;

diff --git a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch
index b6e082a803c1a9c8e72fd202384f973fbc978c17..d6dbaa0bfa7bb527f92a8e55ac16cb1445c10cfa 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch
+++ b/target/linux/brcm63xx/patches-3.3/415-bcm63xx_enet-add-support-for-bcm6368-internal-ethern.patch
@@ -13,7 +13,7 @@ Subject: [PATCH 31/63] bcm63xx_enet: add support for bcm6368 internal ethernet s
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -915,6 +915,10 @@ int __init board_register_devices(void)
+@@ -916,6 +916,10 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
  

diff --git a/target/linux/brcm63xx/patches-3.3/418-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch b/target/linux/brcm63xx/patches-3.3/418-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch
index a5b5320363502aac7448395d48f114868704419c..a1f43bed2493566740c329858d81ca4eb7319a60 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/418-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch
+++ b/target/linux/brcm63xx/patches-3.3/418-MIPS-BCM63XX-add-HS-SPI-platform-device-and-register.patch
@@ -28,7 +28,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  obj-y         += boards/
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -24,6 +24,7 @@
+@@ -25,6 +25,7 @@
  #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_dsp.h>
  #include <bcm63xx_dev_flash.h>
@@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
  #include <bcm63xx_dev_usb_ohci.h>
-@@ -940,6 +941,7 @@ int __init board_register_devices(void)
+@@ -941,6 +942,7 @@ int __init board_register_devices(void)
                        pr_err(PFX "failed to register fallback SPROM\n");
        }
  #endif

diff --git a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
index bc00967802afc95de3403674e02e92d3e59a3660..4afbe23cc815c840ce85fa31c2833110b4e53631 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
+++ b/target/linux/brcm63xx/patches-3.3/421-MIPS-BCM63XX-move-nvram-related-functions-into-their.patch
@@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
  #include <bcm63xx_dev_uart.h>
  #include <bcm63xx_regs.h>
  #include <bcm63xx_io.h>
@@ -37,7 +37,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  #include <bcm63xx_dev_pci.h>
  #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_dsp.h>
-@@ -40,8 +41,6 @@
+@@ -41,8 +42,6 @@
  #define CFE_OFFSET_64K                0x10000
  #define CFE_OFFSET_128K               0x20000
  
@@ -46,7 +46,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  static struct board_info board;
  
  /*
-@@ -695,50 +694,16 @@ const char *board_get_name(void)
+@@ -696,50 +695,16 @@ const char *board_get_name(void)
        return board.name;
  }
  
@@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                        /* No tag found */
                        printk(KERN_DEBUG "No bcm_tag found!\n");
                        return;
-@@ -748,9 +713,9 @@ static void __init boardid_fixup(u8 *boo
+@@ -749,9 +714,9 @@ static void __init boardid_fixup(u8 *boo
        if (tag->information1[0] != '+')
                return;
  
@@ -112,7 +112,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  }
  
  /*
-@@ -758,9 +723,10 @@ static void __init boardid_fixup(u8 *boo
+@@ -759,9 +724,10 @@ static void __init boardid_fixup(u8 *boo
   */
  void __init board_prom_init(void)
  {
@@ -125,7 +125,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        u32 val;
  
        /* read base address of boot chip select (0)
-@@ -782,32 +748,19 @@ void __init board_prom_init(void)
+@@ -783,32 +749,19 @@ void __init board_prom_init(void)
                strcpy(cfe_version, "unknown");
        printk(KERN_INFO PFX "CFE version: %s\n", cfe_version);
  
@@ -162,7 +162,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                        continue;
                /* copy, board desc array is marked initdata */
                memcpy(&board, bcm963xx_boards[i], sizeof(board));
-@@ -817,7 +770,7 @@ void __init board_prom_init(void)
+@@ -818,7 +771,7 @@ void __init board_prom_init(void)
        /* bail out if board is not found, will complain later */
        if (!board.name[0]) {
                char name[17];
@@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                name[16] = 0;
                printk(KERN_ERR PFX "unknown bcm963xx board: %s\n",
                       name);
-@@ -909,15 +862,15 @@ int __init board_register_devices(void)
+@@ -910,15 +863,15 @@ int __init board_register_devices(void)
                bcm63xx_pcmcia_register();
  
        if (board.has_enet0 &&
@@ -190,7 +190,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                bcm63xx_enetsw_register(&board.enetsw);
  
        if (board.has_ehci0)
-@@ -933,7 +886,7 @@ int __init board_register_devices(void)
+@@ -934,7 +887,7 @@ int __init board_register_devices(void)
         * do this after registering enet devices
         */
  #ifdef CONFIG_SSB_PCIHOST

diff --git a/target/linux/brcm63xx/patches-3.3/425-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.3/425-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index d4085052bad5a492b39cbd8a84d60a26aa1bbc6b..f0b1cbf21f3c24ad8c1b81e7a90118c7d3ced278 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/425-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.3/425-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
  #include <bcm63xx_dev_usb_ehci.h>
  #include <board_bcm963xx.h>
  #include <bcm_tag.h>
@@ -18,7 +18,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
  
  #define PFX   "board_bcm963xx: "
  
-@@ -851,6 +852,7 @@ int __init board_register_devices(void)
+@@ -852,6 +853,7 @@ int __init board_register_devices(void)
  {
        int button_count = 0;
        int led_count = 0;
@@ -26,7 +26,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
  
        if (board.has_uart0)
                bcm63xx_uart_register(0);
-@@ -886,7 +888,8 @@ int __init board_register_devices(void)
+@@ -887,7 +889,8 @@ int __init board_register_devices(void)
         * do this after registering enet devices
         */
  #ifdef CONFIG_SSB_PCIHOST
@@ -36,7 +36,7 @@ Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                if (ssb_arch_register_fallback_sprom(
-@@ -931,5 +934,9 @@ int __init board_register_devices(void)
+@@ -932,5 +935,9 @@ int __init board_register_devices(void)
                bcm63xx_pci_register();
  #endif
  

diff --git a/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
index a8a56f6658424ae35c9296ecdba3a3ed00c3a2c8..0a406faed17bc7ed6bda154a5c2fa1fffe5e3df6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-3.3/430-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
@@ -11,7 +11,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -907,7 +907,7 @@ int __init board_register_devices(void)
+@@ -908,7 +908,7 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  

diff --git a/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
index 383926a593e29c8b5577b2300d4cb9f59621e05c..e1283596e5ed9748343ff5f3ab1575c9170c75d9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -131,6 +131,55 @@ static struct board_info __initdata boar
-               },
-       },
+@@ -469,6 +469,54 @@ static struct board_info __initdata boar
+ 
+       .has_ohci0 = 1,
  };
 +
 +static struct board_info __initdata board_96348_D4PW = {
@@ -52,11 +52,10 @@
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -639,6 +688,7 @@ static const struct board_info __initdat
+@@ -640,6 +688,7 @@ static const struct board_info __initdat
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,

diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
index 8a4d3928d8cb2345f695f58963f58e73d8f00a78..2c61c550268a6bc07a2af044e212cbf543808a8e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
@@ -1,16 +1,15 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -14,6 +14,9 @@
- #include <linux/ssb/ssb.h>
+@@ -15,6 +15,8 @@
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
-+#include <linux/spi/spi.h>
+ #include <linux/spi/spi.h>
 +#include <linux/spi/spi_gpio.h>
 +#include <linux/spi/74x164.h>
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -42,6 +45,12 @@
+@@ -43,6 +45,12 @@
  #define CFE_OFFSET_64K                0x10000
  #define CFE_OFFSET_128K               0x20000
  
@@ -23,7 +22,7 @@
  static struct board_info board;
  
  /*
-@@ -666,6 +675,496 @@ static struct board_info __initdata boar
+@@ -666,6 +674,496 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -520,7 +519,7 @@
  #endif
  
  /*
-@@ -696,9 +1195,31 @@ static const struct board_info __initdat
+@@ -696,9 +1194,31 @@ static const struct board_info __initdat
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -552,7 +551,7 @@
  /*
   * Register a sane SPROMv2 to make the on-board
   * bcm4318 WLAN work
-@@ -807,6 +1328,9 @@ void __init board_prom_init(void)
+@@ -807,6 +1327,9 @@ void __init board_prom_init(void)
                boardid_fixup(boot_addr);
        }
  
@@ -562,3 +561,14 @@
        board_name = bcm63xx_nvram_get_name();
        /* find board by name */
        for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -52,7 +52,7 @@ struct board_info {
+       struct bcm63xx_dsp_platform_data dsp;
+ 
+       /* GPIO LEDs */
+-      struct gpio_led leds[5];
++      struct gpio_led leds[9];
+ 
+       /* Buttons */
+       struct gpio_keys_button buttons[4];

diff --git a/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
index 067b883d041036f9903e6fbd55cd72861b991ea1..ff27572ba8e3abd672b72df5b924c4ece37bd7ea 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -201,6 +201,38 @@ static struct board_info __initdata boar
- 
-       .has_uart0                      = 1,
+@@ -140,6 +140,38 @@ static struct board_info __initdata boar
+               },
+       },
  };
 +
 +static struct board_info __initdata board_96338w2_e7t = {
@@ -39,7 +39,7 @@
  #endif
  
  /*
-@@ -1174,6 +1206,7 @@ static const struct board_info __initdat
+@@ -1173,6 +1205,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,

diff --git a/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
index 23b6268afd585023aa803779c5623862e0498e17..3d00133b6f4be341882d688263b6b77623e57bc5 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -664,6 +664,98 @@ static struct board_info __initdata boar
+@@ -663,6 +663,98 @@ static struct board_info __initdata boar
        },
  };
  
@@ -99,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -1227,6 +1319,7 @@ static const struct board_info __initdat
+@@ -1226,6 +1318,7 @@ static const struct board_info __initdat
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
@@ -107,3 +107,14 @@
        &board_DWVS0,
        &board_nb4_ser_r0,
        &board_nb4_ser_r1,
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -52,7 +52,7 @@ struct board_info {
+       struct bcm63xx_dsp_platform_data dsp;
+ 
+       /* GPIO LEDs */
+-      struct gpio_led leds[9];
++      struct gpio_led leds[10];
+ 
+       /* Buttons */
+       struct gpio_keys_button buttons[4];

diff --git a/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
index e11207b4f388785ef31f6358560f0329d3ab9a8d..ba10d15c2a516309fe3fcbd8cd43cd9f7db444bc 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -800,6 +800,59 @@ static struct board_info __initdata boar
+@@ -799,6 +799,59 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
@@ -60,7 +60,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
        .sck            = NB4_SPI_GPIO_CLK,
        .mosi           = NB4_SPI_GPIO_MOSI,
-@@ -1321,6 +1374,7 @@ static const struct board_info __initdat
+@@ -1320,6 +1373,7 @@ static const struct board_info __initdat
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,

diff --git a/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
index 8c2402677af2e07c6d5a17b99da58a6b6ade721a..520678d9eb8719c436e674a2bac9045efb46e056 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
@@ -1,9 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -189,6 +189,67 @@ static struct board_info __initdata boar
+@@ -557,6 +557,67 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
++
 +static struct board_info __initdata board_spw500v = {
 +      .name                           = "SPW500V",
 +      .expected_cpu_id                = 0x6348,
@@ -64,11 +65,10 @@
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -1366,6 +1427,7 @@ static const struct board_info __initdat
+@@ -1365,6 +1426,7 @@ static const struct board_info __initdat
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,

diff --git a/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
index d5bde815e64f43b1f61beaf3b36f136e66cccd9a..5547222d7111d1b220d2a0db8bde71f3b3780151 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -536,6 +536,112 @@ static struct board_info __initdata boar
+@@ -426,6 +426,112 @@ static struct board_info __initdata boar
        },
  };
  
@@ -113,7 +113,7 @@
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -1420,6 +1526,8 @@ static const struct board_info __initdat
+@@ -1419,6 +1525,8 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,

diff --git a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
index 274afe12a4ade383e2631dfbdc60f5e239bc47bb..63d9e14d7ef34347c2df2b07796f68a7bcf4b8ab 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
@@ -1,12 +1,13 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -250,6 +250,76 @@ static struct board_info __initdata boar
+@@ -724,6 +724,76 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
++
 +static struct board_info __initdata board_96348sv = {
 +      .name                           = "MAGIC",
-+      .expected_cpu_id        = 0x6348,
++      .expected_cpu_id                = 0x6348,
 +
 +      .has_uart0                      = 1,
 +      .has_enet0                      = 1,
@@ -14,11 +15,11 @@
 +      .has_pci                        = 1,
 +
 +      .enet0 = {
-+              .has_phy                        = 1,
++              .has_phy                = 1,
 +              .use_internal_phy       = 1,
 +      },
 +      .enet1 = {
-+              /* is has BP_ENET_EXTERNAL_PHY */
++              /* it has BP_ENET_EXTERNAL_PHY */
 +              .force_speed_100        = 1,
 +              .force_duplex_full      = 1,
 +      },
@@ -31,7 +32,7 @@
 +      .dsp = {
 +              .gpio_rst               = 25,
 +              .gpio_int               = 34,
-+              .cs                             = 2,
++              .cs                     = 2,
 +              .ext_irq                = 2,
 +      },
 +
@@ -73,11 +74,10 @@
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -1536,6 +1606,7 @@ static const struct board_info __initdat
+@@ -1535,6 +1605,7 @@ static const struct board_info __initdat
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
index 0f7fb3061d9c6e9cc49e583d07e2b29f0bc9ecd3..43f6b73ad896d669bd673d11c5845fa26eec316a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1579,6 +1579,81 @@ static struct board_info __initdata boar
+@@ -1578,6 +1578,81 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -82,7 +82,7 @@
  #endif
  
  /*
-@@ -1621,6 +1696,7 @@ static const struct board_info __initdat
+@@ -1620,6 +1695,7 @@ static const struct board_info __initdat
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
index 214d6e0b9f8098be9c2d4c83e4cea71d36ec7b6b..79251f4eaae05aaa3d9ca8c910efe45c1bfe6496 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -364,6 +364,43 @@ static struct board_info __initdata boar
+@@ -172,6 +172,43 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -44,7 +44,7 @@
  #endif
  
  /*
-@@ -1664,6 +1701,7 @@ static const struct board_info __initdat
+@@ -1663,6 +1700,7 @@ static const struct board_info __initdat
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,

diff --git a/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
index c68c678b9cbfbde3f2e290bc8b11cfbe123a1cf7..9bbde4b016686c7f4b0ae4f01a86722bfac6f7c8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1691,6 +1691,72 @@ static struct board_info __initdata boar
+@@ -1690,6 +1690,72 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -73,7 +73,7 @@
  #endif
  
  /*
-@@ -1735,6 +1801,7 @@ static const struct board_info __initdat
+@@ -1734,6 +1800,7 @@ static const struct board_info __initdat
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_HW553,

diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
index 96342f79a86c4ec5d1b83b143c752fc96867b15d..419f3a0ae329dfd8ed2c835cdf8678be8ee9f99d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
@@ -1,11 +1,12 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -320,6 +320,63 @@ static struct board_info __initdata boar
+@@ -831,6 +831,63 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
-+      static struct board_info __initdata board_V2500V_BB = {
-+        .name                           = "V2500V_BB",
++
++static struct board_info __initdata board_V2500V_BB = {
++      .name                           = "V2500V_BB",
 +        .expected_cpu_id                = 0x6348,
 +
 +        .has_uart0                      = 1,
@@ -20,9 +21,9 @@
 +        .enet1 = {
 +                .force_speed_100        = 1,
 +                .force_duplex_full      = 1,
-+        },
++      },
 +
-+      .leds = {
++      .leds = {
 +              {
 +                      .name           = "power:green",
 +                      .gpio           = 0,
@@ -60,11 +61,10 @@
 +              },
 +      },
 +};
-+
  #endif
  
  /*
-@@ -1786,6 +1843,7 @@ static const struct board_info __initdat
+@@ -1785,6 +1842,7 @@ static const struct board_info __initdat
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -72,7 +72,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1912,6 +1970,23 @@ void __init board_prom_init(void)
+@@ -1911,6 +1969,23 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
index 647b9bf2dd4078103c6aea45664fc9f3f58d4996..d7f583cd570fa3460ea63a4a9f9537418d69f7e6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -632,6 +632,62 @@ static struct board_info __initdata boar
+@@ -395,6 +395,62 @@ static struct board_info __initdata boar
        },
  };
  
@@ -63,7 +63,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1844,6 +1900,7 @@ static const struct board_info __initdat
+@@ -1843,6 +1899,7 @@ static const struct board_info __initdat
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

diff --git a/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
index 3f1a8475d1784459e7245850038c65e4ec66052d..756b2a369bddc51a65659ca705d42d821468dc9a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -688,6 +688,49 @@ static struct board_info __initdata boar
+@@ -451,6 +451,49 @@ static struct board_info __initdata boar
  };
  
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -1901,6 +1944,7 @@ static const struct board_info __initdat
+@@ -1900,6 +1943,7 @@ static const struct board_info __initdat
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,

diff --git a/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
index 4ab5353268798e8ace667dd95a04b8b65cc07fb6..d10af1c7ecd0e77e08ce75ee6eb49c2e08df78d7 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1213,6 +1213,8 @@ static struct board_info __initdata boar
+@@ -1212,6 +1212,8 @@ static struct board_info __initdata boar
        .name                           = "DWV-S0",
        .expected_cpu_id                = 0x6358,
  
@@ -9,7 +9,7 @@
        .has_enet0                      = 1,
        .has_enet1                      = 1,
        .has_pci                        = 1,
-@@ -1228,6 +1230,7 @@ static struct board_info __initdata boar
+@@ -1227,6 +1229,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
index 9891b3f905d46380009f86cae7fafc3bf5123df4..00da3a29d0fff2c25e47929a4767d6fe8abe1487 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -377,6 +377,67 @@ static struct board_info __initdata boar
+@@ -494,6 +494,67 @@ static struct board_info __initdata boar
        },
  };
  
@@ -65,10 +65,10 @@
 +      },
 +};
 +
- #endif
- 
- /*
-@@ -1948,6 +2009,7 @@ static const struct board_info __initdat
+ static struct board_info __initdata board_96348gw = {
+       .name                           = "96348GW",
+       .expected_cpu_id                = 0x6348,
+@@ -1947,6 +2008,7 @@ static const struct board_info __initdat
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,

diff --git a/target/linux/brcm63xx/patches-3.3/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.3/517-RTA1205W_16_uart_fixes.patch
index 121a6640197e19366d6717cbb2b07ade710d4e34..63eccd26cfff00633db12f642f6d6703203ec9f4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.3/517-RTA1205W_16_uart_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -994,6 +994,7 @@ static struct board_info __initdata boar
+@@ -757,6 +757,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  

diff --git a/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
index 094d9d7ea376a1c41e4b9446cdccf17c4cfa7dce..d272bdb78aa268c0af1f82eac42e84c7c32c2b4e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
@@ -1,9 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -438,6 +438,42 @@ static struct board_info __initdata boar
+@@ -1049,6 +1049,44 @@ static struct board_info __initdata boar
+               },
        },
  };
- 
++
 +static struct board_info __initdata board_CPVA502plus = {
 +      .name                           = "CPVA502+",
 +      .expected_cpu_id                = 0x6348,
@@ -40,10 +41,11 @@
 +              },
 +      },
 +};
++
  #endif
  
  /*
-@@ -2011,6 +2047,7 @@ static const struct board_info __initdat
+@@ -2010,6 +2048,7 @@ static const struct board_info __initdat
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 7ca4c540796225f63c0b550f72474f3f5af9616c..94526ccc314b6af636ae8ebad5ad1498533d8cc6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2017,6 +2017,80 @@ static struct board_info __initdata boar
+@@ -2018,6 +2018,80 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -91,7 +91,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initdata *bcm963xx_boards[] = {
-@@ -2065,6 +2139,10 @@ static const struct board_info __initdat
+@@ -2066,6 +2140,10 @@ static const struct board_info __initdat
        &board_HW553,
        &board_spw303v,
  #endif
@@ -102,7 +102,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static void __init nb4_nvram_fixup(void)
-@@ -2242,12 +2320,25 @@ void __init board_prom_init(void)
+@@ -2243,12 +2321,25 @@ void __init board_prom_init(void)
        if (board.has_pci) {
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;

diff --git a/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 7ccd10c7fa01a40d5bbc44fb3eba050e30c4a207..b743a952780a882e0da95247148431fdd0dafe39 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2088,6 +2088,72 @@ static struct board_info __initdata boar
+@@ -2089,6 +2089,72 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  
  /*
-@@ -2142,6 +2208,7 @@ static const struct board_info __initdat
+@@ -2143,6 +2209,7 @@ static const struct board_info __initdat
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,

diff --git a/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
index 32c1b1d856062aa13aca4b3a80426bfa4e3e3795..cbf1879926dbd7f0b8814391c80ba6d4f4a83128 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
@@ -90,7 +90,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
   * known 6338 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -2160,6 +2234,9 @@ static struct board_info __initdata boar
+@@ -2161,6 +2235,9 @@ static struct board_info __initdata boar
   * all boards
   */
  static const struct board_info __initdata *bcm963xx_boards[] = {

diff --git a/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 928d6ab19f2c9022ebcd31e411ffb55d5b953335..a5f3ce95e4c43be887c0443cc5e6c59067eb2cbe 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2236,6 +2306,7 @@ static struct board_info __initdata boar
+@@ -2237,6 +2307,7 @@ static struct board_info __initdata boar
  static const struct board_info __initdata *bcm963xx_boards[] = {
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
index 9940fec65f020d87806ced7d70bff656c4d6e25f..53c0af2c70a902206864d6630a8f4f48cb574aac 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
@@ -120,7 +120,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2307,6 +2410,7 @@ static const struct board_info __initdat
+@@ -2308,6 +2411,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
index 94be834d0d6ab80bfa8fa3ed2511bde9ec56d295..0fd10b155e010527567bb3015b4c5580e9ad6f5b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1552,6 +1552,99 @@ static struct board_info __initdata boar
+@@ -1553,6 +1553,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
@@ -106,7 +106,7 @@
        struct bcm63xx_dsp_platform_data dsp;
  
        /* GPIO LEDs */
--      struct gpio_led leds[5];
+-      struct gpio_led leds[10];
 +      struct gpio_led leds[14];
  
        /* Buttons */

diff --git a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
index 7e99c4beb90cfe5ce57956ea116136873f2c4494..cb86b61388949d97992499ba35e6f8ce7c79c89c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1332,6 +1332,19 @@ static struct board_info __initdata boar
+@@ -1059,6 +1059,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,
@@ -18,5 +18,5 @@
 +              }
 +      },
  };
- #endif
  
+ static struct board_info __initdata board_96348_D4PW = {

diff --git a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
index 914bf38443908568eafec8c68a8d211dd78c1ab2..a07e6fdf29c9dbdfb0805f2fb48bebd6350195ca 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -910,6 +910,17 @@ static struct board_info __initdata boar
+@@ -576,6 +576,17 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },

diff --git a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
index 237f2cb9d3e5a0bfc9b0fbfa34fc656efd0170b8..569e9ae9d42d1d6c060535627151939853ca9307 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -2603,7 +2604,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2604,7 +2605,7 @@ static void __init nb4_nvram_fixup(void)
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
        .revision               = 0x02,
        .board_rev              = 0x17,
        .country_code           = 0x0,
-@@ -2623,6 +2624,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2624,6 +2625,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };