brcm63xx: fix RG100A/DB120 usb port number
authorJonas Gorski <jogo@openwrt.org>
Sat, 22 Feb 2014 11:16:52 +0000 (11:16 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sat, 22 Feb 2014 11:16:52 +0000 (11:16 +0000)
Set usbh ports to 2 to fix #15007.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39681

51 files changed:
target/linux/brcm63xx/patches-3.10/351-set-board-usbh-ports.patch [new file with mode: 0644]
target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch
target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch
target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch
target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch

diff --git a/target/linux/brcm63xx/patches-3.10/351-set-board-usbh-ports.patch b/target/linux/brcm63xx/patches-3.10/351-set-board-usbh-ports.patch
new file mode 100644 (file)
index 0000000..e007ddd
--- /dev/null
@@ -0,0 +1,10 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -634,6 +634,7 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
+       .has_pccard = 1,
+       .has_ehci0 = 1,
++      .num_usbh_ports                 = 2,
+       .leds = {
+               {
index c5ce6ac17efa8a0408ff1d1357e8d18086b2aef7..6f4f8d926e682d4c31f73d11e73ae03b7da24827 100644 (file)
@@ -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;
index 0b7c1ca540383f44eadb4e18bb5f211b1db04782..7991fad0e386488a45f787c2994ffb598ef7a633 100644 (file)
@@ -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>
-@@ -968,6 +969,7 @@ int __init board_register_devices(void)
+@@ -969,6 +970,7 @@ int __init board_register_devices(void)
        int button_count = 0;
        int led_count = 0;
        int usbh_ports = 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);
-@@ -1013,7 +1015,8 @@ int __init board_register_devices(void)
+@@ -1014,7 +1016,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(
-@@ -1060,5 +1063,9 @@ int __init board_register_devices(void)
+@@ -1061,5 +1064,9 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  
index 038a9988aaa14b2cbb1594755816fa46d30b3652..6f913dd073cb5fe0bd5e539e7c71a30bbdeaeed8 100644 (file)
@@ -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
-@@ -1035,7 +1035,7 @@ int __init board_register_devices(void)
+@@ -1036,7 +1036,7 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  
index bd2518920fc3ed5e5f6e293382abe8c640a14512..cbceaa9c4b9d96294f77d7c40edde6285c45bc52 100644 (file)
@@ -39,7 +39,7 @@
                return;
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1065,7 +1065,8 @@ int __init board_register_devices(void)
+@@ -1066,7 +1066,8 @@ int __init board_register_devices(void)
  
        /* register any fixups */
        for (i = 0; i < board.has_caldata; i++)
index b6e9358d663094d5bcf6e454daabce016b635680..f4821b67443938e70f9c38b947f58bf7451ed9e1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1066,7 +1066,7 @@ int __init board_register_devices(void)
+@@ -1067,7 +1067,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,
index d6d2fb3950270984b33c9f28234eec92280fdb53..877b5177b881cc49997d49e0447d77669fb84d1a 100644 (file)
@@ -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>
-@@ -1064,9 +1065,19 @@ int __init board_register_devices(void)
+@@ -1065,9 +1066,19 @@ int __init board_register_devices(void)
        }
  
        /* register any fixups */
index fb469703a5765f776c63709ededaddf1d62eb842..ffeb8c9c93163be65bbafd7fc486a434511c8275 100644 (file)
@@ -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,
index 76b339c419cd8d44215237822be008eb4208d186..20d398ca18a26f89788a9af439fe5a4e81bc99bd 100644 (file)
@@ -22,7 +22,7 @@
  static struct board_info board;
  
  /*
-@@ -754,6 +762,601 @@ static struct board_info __initdata boar
+@@ -755,6 +763,601 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
  };
  #endif
  
  /*
-@@ -790,6 +1393,11 @@ static const struct board_info __initcon
+@@ -791,6 +1394,11 @@ static const struct board_info __initcon
        &board_96358vw2,
        &board_AGPFS0,
        &board_DWVS0,
  #endif
  };
  
-@@ -844,6 +1452,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -845,6 +1453,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();
  
index 3af2da8807874dbb2fc25202e93b39bb42abb903..08f856b9db6a7be37890b414533e513ca44d1ac1 100644 (file)
@@ -41,7 +41,7 @@
  #endif
  
  /*
-@@ -1372,6 +1406,7 @@ static const struct board_info __initcon
+@@ -1373,6 +1407,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
        &board_96338w,
index 64057fa42779c1b3d1c862116c1ddac47f1d73cb..fde7f8bacd3f33d44b5ff7ecfb9a6a9124fd1d78 100644 (file)
@@ -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,
-@@ -1427,6 +1519,7 @@ static const struct board_info __initcon
+@@ -1428,6 +1520,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
index ed67a35f7b534282048507915fa95bdbed7ddac8..a6fff9bbda7165350e1d8e2fdb70d31a0e8054a0 100644 (file)
@@ -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,
-@@ -1521,6 +1576,7 @@ static const struct board_info __initcon
+@@ -1522,6 +1577,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,
index 5ff3c14887ed64052d81ac01e597b4dc562b2802..394506bdd5d2e1d8add9f057e23634b2cb673c88 100644 (file)
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1568,6 +1629,7 @@ static const struct board_info __initcon
+@@ -1569,6 +1630,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,
index 1371b5969a8d9686793a0109fe7a3226780637b9..1f66a2dd9bcd559c65a393895f1c7a3bf1bf4284 100644 (file)
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .expected_cpu_id                = 0x6348,
-@@ -1622,6 +1728,8 @@ static const struct board_info __initcon
+@@ -1623,6 +1729,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,
index 80e27f96ce950cb1983db5e6b924126096b36aca..55f976c8ab7884ef46a61e9bc1b2c82743fa264e 100644 (file)
@@ -79,7 +79,7 @@
  #endif
  
  /*
-@@ -1738,6 +1810,7 @@ static const struct board_info __initcon
+@@ -1739,6 +1811,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,
index 5f3a795de7e575042c856ba401f8e59bad419174..b7506e0ecac034e735ea7f2a073e828d9d78fea6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1777,6 +1777,83 @@ static struct board_info __initdata boar
+@@ -1778,6 +1778,83 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -84,7 +84,7 @@
  #endif
  
  /*
-@@ -1825,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1826,6 +1903,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
index 9df16aec26727b6676d871be3281a89bd6b9d6d1..3683825619a1f6dcae13c662afae55386e5bd0b7 100644 (file)
@@ -46,7 +46,7 @@
  #endif
  
  /*
-@@ -1870,6 +1909,7 @@ static const struct board_info __initcon
+@@ -1871,6 +1910,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,
index d9d737a874495bf9164ef82b8178b7f7cd04f2e6..61ab794b4af3de52380925012c11c5bf65f33d57 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1893,6 +1893,72 @@ static struct board_info __initdata boar
+@@ -1894,6 +1894,72 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -73,7 +73,7 @@
  #endif
  
  /*
-@@ -1943,6 +2009,7 @@ static const struct board_info __initcon
+@@ -1944,6 +2010,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_HW553,
index ea9a0c227ca40a01b470617f1c66573b98852080..f4cfc6e66e4a10bb577e987eb727adce660b8d9e 100644 (file)
@@ -66,7 +66,7 @@
  #endif
  
  /*
-@@ -1994,6 +2053,7 @@ static const struct board_info __initcon
+@@ -1995,6 +2054,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2115,6 +2175,22 @@ void __init board_prom_init(void)
+@@ -2116,6 +2176,22 @@ void __init board_prom_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);
index 39e63093e7030a711b84c5ce5ac699ea31d89d86..c68a48bf1be4335fd6838f99f980f37ed6bcd065 100644 (file)
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2054,6 +2112,7 @@ static const struct board_info __initcon
+@@ -2055,6 +2113,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,
index e6a811b3dc5a6f6c6806586aaaf3b73b23e5a742..10d0d47bc8732ca59434e681c4069d8faf49d53b 100644 (file)
@@ -52,7 +52,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2113,6 +2158,7 @@ static const struct board_info __initcon
+@@ -2114,6 +2159,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
index d451407524db27d47dcdec14ac21bac62f1c798f..c8825c0e350487054f7f81805baa6352e0b29d21 100644 (file)
@@ -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,
index 7bd29f32f7c950bbc31a5e2724fa8e4b9d96064d..d3017dcaa483ac56219674e03e4f22aae5911cc4 100644 (file)
@@ -70,7 +70,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2162,6 +2225,7 @@ static const struct board_info __initcon
+@@ -2163,6 +2226,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
index a7e72f3b792fa92033d616fdee5cd13f6be71ada..b5ae101c33406ef8c614fc615486d8a9c16904e6 100644 (file)
@@ -47,7 +47,7 @@
  #endif
  
  /*
-@@ -2227,6 +2267,7 @@ static const struct board_info __initcon
+@@ -2228,6 +2268,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
index 833cf97b05d7f55a28db41282d716da5f403aaf4..8ff14aefbb3607c7c5178a77a08c2a15024feee0 100644 (file)
@@ -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
-@@ -2231,6 +2231,85 @@ static struct board_info __initdata boar
+@@ -2232,6 +2232,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[] = {
-@@ -2285,6 +2364,10 @@ static const struct board_info __initcon
+@@ -2286,6 +2365,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.
  };
  
  /*
-@@ -2466,12 +2549,25 @@ void __init board_prom_init(void)
+@@ -2467,12 +2550,25 @@ void __init board_prom_init(void)
                bcm63xx_pci_enabled = 1;
                if (BCMCPU_IS_6348())
                        val |= GPIO_MODE_6348_G2_PCI;
index d67fe7994f00fc5aa7ed3ec40a9f7d590239466a..f29709692a051821c7d91933e21e430dae4b0adf 100644 (file)
@@ -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
-@@ -2307,6 +2307,72 @@ static struct board_info __initdata boar
+@@ -2308,6 +2308,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
  
  /*
-@@ -2367,6 +2433,7 @@ static const struct board_info __initcon
+@@ -2368,6 +2434,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
index 6d477576f7ab4e830bad6bda3d50004f4112d448..114778d58f4d9bf1cc0a45774293c01761ba9d15 100644 (file)
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2416,6 +2486,7 @@ static const struct board_info __initcon
+@@ -2417,6 +2487,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 26725ca51dd0fc27cb0407a5053be3c499a018ae..3d5b5d1b4fe866781b570f9547ac338736efc7ea 100644 (file)
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2487,6 +2592,7 @@ static const struct board_info __initcon
+@@ -2488,6 +2593,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 76632265066b3c0502111ac7529af2ce7cb702d9..52134d4109baa5684c41d5443d7f032032bc9ce2 100644 (file)
@@ -60,7 +60,7 @@
  #endif
  
  /*
-@@ -2622,6 +2675,7 @@ static const struct board_info __initcon
+@@ -2623,6 +2676,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,
index 82e899acf6036277acfaa4cd1e49fc4914c5182c..cd0122bcfb8a7deffb429cdeff645067f933f638 100644 (file)
@@ -14,7 +14,7 @@
  static struct board_info board;
  
  /*
-@@ -2346,6 +2353,113 @@ static struct board_info __initdata boar
+@@ -2347,6 +2354,113 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2690,6 +2804,7 @@ static const struct board_info __initcon
+@@ -2691,6 +2805,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
index 16c328a8331185e027c1a4a6a008deecff98eea3..a555298f03056c97c5a61a5cf56e032ed43451c2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2602,6 +2602,73 @@ static struct board_info __initdata boar
+@@ -2603,6 +2603,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2807,6 +2874,7 @@ static const struct board_info __initcon
+@@ -2808,6 +2875,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
index ca3d6ed2dde10343182c6f49d5a76725feb8c227..66705fa6f3c51a145276472a94531e00de60c355 100644 (file)
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2671,6 +2674,104 @@ static struct board_info __initdata boar
+@@ -2672,6 +2675,104 @@ static struct board_info __initdata boar
  };
  #endif
  
  /*
   * known 6368 boards
   */
-@@ -2877,6 +2978,10 @@ static const struct board_info __initcon
+@@ -2878,6 +2979,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2945,6 +3050,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  
index b05ceacc20140a21a5b7259e00c62ce23c7c41f7..9ebc02ae5c95680217d998d0ca31dedfbca6f754 100644 (file)
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -2946,6 +2997,7 @@ static const struct board_info __initcon
+@@ -2947,6 +2998,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
index 099359ffbef1d22dbe1d9bf1b0b3747ef4618763..d490f28df106c1883455e4571cdbdba080b72a86 100644 (file)
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2978,6 +3098,7 @@ static const struct board_info __initcon
+@@ -2979,6 +3099,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 92ec1141101df0a5f6d347637be9803d97359d58..12a08873b5a4c164845b3ac2eedd0acc517f132e 100644 (file)
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3097,6 +3170,7 @@ static const struct board_info __initcon
+@@ -3098,6 +3171,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index b675106065bcbb37a9cb9397c42ec8bfd1d397ec..3648b2aa4eb532259c23fa3b1f60834adc075170 100644 (file)
@@ -74,7 +74,7 @@
  static struct board_info __initdata board_96328A_1441N1 = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3170,6 +3237,7 @@ static const struct board_info __initcon
+@@ -3171,6 +3238,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 85c867d3dfb4c42e140cb59200856b43b5e9a235..60a670f8cb48c1ea1589cc67cabb0f8d3c629141 100644 (file)
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3251,6 +3300,7 @@ static const struct board_info __initcon
+@@ -3252,6 +3301,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
index 63eb226ec109f31c1c40b4661019f6a1e6065d9b..d957a5089dfbfabfda777a5e5c558adb6603611c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2900,6 +2900,492 @@ static struct board_info __initdata boar
+@@ -2901,6 +2901,492 @@ static struct board_info __initdata boar
        },
  };
  
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3339,6 +3825,10 @@ static const struct board_info __initcon
+@@ -3340,6 +3826,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3404,13 +3894,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3405,13 +3895,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();
  
index 83e0ae1d7dd19e9f733a6e534494a8860ebaaae5..6e0cd69a42df0246ff1954472c2b8736b568785d 100644 (file)
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3787,6 +3841,7 @@ static const struct board_info __initcon
+@@ -3788,6 +3842,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index 482b2028231aba3b84873b0d2b396bde1dffeccd..bb035df5811d228c88307d64318ffb4e5aceaf44 100644 (file)
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -3831,6 +3947,7 @@ static const struct board_info __initcon
+@@ -3832,6 +3948,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_963281T_TEF,
        &board_dsl_274xb_f1,
index 05ef04da79e0b1cff1561a5319bcab09f6c57ee2..d8b65a57cd9cd2ec8753af4430f823e1a3a17368 100644 (file)
@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3786,6 +3786,96 @@ static struct board_info __initdata boar
+@@ -3787,6 +3787,96 @@ static struct board_info __initdata boar
        .devs = nb6_devices,
        .num_devs = ARRAY_SIZE(nb6_devices),
  };
@@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  /*
-@@ -4007,6 +4097,7 @@ static const struct board_info __initcon
+@@ -4008,6 +4098,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index b687cb5e393bb58cadf2987a27abcbc3ea6399ef..8235396954e5c2a21b32803f153f9c335bcb1593 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2210,6 +2210,99 @@ static struct board_info __initdata boar
+@@ -2211,6 +2211,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
index e36a38f4d9196252fe32236bbb1dde74a4011b6e..6d3072deefcf42ab67216f6e215a00862da2d10a 100644 (file)
@@ -85,7 +85,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2228,6 +2250,8 @@ static struct board_info __initdata boar
+@@ -2229,6 +2251,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -94,7 +94,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2345,6 +2369,8 @@ static struct board_info __initdata boar
+@@ -2346,6 +2370,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
index d7e1f406d04df352ce21102e519bc0833f717e2b..e21274c98af3397d18c66ea88eefbbc5d026cf18 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2377,6 +2377,94 @@ static struct board_info __initdata boar
+@@ -2378,6 +2378,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,
index 91bd39a770e835353be63faa4f525bf8dd9b0191..5bcfc4cedcd87e2738fb52d84767e3b5927d94c0 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4261,6 +4348,9 @@ static const struct board_info __initcon
+@@ -4262,6 +4349,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index e61fc4d9246335d4ee98a525932f0bf31acc3193..4cd8c9b1d961843bedc4448949711bda25281d45 100644 (file)
@@ -95,7 +95,7 @@
  #endif
  
  /*
-@@ -4350,6 +4438,7 @@ static const struct board_info __initcon
+@@ -4351,6 +4439,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index ab5554d29d37d7a5689c91bb3993500c2fc685f7..1e62d5651a3a3cc9b849b2959d7e18989a3d0d63 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4430,6 +4430,75 @@ static struct board_info __initdata boar
+@@ -4431,6 +4431,75 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4514,6 +4583,9 @@ static const struct board_info __initcon
+@@ -4515,6 +4584,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index c5810d343d89c888f152a2417a3188b13434bfbc..8b2b1ee04a3654cbff1e39f1e935aac5276f351c 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  /*
-@@ -4550,6 +4595,7 @@ static const struct board_info __initcon
+@@ -4551,6 +4596,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index 131b1f095d0a69b4a37c4a60721b2513ac514e82..298a04a252e41e89797094879947f20c27e923bc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4541,6 +4541,108 @@ static struct board_info __initdata boar
+@@ -4542,6 +4542,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif
  
  /*
-@@ -4631,6 +4733,7 @@ static const struct board_info __initcon
+@@ -4632,6 +4734,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index a34be1b4bf1ed96be295842a71c9a783cc96ddb3..afaf9835010170e706b461b4c62444d87e71c6b3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4478,6 +4478,131 @@ static struct board_info __initdata boar
+@@ -4479,6 +4479,131 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
  static struct board_info __initdata board_963269bhr = {
        .name                           = "963269BHR",
        .expected_cpu_id                = 0x63268,
-@@ -4732,6 +4857,7 @@ static const struct board_info __initcon
+@@ -4733,6 +4858,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index be8a5fa03525c72944e46328922fc1ad6095eb3d..b3ced8d5a2f5e2b59d131a9f654e03f751a514dd 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
  #include <linux/spi/74x164.h>
-@@ -4868,7 +4869,7 @@ static const struct board_info __initcon
+@@ -4869,7 +4870,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,
-@@ -4888,6 +4889,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4889,6 +4890,7 @@ static struct ssb_sprom bcm63xx_sprom =
        .boardflags_lo          = 0x2848,
        .boardflags_hi          = 0x0000,
  };