brcm63xx: add USB support to BCM6318

BCM6318 has a special initialization sequence which involves touching
PLL control registers in the USBH_PRIV register space, as well as
toggling a bit the Simulation control register.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39302

diff --git a/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch b/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
new file mode 100644 (file)
index 0000000..5943481
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
@@ -0,0 +1,121 @@
+--- a/arch/mips/bcm63xx/usb-common.c
++++ b/arch/mips/bcm63xx/usb-common.c
+@@ -109,6 +109,27 @@ void bcm63xx_usb_priv_ohci_cfg_set(void)
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
+               reg |= USBH_PRIV_SETUP_IOC_MASK;
+               bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
++      } else if (BCMCPU_IS_6318()) {
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
++              reg |= USBH_PRIV_PLL_CTRL1_SUSP_EN;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6318_REG);
++              reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
++              reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6318_REG);
++              reg |= USBH_PRIV_SETUP_IOC_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
++              reg &= ~USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SIM_CTRL_6318_REG);
++              reg |= USBH_PRIV_SIM_CTRL_LADDR_SEL;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SIM_CTRL_6318_REG);
+       }
+ 
+       spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
+@@ -144,6 +165,27 @@ void bcm63xx_usb_priv_ehci_cfg_set(void)
+               reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6368_REG);
+               reg |= USBH_PRIV_SETUP_IOC_MASK;
+               bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6368_REG);
++      } else if (BCMCPU_IS_6318()) {
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
++              reg |= USBH_PRIV_PLL_CTRL1_SUSP_EN;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_6318_REG);
++              reg &= ~USBH_PRIV_SWAP_EHCI_ENDN_MASK;
++              reg |= USBH_PRIV_SWAP_EHCI_DATA_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SETUP_6318_REG);
++              reg |= USBH_PRIV_SETUP_IOC_MASK;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SETUP_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_PLL_CTRL1_6318_REG);
++              reg &= ~USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_PLL_CTRL1_6318_REG);
++
++              reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SIM_CTRL_6318_REG);
++              reg |= USBH_PRIV_SIM_CTRL_LADDR_SEL;
++              bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SIM_CTRL_6318_REG);
+       }
+ 
+       spin_unlock_irqrestore(&usb_priv_reg_lock, flags);
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -800,6 +800,12 @@
+ #define GPIO_MODE_6368_SPI_SSN4               (1 << 30)
+ #define GPIO_MODE_6368_SPI_SSN5               (1 << 31)
+ 
++#define GPIO_PINMUX_SEL0_6318         0x1c
++#define GPIO_PINMUX_SEL0_GPIO13_SHIFT 26
++#define GPIO_PINMUX_SEL0_GPIO13_MASK  (0x3 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
++#define GPIO_PINMUX_SEL0_GPIO13_PWRON (1 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
++#define GPIO_PINMUX_SEL0_GPIO13_LED   (2 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
++#define GPIO_PINMUX_SEL0_GPIO13_GPIO  (3 << GPIO_PINMUX_SEL0_GPIO13_SHIFT)
+ 
+ #define GPIO_PINMUX_OTHR_REG          0x24
+ #define GPIO_PINMUX_OTHR_6328_USB_SHIFT 12
+@@ -1118,6 +1124,7 @@
+ 
+ #define USBH_PRIV_SWAP_6358_REG               0x0
+ #define USBH_PRIV_SWAP_6368_REG               0x1c
++#define USBH_PRIV_SWAP_6318_REG               0x0c
+ 
+ #define USBH_PRIV_SWAP_USBD_SHIFT     6
+ #define USBH_PRIV_SWAP_USBD_MASK      (1 << USBH_PRIV_SWAP_USBD_SHIFT)
+@@ -1143,6 +1150,13 @@
+ #define USBH_PRIV_SETUP_IOC_SHIFT     4
+ #define USBH_PRIV_SETUP_IOC_MASK      (1 << USBH_PRIV_SETUP_IOC_SHIFT)
+ 
++#define USBH_PRIV_SETUP_6318_REG      0x00
++#define USBH_PRIV_PLL_CTRL1_6318_REG  0x04
++#define USBH_PRIV_PLL_CTRL1_SUSP_EN   (1 << 27)
++#define USBH_PRIV_PLL_CTRL1_IDDQ_PWRDN        (1 << 31)
++#define USBH_PRIV_SIM_CTRL_6318_REG   0x20
++#define USBH_PRIV_SIM_CTRL_LADDR_SEL  (1 << 5)
++
+ 
+ /*************************************************************************
+  * _REG relative to RSET_USBD
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -299,6 +299,7 @@ static struct board_info __initdata boar
+       .has_ohci0                      = 1,
+       .has_pccard                     = 1,
+       .has_ehci0                      = 1,
++      .has_ehci0                      = 1,
+ 
+       .has_dsp                        = 1,
+       .dsp = {
+@@ -914,6 +915,15 @@ void __init board_prom_init(void)
+       }
+ 
+       bcm_gpio_writel(val, GPIO_MODE_REG);
++
++#if IS_ENABLED(CONFIG_USB)
++      if (BCMCPU_IS_6318() && (board.has_ehci0 || board.has_ohci0)) {
++              val = bcm_gpio_readl(GPIO_PINMUX_SEL0_6318);
++              val &= ~GPIO_PINMUX_SEL0_GPIO13_MASK;
++              val |= GPIO_PINMUX_SEL0_GPIO13_PWRON;
++              bcm_gpio_writel(val, GPIO_PINMUX_SEL0_6318);
++      }
++#endif
+ }
+ 
+ /*

diff --git a/target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch
index 6c0c1f4021f18da3739bc17e2535a06101dff793..a1c01985c01ccfada48223a9f21b4161c3f96b2b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch
+++ b/target/linux/brcm63xx/patches-3.10/403-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
-@@ -911,6 +911,8 @@ void __init board_prom_init(void)
+@@ -912,6 +912,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.10/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/brcm63xx/patches-3.10/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch
index e7b3a403814b61a9f0c0325b7c3bc9c0ca92f183..577c03c5d450729df382b3b545790e76affcfc3e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch
+++ b/target/linux/brcm63xx/patches-3.10/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports
 
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -1077,6 +1077,19 @@
+@@ -1083,6 +1083,19 @@
  #define ENETSW_PORTOV_FDX_MASK                (1 << 1)
  #define ENETSW_PORTOV_LINKUP_MASK     (1 << 0)
  

diff --git a/target/linux/brcm63xx/patches-3.10/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-3.10/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
index 696c9a884a9734602b963edf67139234765bfa39..a740d4d1b59df04c16c69c5ec76545bb34d61ca8 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
+++ b/target/linux/brcm63xx/patches-3.10/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
@@ -115,7 +115,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                return -ENODEV;
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -818,6 +818,7 @@
+@@ -824,6 +824,7 @@
  #define GPIO_STRAPBUS_REG             0x40
  #define STRAPBUS_6358_BOOT_SEL_PARALLEL (1 << 1)
  #define STRAPBUS_6358_BOOT_SEL_SERIAL (0 << 1)
@@ -123,7 +123,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  #define STRAPBUS_6368_BOOT_SEL_MASK   0x3
  #define STRAPBUS_6368_BOOT_SEL_NAND   0
  #define STRAPBUS_6368_BOOT_SEL_SERIAL 1
-@@ -1668,6 +1669,7 @@
+@@ -1682,6 +1683,7 @@
  #define STRAPBUS_63268_FCVO_MASK      (0xf << STRAPBUS_63268_FCVO_SHIFT)
  
  #define MISC_STRAPBUS_6328_REG                0x240

diff --git a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index 51d58b58e5a9e3f3fb00df348902b2453e8f144e..448c3a2a570b2ede505dd1a8898b9a4921de5a5f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -18,7 +18,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  
  #include <uapi/linux/bcm933xx_hcs.h>
  #include <uapi/linux/bcm963xx_tag.h>
-@@ -958,6 +959,7 @@ int __init board_register_devices(void)
+@@ -968,6 +969,7 @@ int __init board_register_devices(void)
  {
        int button_count = 0;
        int led_count = 0;
@@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  
        if (board.has_uart0)
                bcm63xx_uart_register(0);
-@@ -996,7 +998,8 @@ int __init board_register_devices(void)
+@@ -1006,7 +1008,8 @@ int __init board_register_devices(void)
         * do this after registering enet devices
         */
  #ifdef CONFIG_SSB_PCIHOST
@@ -36,7 +36,7 @@ Subject: [PATCH 58/72] 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(
-@@ -1043,5 +1046,9 @@ int __init board_register_devices(void)
+@@ -1053,5 +1056,9 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  

diff --git a/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch b/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
index e6f4800b73c8b264e2bd370a02a1f9bf1a94ac10..55b2d143fe30e669206f171a3f5004cc04c048b4 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-3.10/418-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
-@@ -1018,7 +1018,7 @@ int __init board_register_devices(void)
+@@ -1028,7 +1028,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.10/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
index a8947ba53c7d1b887ff4e1f34db5eb8ac374b809..693ba528989713145b7908e424aff4de0acbd91e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
@@ -39,7 +39,7 @@
                return;
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1048,7 +1048,8 @@ int __init board_register_devices(void)
+@@ -1058,7 +1058,8 @@ int __init board_register_devices(void)
  
        /* register any fixups */
        for (i = 0; i < board.has_caldata; i++)

diff --git a/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
index bf0adeb59159e72ac2de804e56a774a0297279a9..6414c503cf6fa883edb8f97d0b9f2e74a0bf1714 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1049,7 +1049,7 @@ int __init board_register_devices(void)
+@@ -1059,7 +1059,7 @@ int __init board_register_devices(void)
        /* register any fixups */
        for (i = 0; i < board.has_caldata; i++)
                pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,

diff --git a/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
index 802fc926233f59691d8d99373b31d96dbdb8be71..f0f42d9f6d95403bca9880f0ca08dc6020e0fc7d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
+++ b/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
@@ -36,7 +36,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
  
  #include <uapi/linux/bcm933xx_hcs.h>
  #include <uapi/linux/bcm963xx_tag.h>
-@@ -1047,9 +1048,19 @@ int __init board_register_devices(void)
+@@ -1057,9 +1058,19 @@ int __init board_register_devices(void)
        }
  
        /* register any fixups */

diff --git a/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
index fb469703a5765f776c63709ededaddf1d62eb842..46268eb98482f07ef5ff90a6c633ed04e357c338 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -555,6 +555,56 @@ static struct board_info __initdata boar
+@@ -556,6 +556,56 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
  };
@@ -57,7 +57,7 @@
  #endif
  
  /*
-@@ -732,6 +782,7 @@ static const struct board_info __initcon
+@@ -733,6 +783,7 @@ static const struct board_info __initcon
        &board_DV201AMR,
        &board_96348gw_a,
        &board_rta1025w_16,

diff --git a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
index 94da7ba149e18e23466fd0f2552c7ed3a1649bb7..f9f45475d4506aebcf31ffa2588520c99814f304 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
@@ -22,7 +22,7 @@
  static struct board_info board;
  
  /*
-@@ -754,6 +762,596 @@ static struct board_info __initdata boar
+@@ -755,6 +763,596 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
@@ -619,7 +619,7 @@
  #endif
  
  /*
-@@ -790,6 +1388,11 @@ static const struct board_info __initcon
+@@ -791,6 +1389,11 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
@@ -631,7 +631,7 @@
  #endif
  };
  
-@@ -844,6 +1447,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -845,6 +1448,16 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();
  

diff --git a/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
index 5baa1d391de82f9c76987d6ca07ae6745fe3db81..2b1e9d46bfe677e61ca2a3e30763896d43d39d61 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
@@ -41,7 +41,7 @@
  #endif
  
  /*
-@@ -1367,6 +1401,7 @@ static const struct board_info __initcon
+@@ -1368,6 +1402,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,

diff --git a/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
index 810aca096267c07141d58337566934cf30a4f66c..9ef123e9251375c22d890404cdef37a84c7ee73d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -753,6 +753,98 @@ static struct board_info __initdata boar
+@@ -754,6 +754,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,
-@@ -1422,6 +1514,7 @@ static const struct board_info __initcon
+@@ -1423,6 +1515,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,

diff --git a/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
index 29bbde3f015695cd997895ee2bc58b42dbcd9419..f228509dc4eb68faae18a5dd3bb2e71bd4661872 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -889,6 +889,61 @@ static struct board_info __initdata boar
+@@ -890,6 +890,61 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
@@ -62,7 +62,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
        .sck            = NB4_SPI_GPIO_CLK,
        .mosi           = NB4_SPI_GPIO_MOSI,
-@@ -1516,6 +1571,7 @@ static const struct board_info __initcon
+@@ -1517,6 +1572,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,

diff --git a/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
index 4270f7ff6cac24da747e9dccadadcaf8000ef9ab..888900d16089c8c24f532bb0800cc13a77180adc 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -647,6 +647,67 @@ static struct board_info __initdata boar
+@@ -648,6 +648,67 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1563,6 +1624,7 @@ static const struct board_info __initcon
+@@ -1564,6 +1625,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,

diff --git a/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
index 658f7f1d4fb458417bcd65b535ff96332f131f75..5d86b313fd5a76662da918ea611b0090d97e65cb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -514,6 +514,112 @@ static struct board_info __initdata boar
+@@ -515,6 +515,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,
-@@ -1617,6 +1723,8 @@ static const struct board_info __initcon
+@@ -1618,6 +1724,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,

diff --git a/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
index 19403d8b07001e272638ef24264e28879fc7a933..4a7f25af3b4c676947c4688a9426f3a33578a264 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -814,6 +814,78 @@ static struct board_info __initdata boar
+@@ -815,6 +815,78 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -79,7 +79,7 @@
  #endif
  
  /*
-@@ -1733,6 +1805,7 @@ static const struct board_info __initcon
+@@ -1734,6 +1806,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,

diff --git a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
index 1370c6c19eef97fe25543cab8d1c1b88667cf1a2..7afe63a0506e84f0de2ce96cc5b35d9ebf524166 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1772,6 +1772,82 @@ static struct board_info __initdata boar
+@@ -1773,6 +1773,82 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -83,7 +83,7 @@
  #endif
  
  /*
-@@ -1820,6 +1896,7 @@ static const struct board_info __initcon
+@@ -1821,6 +1897,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
index a84c89755f60704ea83863c399f4434bdd6bd617..6a72f0c5aaf2ce4e29ee6b0a853389bd62d85198 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
@@ -46,7 +46,7 @@
  #endif
  
  /*
-@@ -1864,6 +1903,7 @@ static const struct board_info __initcon
+@@ -1865,6 +1904,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,

diff --git a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
index 328233b564faf1e0faaa2cca42d146a6ed2b6a60..2e0899fe3f02825a210d4e513244c3463bc65826 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1887,6 +1887,72 @@ static struct board_info __initdata boar
+@@ -1888,6 +1888,72 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -73,7 +73,7 @@
  #endif
  
  /*
-@@ -1937,6 +2003,7 @@ static const struct board_info __initcon
+@@ -1938,6 +2004,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_HW553,

diff --git a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
index 901b5acca7028edd14338bc03abc98046107ff1f..e64783325826acd2941bb43f2dc0d347871408b6 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -925,6 +925,65 @@ static struct board_info __initdata boar
+@@ -926,6 +926,65 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -66,7 +66,7 @@
  #endif
  
  /*
-@@ -1988,6 +2047,7 @@ static const struct board_info __initcon
+@@ -1989,6 +2048,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2109,6 +2169,22 @@ void __init board_prom_init(void)
+@@ -2110,6 +2170,22 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);

diff --git a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
index d4fe2fa8f3141807393c237252df46b12a270b96..b48c17851fd66f9217dda9b1462804079d4fe4cb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -485,6 +485,64 @@ static struct board_info __initdata boar
+@@ -486,6 +486,64 @@ static struct board_info __initdata boar
        },
  };
  
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2048,6 +2106,7 @@ static const struct board_info __initcon
+@@ -2049,6 +2107,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,

diff --git a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
index 6f2e25a6603c02b3693f11a733c560f4b11ec27c..4eaeb994468cc9531ed57474a6b17dbe1c51d1bf 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -543,6 +543,51 @@ static struct board_info __initdata boar
+@@ -544,6 +544,51 @@ static struct board_info __initdata boar
  };
  
  
@@ -52,7 +52,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2107,6 +2152,7 @@ static const struct board_info __initcon
+@@ -2108,6 +2153,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,

diff --git a/target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch
index d451407524db27d47dcdec14ac21bac62f1c798f..c8825c0e350487054f7f81805baa6352e0b29d21 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -1312,6 +1312,8 @@ static struct board_info __initdata boar
+@@ -1313,6 +1313,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,
-@@ -1327,6 +1329,7 @@ static struct board_info __initdata boar
+@@ -1328,6 +1330,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
index 6541419050d8548caeebc7850662b2b3cc3b153e..6bf4761038c091fa7837d5703b817b024aed2c0e 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -588,6 +588,69 @@ static struct board_info __initdata boar
+@@ -589,6 +589,69 @@ static struct board_info __initdata boar
        },
  };
  
@@ -70,7 +70,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2156,6 +2219,7 @@ static const struct board_info __initcon
+@@ -2157,6 +2220,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,

diff --git a/target/linux/brcm63xx/patches-3.10/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.10/517-RTA1205W_16_uart_fixes.patch
index c3756148c2f38e5a0ba12ad7141c3719a42ead34..d9aeaa34832f51a34b26b2f49fa1830bc5645bdb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -853,6 +853,7 @@ static struct board_info __initdata boar
+@@ -854,6 +854,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  

diff --git a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
index ba1a39fc18c53b51ed3424c5e2aeaa5aa1997b1a..b630da0d0622dddfdaf5be6f53be3704b284fa22 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1151,6 +1151,46 @@ static struct board_info __initdata boar
+@@ -1152,6 +1152,46 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -47,7 +47,7 @@
  #endif
  
  /*
-@@ -2221,6 +2261,7 @@ static const struct board_info __initcon
+@@ -2222,6 +2262,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,

diff --git a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 067ab3b792bc8e7a08998c97bccb5f6c8421ad3a..444b4fe3e250369bd5044167e9acb7273941c1eb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2225,6 +2225,85 @@ static struct board_info __initdata boar
+@@ -2226,6 +2226,85 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2279,6 +2358,10 @@ static const struct board_info __initcon
+@@ -2280,6 +2359,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
@@ -107,7 +107,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  /*
-@@ -2460,12 +2543,25 @@ void __init board_prom_init(void)
+@@ -2461,12 +2544,25 @@ void __init board_prom_init(void)
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;

diff --git a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index f42f2c9a31577034a6bca551f489a26573de4a99..b92f0693612afa45c1fdf3c45400e58e12e8ed80 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2301,6 +2301,72 @@ static struct board_info __initdata boar
+@@ -2302,6 +2302,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
  
  /*
-@@ -2361,6 +2427,7 @@ static const struct board_info __initcon
+@@ -2362,6 +2428,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,

diff --git a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 30229d41f25983801ddd96de0fc4e3d83b06f315..b094aba57f2767ed777b64a97cc841eb498a3fe3 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2410,6 +2480,7 @@ static const struct board_info __initcon
+@@ -2411,6 +2481,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
index fc7176bab97e66a01f58134b782c32b38c6f1311..6c933533a2eade88ef07b5f420203bd2c11f686c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2481,6 +2586,7 @@ static const struct board_info __initcon
+@@ -2482,6 +2587,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
index 9d8d965ecb9a6b7526724f461e8ee9f2856b0ec0..d122243baa4da3982aebcfc4c8dbac18ef9b7f5a 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1398,6 +1398,59 @@ static struct board_info __initdata boar
+@@ -1399,6 +1399,59 @@ static struct board_info __initdata boar
        },
  };
  
@@ -60,7 +60,7 @@
  #endif
  
  /*
-@@ -2616,6 +2669,7 @@ static const struct board_info __initcon
+@@ -2617,6 +2670,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,

diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
index 607e9c0b609a7b2c73fd0460437c6139a3832b79..041f5ecd63f3b4aa7792154433214c29995942e1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
@@ -14,7 +14,7 @@
  static struct board_info board;
  
  /*
-@@ -2341,6 +2348,113 @@ static struct board_info __initdata boar
+@@ -2342,6 +2349,113 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
@@ -128,7 +128,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2684,6 +2798,7 @@ static const struct board_info __initcon
+@@ -2685,6 +2799,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,

diff --git a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
index 9c4a9a5c839fa78925a35c4e2df211fe80249f34..fbad022901861bac6d0698e7a3228e54d12f6d0c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2596,6 +2596,73 @@ static struct board_info __initdata boar
+@@ -2597,6 +2597,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2801,6 +2868,7 @@ static const struct board_info __initcon
+@@ -2802,6 +2869,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,

diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
index 6b6d00de88ee51b4e1cb3272327e2046c325d45c..62219fc3bd9a5bfbcf8db5ff17cd439faf0ceb1c 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2665,6 +2668,103 @@ static struct board_info __initdata boar
+@@ -2666,6 +2669,103 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -121,7 +121,7 @@
  /*
   * known 6368 boards
   */
-@@ -2871,6 +2971,10 @@ static const struct board_info __initcon
+@@ -2872,6 +2972,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -132,7 +132,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2938,6 +3042,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2939,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  

diff --git a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
index ab79266276d5346a567ed6cd8d7fac4b874f3aa0..4af8d02525136f483c74778f78a462c4e1974d53 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1066,6 +1066,57 @@ static struct board_info __initdata boar
+@@ -1067,6 +1067,57 @@ static struct board_info __initdata boar
        .has_ehci0                      = 1,
  };
  
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -2939,6 +2990,7 @@ static const struct board_info __initcon
+@@ -2940,6 +2991,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,

diff --git a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
index c894eb266c4f874be0d422017675dbb207cbf85d..c864caed66b27b9042e59861befaf165452cf5be 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
+++ b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
@@ -126,7 +126,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2971,6 +3090,7 @@ static const struct board_info __initcon
+@@ -2972,6 +3091,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,

diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
index 9ec63200e12d26d9e24269ecbe33e7c2523b3cd0..bb2adfdd933f05a96969b037c107de01c2c9e31b 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
@@ -79,7 +79,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3089,6 +3161,7 @@ static const struct board_info __initcon
+@@ -3090,6 +3162,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
index f887a3c9a4b70121c465ed74075ae314c37ebbef..8ccdf9c5909bd56dc0c799e05ca70191d9fefcd1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
@@ -73,7 +73,7 @@
  static struct board_info __initdata board_96328A_1441N1 = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3161,6 +3227,7 @@ static const struct board_info __initcon
+@@ -3162,6 +3228,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,

diff --git a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
index 7ffc1ec7597005989cc03cd798ac6444de906fe0..a4cffe020d9cf5ae67916f7f00ed54b193bc1498 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3241,6 +3290,7 @@ static const struct board_info __initcon
+@@ -3242,6 +3291,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,

diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
index cb15163fe0ba11b26b8e16d0cb44e59617529463..4d95ae16d12a62b3d2030a366ac4f5358c018255 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2891,6 +2891,488 @@ static struct board_info __initdata boar
+@@ -2892,6 +2892,488 @@ static struct board_info __initdata boar
        },
  };
  
@@ -489,7 +489,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3329,6 +3811,10 @@ static const struct board_info __initcon
+@@ -3330,6 +3812,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
@@ -500,7 +500,7 @@
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3394,13 +3880,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3395,13 +3881,37 @@ static void __init boardid_fixup(u8 *boo
        struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
        char *board_name = (char *)bcm63xx_nvram_get_name();
  

diff --git a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
index 2bf5ca458256a7a8223e6c93e618cbe4ba638ffb..7d3707495e25abaf39ca811cb72709aa65381160 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3773,6 +3827,7 @@ static const struct board_info __initcon
+@@ -3774,6 +3828,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,

diff --git a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
index 4578a1d514c1d0f34252a767d0cd57aed6e2344b..d0f528f0055b10a5df1ed25a0cc9a1f5be6aa33d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2091,6 +2091,99 @@ static struct board_info __initdata boar
+@@ -2092,6 +2092,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
index 67246d2d6006299affac748eafd51b8737bc0567..22b1a5266db2224760eead59d73f57509f983968 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -1536,6 +1536,19 @@ static struct board_info __initdata boar
+@@ -1537,6 +1537,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
index 1562631b2bccfcee47a165364d7fbac8ed981649..30f3d225212e2b1955dc74bdb720f45678d50a73 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -996,6 +996,17 @@ static struct board_info __initdata boar
+@@ -997,6 +997,17 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },

diff --git a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
index b7943f776a3c2edabf5e49e90e9b9450bb8f1404..6571a61aa33b44d2801498a9b56d39932eb22b70 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
@@ -27,7 +27,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1024,6 +1030,8 @@ static struct board_info __initdata boar
+@@ -1025,6 +1031,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -36,7 +36,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1253,6 +1261,8 @@ static struct board_info __initdata boar
+@@ -1254,6 +1262,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +45,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1428,6 +1438,8 @@ static struct board_info __initdata boar
+@@ -1429,6 +1439,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +54,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1542,6 +1554,12 @@ static struct board_info __initdata boar
+@@ -1543,6 +1555,12 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -67,7 +67,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1917,6 +1935,8 @@ static struct board_info __initdata boar
+@@ -1918,6 +1936,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -76,7 +76,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1969,6 +1989,8 @@ static struct board_info __initdata boar
+@@ -1970,6 +1990,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -85,7 +85,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2109,6 +2131,8 @@ static struct board_info __initdata boar
+@@ -2110,6 +2132,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -94,7 +94,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2226,6 +2250,8 @@ static struct board_info __initdata boar
+@@ -2227,6 +2251,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {

diff --git a/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch b/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
index 32a431504fae31ac6e81382bae4958efc8e382f1..1865cd807d66ee5732f30a0d63cc1426aaf1e676 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2258,6 +2258,94 @@ static struct board_info __initdata boar
+@@ -2259,6 +2259,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,

diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
index 901a0d85877f27596af4f894de42e8ab3d6a9ce3..91c9100df12e2388f2adea84debf9382d332d58d 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
@@ -93,7 +93,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4041,6 +4127,9 @@ static const struct board_info __initcon
+@@ -4042,6 +4128,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif

diff --git a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
index 35454d778af0c51fb20a7c377a0e5a02f5e206e4..b8e451bb943e8a082a4d347915d20a10866db5f9 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
@@ -94,7 +94,7 @@
  #endif
  
  /*
-@@ -4129,6 +4216,7 @@ static const struct board_info __initcon
+@@ -4130,6 +4217,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,

diff --git a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
index 9c3b299de98638f7ceae5e1cb084001c8c4572a2..0dac578d8bf2bdac337d6e2703d50109f338725f 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.10/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>
-@@ -4297,7 +4298,7 @@ static const struct board_info __initcon
+@@ -4298,7 +4299,7 @@ static const struct board_info __initcon
   * bcm4318 WLAN work
   */
  #ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
        .revision               = 0x02,
        .board_rev              = 0x17,
        .country_code           = 0x0,
-@@ -4317,6 +4318,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4318,6 +4319,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };