brcm63xx: Add fallback sprom for CT5361_CT5621
authorJonas Gorski <jogo@openwrt.org>
Sun, 10 Aug 2014 12:21:39 +0000 (12:21 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sun, 10 Aug 2014 12:21:39 +0000 (12:21 +0000)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 42099

39 files changed:
target/linux/brcm63xx/patches-3.14/514-board_ct536_ct5621.patch
target/linux/brcm63xx/patches-3.14/515-board_DWV-S0_fixes.patch
target/linux/brcm63xx/patches-3.14/516-board_96348A-122.patch
target/linux/brcm63xx/patches-3.14/517-RTA1205W_16_uart_fixes.patch
target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch
target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch
target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch
target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch
target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
target/linux/brcm63xx/patches-3.14/530-board_A4001N1.patch
target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
target/linux/brcm63xx/patches-3.14/532-board_AR-5381u.patch
target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch
target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch
target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch

index 7474fb95329864d00ef7caf12348855899b3ba6d..94cd8cf39e228e833da3575dac823261b329e62f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -594,6 +594,51 @@ static struct board_info __initdata boar
+@@ -594,6 +594,58 @@ static struct board_info __initdata boar
  };
  
  
@@ -12,6 +12,7 @@
 +      .has_enet0                      = 0,
 +      .has_enet1                      = 1,
 +      .has_pci                        = 1,
++      .use_fallback_sprom             = 1,
 +
 +      .enet1 = {
 +              .has_phy                = 1,
 +                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +      },
++
++      .fallback_sprom = {
++              .type                           = SPROM_BCM4318,
++              .pci_bus                        = 0,
++              .pci_dev                        = 1,
++      },
 +};
 +
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2118,6 +2163,7 @@ static const struct board_info __initcon
+@@ -2118,6 +2170,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
index f898eda36b08e3c4e78f35c34fd346b06e377d52..cead4abe3c40c6cf221d7c176e8c264e7b005286 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1378,6 +1378,8 @@ static struct board_info __initdata boar
+@@ -1385,6 +1385,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,
-@@ -1394,6 +1396,7 @@ static struct board_info __initdata boar
+@@ -1401,6 +1403,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,
index 88ab266e7130a45fb6644ea27938a4b7704f3d45..192dc5b2d6db7b93273401bdffddc9bea452cda7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -639,6 +639,69 @@ static struct board_info __initdata boar
+@@ -646,6 +646,69 @@ static struct board_info __initdata boar
        },
  };
  
@@ -70,7 +70,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -2167,6 +2230,7 @@ static const struct board_info __initcon
+@@ -2174,6 +2237,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
index 474d1e6c0c51ddd48b629f16675477e2b4dd31fc..dad5050893f2db9253c58cce3d7b4e58b8573866 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -906,6 +906,7 @@ static struct board_info __initdata boar
+@@ -913,6 +913,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  
index b5846ba63bac295a666e279b666cc97c83364a3f..392a48a7939297a5cc2f6436084ffe033a449eeb 100644 (file)
@@ -43,7 +43,7 @@
  #endif
  
  /*
-@@ -2232,6 +2268,7 @@ static const struct board_info __initcon
+@@ -2239,6 +2275,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
index 42d3ac09b4cee16fca4c7831ac85a716ef7c638e..88e2f055c4f0e2999d851cca31ee10019b78c363 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
-@@ -2232,6 +2232,85 @@ static struct board_info __initdata boar
+@@ -2239,6 +2239,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[] = {
-@@ -2286,6 +2365,10 @@ static const struct board_info __initcon
+@@ -2293,6 +2372,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
index f29709692a051821c7d91933e21e430dae4b0adf..f08535c9148257797c58d6e8a336ef6688538631 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
-@@ -2308,6 +2308,72 @@ static struct board_info __initdata boar
+@@ -2315,6 +2315,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
  
  /*
-@@ -2368,6 +2434,7 @@ static const struct board_info __initcon
+@@ -2375,6 +2441,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
index b95cecc3e9c570ed65bfa45c82c3627a2e273439..1b676461af413c7c0b4f17a146135db8a16be447 100644 (file)
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2417,6 +2487,7 @@ static const struct board_info __initcon
+@@ -2424,6 +2494,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 644a0ea85e1a248d0250a0c714531f85b74ed3e8..cd42a79d02c7497079150ba16a70e6e7f2bf670f 100644 (file)
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2488,6 +2593,7 @@ static const struct board_info __initcon
+@@ -2495,6 +2600,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 575275f87f1cfa2dc9523ae2cbe999ed0d3047ad..baf1e8821771282d510ecceb2ebab0d13fc5d4e3 100644 (file)
@@ -60,7 +60,7 @@
  #endif
  
  /*
-@@ -2623,6 +2676,7 @@ static const struct board_info __initcon
+@@ -2630,6 +2683,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,
index de223080aa6346dbdf742fe8f600261ff1920b37..e1fbf8cbe5d05019a50d5a3cbf05a27182d68a04 100644 (file)
@@ -13,7 +13,7 @@
  /*
   * known 3368 boards
   */
-@@ -2413,6 +2419,117 @@ static struct board_info __initdata boar
+@@ -2420,6 +2426,117 @@ 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,
-@@ -2691,6 +2808,7 @@ static const struct board_info __initcon
+@@ -2698,6 +2815,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
index 589f691ec49021766fab19263f989ea101eae99d..8f9a936df878885aead1d4803174aa41b7ae14a5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1516,6 +1516,73 @@ static struct board_info __initdata boar
+@@ -1523,6 +1523,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2811,6 +2878,7 @@ static const struct board_info __initcon
+@@ -2818,6 +2885,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
index cd7dcceb46c7b5431e9ecbbf78824b203b24402d..6932af5c7e83bb8d98dcb1be8670db1f778015b9 100644 (file)
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2675,6 +2678,104 @@ static struct board_info __initdata boar
+@@ -2682,6 +2685,104 @@ static struct board_info __initdata boar
  };
  #endif
  
  /*
   * known 6368 boards
   */
-@@ -2881,6 +2982,10 @@ static const struct board_info __initcon
+@@ -2888,6 +2989,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2902,6 +3007,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2909,6 +3014,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  
index e3eb28820d7cb0de6d2deebade48470cb917741f..ff214f2bae76ed7f7291949b2bd53b14de51b779 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1207,6 +1207,57 @@ static struct board_info __initdata boar
+@@ -1214,6 +1214,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,
-@@ -2950,6 +3001,7 @@ static const struct board_info __initcon
+@@ -2957,6 +3008,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
index 93ab1ad9951d449f7914371c037b15c7d11c9831..635a24827aac5cc87347e3c80b58e92f89bfaa82 100644 (file)
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2982,6 +3102,7 @@ static const struct board_info __initcon
+@@ -2989,6 +3109,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 66edb761d57251d6cba57425f7d59f9b6d2b6cca..20856df1608334ac52e220b67ed27898de680b1d 100644 (file)
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3101,6 +3174,7 @@ static const struct board_info __initcon
+@@ -3108,6 +3181,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index f9ae5e72a07f3698997a39c25540165ff5efc8f0..06cc7757bf251dfecb3b9cc031cf63684d6db59d 100644 (file)
@@ -74,7 +74,7 @@
  static struct board_info __initdata board_AR5387un = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3174,6 +3241,7 @@ static const struct board_info __initcon
+@@ -3181,6 +3248,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 173523ba69c05518b4ac946459425acbd32244ad..f03baaa3379d55f883822dc9c4c35a1ff3fb54a1 100644 (file)
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3255,6 +3304,7 @@ static const struct board_info __initcon
+@@ -3262,6 +3311,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
index f4e0e6705cc6f01682d86f2460e67a0a2f8023c9..3ce0ccd9ff0716c6c070c36d9aa21a2dcef7eb68 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -1814,6 +1815,492 @@ static struct board_info __initdata boar
+@@ -1821,6 +1822,492 @@ static struct board_info __initdata boar
        },
  };
  
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3343,6 +3830,10 @@ static const struct board_info __initcon
+@@ -3350,6 +3837,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3362,13 +3853,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3369,13 +3860,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 dbf581fb695f90d63e85c46aa903b710cc550d6c..773e11cbc95c2434437b43b355fa2652da00adb9 100644 (file)
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3792,6 +3846,7 @@ static const struct board_info __initcon
+@@ -3799,6 +3853,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index 5ab1f57de9000e0b1ac4b6cc2e0391144d2668e1..cc7f9c2fa7dca2c57d210aaa30f726238c160a15 100644 (file)
@@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1622,6 +1622,122 @@ static struct board_info __initdata boar
+@@ -1629,6 +1629,122 @@ static struct board_info __initdata boar
        },
  };
  
@@ -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,
-@@ -3836,6 +3952,7 @@ static const struct board_info __initcon
+@@ -3843,6 +3959,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
index 4e3cacd7dc3a07791938c4b3909214bf4eadc43a..6c599886e1b347f54d51d2568a154e4e5646df80 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
-@@ -3791,6 +3791,96 @@ static struct board_info __initdata boar
+@@ -3798,6 +3798,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
  
  /*
-@@ -4012,6 +4102,7 @@ static const struct board_info __initcon
+@@ -4019,6 +4109,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index cd5a67fb95c7f67866d3f62cca875a44446e83a3..4675425fe4d5d34b6366ebe64e69ea34a1707672 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2825,6 +2825,99 @@ static struct board_info __initdata boar
+@@ -2832,6 +2832,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
index 4a4a4cf78ea19f06294ad682c0424f28dfe255b3..d436e3f5846270975a9e1248198fb5f2b3c01458 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1800,6 +1800,19 @@ static struct board_info __initdata boar
+@@ -1807,6 +1807,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,
index 8568247903341b3412f4449e9d74b15ca04972cf..4f0adb2d47943ef2b0ef5f3700dd6e08e28d90d4 100644 (file)
@@ -36,7 +36,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1397,6 +1405,8 @@ static struct board_info __initdata boar
+@@ -1404,6 +1412,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +45,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1573,6 +1583,8 @@ static struct board_info __initdata boar
+@@ -1580,6 +1590,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +54,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1764,6 +1776,8 @@ static struct board_info __initdata boar
+@@ -1771,6 +1783,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -63,7 +63,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1786,6 +1800,8 @@ static struct board_info __initdata boar
+@@ -1793,6 +1807,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -72,7 +72,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1806,6 +1822,8 @@ static struct board_info __initdata boar
+@@ -1813,6 +1829,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -81,7 +81,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2649,6 +2667,8 @@ static struct board_info __initdata boar
+@@ -2656,6 +2674,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -90,7 +90,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2702,6 +2722,8 @@ static struct board_info __initdata boar
+@@ -2709,6 +2729,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -99,7 +99,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2843,6 +2865,8 @@ static struct board_info __initdata boar
+@@ -2850,6 +2872,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2961,6 +2985,8 @@ static struct board_info __initdata boar
+@@ -2968,6 +2992,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
index 9a8a725f6736d20e94e5fc7524b798fa87ca9f01..3c3ca55ed5f34f98c5dc2def355551a86d60bffe 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2993,6 +2993,94 @@ static struct board_info __initdata boar
+@@ -3000,6 +3000,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,
index 299b239d96237d89b5c2eec27c5b8d444a0dee87..16172db50ebdfa57da84f291b2154c8937c85bbb 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4266,6 +4353,9 @@ static const struct board_info __initcon
+@@ -4273,6 +4360,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index b6e2f3268af3122327be2b6d892795ebf1d5d762..995c9fdf5d16abb204b09ed9e6522d36f765da79 100644 (file)
@@ -95,7 +95,7 @@
  #endif
  
  /*
-@@ -4355,6 +4443,7 @@ static const struct board_info __initcon
+@@ -4362,6 +4450,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index a21a3cd1a5d000b70f5f5db8fe8babf1cca3f7b8..fb70b958f00c09fefdd7213afb13c2e724a93e63 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4435,6 +4435,75 @@ static struct board_info __initdata boar
+@@ -4442,6 +4442,75 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4519,6 +4588,9 @@ static const struct board_info __initcon
+@@ -4526,6 +4595,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index 703720ceb798a4316edfeff53f8e799adb13dcaa..998110684209393c84f21c2626d6bca956924166 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  /*
-@@ -4555,6 +4600,7 @@ static const struct board_info __initcon
+@@ -4562,6 +4607,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index a455b83b405a75e68b1879a38cb134bb47233ffc..87cd2313934a88d447956ee3c46f303ea4ffcd83 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4546,6 +4546,108 @@ static struct board_info __initdata boar
+@@ -4553,6 +4553,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif
  
  /*
-@@ -4636,6 +4738,7 @@ static const struct board_info __initcon
+@@ -4643,6 +4745,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index b5033f100b99853fefd2313f39e53ef4c8bf1e54..60d788b9027b74b68c6620d5e0e6598ee20e1b21 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4483,6 +4483,131 @@ static struct board_info __initdata boar
+@@ -4490,6 +4490,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,
-@@ -4737,6 +4862,7 @@ static const struct board_info __initcon
+@@ -4744,6 +4869,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index b0160c548b936c425206105494bac15fa9f3b53b..00e814b508351f86588c94796c71e1033af6ec50 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -4477,6 +4478,99 @@ static struct board_info __initdata boar
+@@ -4484,6 +4485,99 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
  #endif
  
  /*
-@@ -4860,6 +4954,7 @@ static const struct board_info __initcon
+@@ -4867,6 +4961,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 33568cf5fb408abc246b325feaf796db762af96d..b022d6671bceb7f1fcc90bb6d61f60ac5bdca701 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4479,6 +4479,98 @@ static struct board_info __initdata boar
+@@ -4486,6 +4486,98 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -99,7 +99,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -4954,6 +5046,7 @@ static const struct board_info __initcon
+@@ -4961,6 +5053,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 0675f592a121ebfc9e84ac2cc157b9e36a2e94ec..c68f8e9aef4a50118f4b3dd580cc4484ecc82951 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4571,6 +4571,98 @@ static struct board_info __initdata boar
+@@ -4578,6 +4578,98 @@ static struct board_info __initdata boar
        },
  };
  
@@ -99,7 +99,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -5047,6 +5139,7 @@ static const struct board_info __initcon
+@@ -5054,6 +5146,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
index a1c9eefdcc9e8a90ad8846ca19f118c8f461724a..c212b76e5a8aa55230f630f4c82ae33701ba6194 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4479,6 +4479,89 @@ static struct board_info __initdata boar
+@@ -4486,6 +4486,89 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -90,7 +90,7 @@
  static struct board_info __initdata board_VR3025u = {
        .name                                   = "96368M-1541N",
        .expected_cpu_id                = 0x6368,
-@@ -5138,6 +5221,7 @@ static const struct board_info __initcon
+@@ -5145,6 +5228,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 812252b04dba7c29401405dae2a356f348984078..bbde03558b44fbf589589959bcaa1742e40d92e7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4069,6 +4069,49 @@ static struct board_info __initdata boar
+@@ -4076,6 +4076,49 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(ct6373_spi_devices),
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -5204,6 +5247,7 @@ static const struct board_info __initcon
+@@ -5211,6 +5254,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_ct6373_1,
index 1703c8a7c1ec3c92cca5bf503a30863d56666776..615cc563d33ccfc4d19b7a61779d1e9133c43691 100644 (file)
@@ -89,7 +89,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -5195,6 +5277,7 @@ static const struct board_info __initcon
+@@ -5202,6 +5284,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
index 21eb0fce9d973db3e229296ec7e50ceb63fd480e..b107dac2dc038fc6053757660c7654069fe36f15 100644 (file)
  #endif
  
  /*
-@@ -5271,6 +5406,7 @@ static const struct board_info __initcon
+@@ -5278,6 +5413,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,