brcm63xx: enable fallback sprom for Speedport W500 V
authorJonas Gorski <jogo@openwrt.org>
Mon, 18 Aug 2014 21:50:45 +0000 (21:50 +0000)
committerJonas Gorski <jogo@openwrt.org>
Mon, 18 Aug 2014 21:50:45 +0000 (21:50 +0000)
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 42211

45 files changed:
target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch
target/linux/brcm63xx/patches-3.14/506-board_gw6200_gw6000.patch
target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch
target/linux/brcm63xx/patches-3.14/508-board_hw553.patch
target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch
target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch
target/linux/brcm63xx/patches-3.14/512-board_BTV2110.patch
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/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/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 fa5874569fa5e527e78d42e0652e789263b83bea..ca84962039bf4b62c45feaf6a5cdb616ca1cd470 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -653,6 +653,68 @@ static struct board_info __initdata boar
+@@ -653,6 +653,75 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -13,6 +13,7 @@
 +      .has_uart0                      = 1,
 +      .has_enet0                      = 1,
 +      .has_pci                        = 1,
++      .use_fallback_sprom             = 1,
 +
 +      .enet0 = {
 +              .has_phy                = 1,
 +                      .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
 +              },
 +      },
++
++      .fallback_sprom = {
++              .type                   = SPROM_BCM4318,
++              .pci_bus                = 0,
++              .pci_dev                = 1,
++      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1252,6 +1314,7 @@ static const struct board_info __initcon
+@@ -1252,6 +1321,7 @@ static const struct board_info __initcon
        &board_96348gw_a,
        &board_rta1025w_16,
        &board_96348_D4PW,
index 34224f43428130ff3ab19d2db522400e9fdaf761..5ba01f0c6c4f625709f47602c0c676db68e6db12 100644 (file)
  static struct board_info __initdata board_FAST2404 = {
        .name                           = "F@ST2404",
        .of_board_id                    = "sagem,f@st2404",
-@@ -1307,6 +1415,8 @@ static const struct board_info __initcon
+@@ -1314,6 +1422,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,
index 8fb233220f4e4d8c864356cf9ab0ec8b580584dd..36de28124144824889751454642ed696710c75a9 100644 (file)
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -823,6 +823,78 @@ static struct board_info __initdata boar
-               },
+@@ -830,6 +830,78 @@ static struct board_info __initdata boar
+               .pci_dev                = 1,
        },
  };
 +
@@ -79,7 +79,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1425,6 +1497,7 @@ static const struct board_info __initcon
+@@ -1432,6 +1504,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,
index 15c34a8f3d850faa612e78a628e2e63e49848ed0..3b26401d8a5624e3c7b40b54e223b309c0e44f23 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1464,6 +1464,83 @@ static struct board_info __initdata boar
+@@ -1471,6 +1471,83 @@ static struct board_info __initdata boar
        .spis = nb4_spi_devices,
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -84,7 +84,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1509,6 +1586,7 @@ static const struct board_info __initcon
+@@ -1516,6 +1593,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
index 6546922dcb36691293cc5fe66a5a6465fd113155..9ce1d25db04623a90ce65d4774a5a701088b6eaa 100644 (file)
@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -1557,6 +1596,7 @@ static const struct board_info __initcon
+@@ -1564,6 +1603,7 @@ static const struct board_info __initcon
        &board_96338gw,
        &board_96338w,
        &board_96338w2_e7t,
index 9b6f888d38e27bd5898dd6490f6e61986d0772d8..6a8d9c1ec9911d7d54c6d77daed14ce1f7c6d915 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1580,6 +1580,72 @@ static struct board_info __initdata boar
+@@ -1587,6 +1587,72 @@ static struct board_info __initdata boar
                .pci_dev                        = 1,
        },
  };
@@ -73,7 +73,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1627,6 +1693,7 @@ static const struct board_info __initcon
+@@ -1634,6 +1700,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_HW553,
index c3b1da7d4e249fde70493a9ca7f4d89d4381f43c..847e816976e5bde6c2621a395258598be80ed18d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -934,6 +934,65 @@ static struct board_info __initdata boar
+@@ -941,6 +941,65 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -66,7 +66,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1681,6 +1740,7 @@ static const struct board_info __initcon
+@@ -1688,6 +1747,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -74,7 +74,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1719,6 +1779,22 @@ void __init board_bcm963xx_init(void)
+@@ -1726,6 +1786,22 @@ void __init board_bcm963xx_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);
index 5c53c24b33be2929468a2c4631f5858586c18811..20655f96596c447051daf4a9ca13fb0c53254468 100644 (file)
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .of_board_id                    = "brcm,bcm96348gw",
-@@ -1741,6 +1799,7 @@ static const struct board_info __initcon
+@@ -1748,6 +1806,7 @@ static const struct board_info __initcon
        &board_spw500v,
        &board_96348sv,
        &board_V2500V_BB,
index 744e85c4a685090c6a5ea400a9e8f010961024b2..b6e5702627e0446a82b256acadd10be6c16302f7 100644 (file)
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .of_board_id                    = "brcm,bcm96348gw",
-@@ -1800,6 +1853,7 @@ static const struct board_info __initcon
+@@ -1807,6 +1860,7 @@ static const struct board_info __initcon
        &board_96348sv,
        &board_V2500V_BB,
        &board_V2110,
index 5dd96ad84b4d44c604b2044bd1da18fded97a5a8..695db8e31a8ec8101de9d756fdd15362b96f07e6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1336,6 +1336,8 @@ static struct board_info __initdata boar
+@@ -1343,6 +1343,8 @@ static struct board_info __initdata boar
        .of_board_id                    = "pirelli,a226g",
        .expected_cpu_id                = 0x6358,
  
@@ -9,7 +9,7 @@
        .has_enet0                      = 1,
        .has_enet1                      = 1,
        .has_pci                        = 1,
-@@ -1352,6 +1354,7 @@ static struct board_info __initdata boar
+@@ -1359,6 +1361,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,
index b358f0ec84baa1136afb8633deda4bd41e191175..398e4a80b65201861c204052ee3e81a04cf2aba1 100644 (file)
@@ -77,7 +77,7 @@
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .of_board_id                    = "brcm,bcm96348gw",
-@@ -1857,6 +1927,7 @@ static const struct board_info __initcon
+@@ -1864,6 +1934,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
index 15447c3f1ff77e363a9931fd287f4b3c49dcbf25..26989afa53be7fffa4f2db0d7cb7dc6901693d9b 100644 (file)
@@ -41,7 +41,7 @@
  
  static struct board_info __initdata board_ct536_ct5621 = {
        .name                           = "CT536_CT5621",
-@@ -1929,6 +1963,7 @@ static const struct board_info __initcon
+@@ -1936,6 +1970,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
index 8dab9ecca08ee0144e481ad5c18e811b1d4fc022..b83d564e21efdda44d788e40980596bd61d1e991 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
-@@ -1927,6 +1927,85 @@ static struct board_info __initdata boar
+@@ -1934,6 +1934,85 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1978,6 +2057,10 @@ static const struct board_info __initcon
+@@ -1985,6 +2064,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
index ed2556ab0ffc554345b733d0a1545db212c9aa7c..a6e15d5043133e7167da6acdd70eb847effe579a 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
-@@ -2003,6 +2003,72 @@ static struct board_info __initdata boar
+@@ -2010,6 +2010,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 /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -2060,6 +2126,7 @@ static const struct board_info __initcon
+@@ -2067,6 +2133,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
index 58858cb362227a4b37a75b4be660abd75ea873c0..fece4c63d7da76830a23012274e07c36219f7ace 100644 (file)
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2112,6 +2182,7 @@ static const struct board_info __initcon
+@@ -2119,6 +2189,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 9bb54f8d33fd8afcf0dfbe9ad6478c1e459d999f..95c53d3743113e258ead219fb49a39b8f31f6ef8 100644 (file)
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2183,6 +2288,7 @@ static const struct board_info __initcon
+@@ -2190,6 +2295,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 4723b4c83f6b86ade8f2fc36f99a9d4c44fb73c0..35361ec259ab90f21a33fe7954bd24731e079b6d 100644 (file)
@@ -60,7 +60,7 @@
  static struct board_info __initdata board_96348_D4PW = {
        .name                           = "D-4P-W",
        .expected_cpu_id                = 0x6348,
-@@ -2318,6 +2371,7 @@ static const struct board_info __initcon
+@@ -2325,6 +2378,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,
index ace0925d38542e3b1e62b369ca4df7078b57a04c..05f4c9e7782865a15fa69eb4620d0fcf36242119 100644 (file)
@@ -13,7 +13,7 @@
  /*
   * known 3368 boards
   */
-@@ -2042,6 +2048,124 @@ static struct board_info __initdata boar
+@@ -2049,6 +2055,124 @@ 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,
-@@ -2383,6 +2507,7 @@ static const struct board_info __initcon
+@@ -2390,6 +2514,7 @@ static const struct board_info __initcon
        &board_dsl_274xb_rev_c,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
index 736477c72d01e57a39501daf430b98e2eb8b3a9e..91de06cf9afe26497faed6c1ddd44bdeb87c2287 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2308,6 +2308,74 @@ static struct board_info __initdata boar
+@@ -2315,6 +2315,74 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -75,7 +75,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -2510,6 +2578,7 @@ static const struct board_info __initcon
+@@ -2517,6 +2585,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
index 58eec777e79acbc0e7d00065278859909e0a4e03..47b8d05f8b3c8e9d4aeae1e0db448313b638c069 100644 (file)
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2378,6 +2381,105 @@ static struct board_info __initdata boar
+@@ -2385,6 +2388,105 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
   * known 6368 boards
   */
-@@ -2581,6 +2683,10 @@ static const struct board_info __initcon
+@@ -2588,6 +2690,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
index 6dbebbf1c3934cdb79b5e2dae5ef56bf12ccdcd2..6afcf3cc46b415170efb02eba42a3b2b51f310dc 100644 (file)
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .of_board_id                    = "dynalink,rta1025w",
-@@ -2654,6 +2705,7 @@ static const struct board_info __initcon
+@@ -2661,6 +2712,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
index 510ae97581896beccfb839416069da96e2194866..190050578650afe062744ffa6f687b024e861558 100644 (file)
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2686,6 +2813,7 @@ static const struct board_info __initcon
+@@ -2693,6 +2820,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index 6470655825641e834da20532384a5dec0f0ceac9..9b6a317c1e50cfa95ab5f116e639b6e0524e5c71 100644 (file)
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -2812,6 +2921,7 @@ static const struct board_info __initcon
+@@ -2819,6 +2928,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 4362b971e8b4f18529c164a762092b1602e72a61..025f0654a243ec2fa4b1482576e0943a39c3c201 100644 (file)
@@ -92,7 +92,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
        { .offset = 2, .value = 0x05bb },
        { .offset = 65, .value = 0x1204 },
-@@ -2921,6 +3006,7 @@ static const struct board_info __initcon
+@@ -2928,6 +3013,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 64f4639f8c9332e0d2f1eaa0d1785a7f626c07e5..227fd44f1b6bfb269995d0c8d5eae7a6a29347a6 100644 (file)
@@ -56,7 +56,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -3020,6 +3069,7 @@ static const struct board_info __initcon
+@@ -3027,6 +3076,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
index c1af61bf5b55d8bb0ec220c8f4612b0c4eb229b8..0278820885734540f0eadcead7e5024366a663b7 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -2667,6 +2668,405 @@ static struct board_info __initdata boar
+@@ -2674,6 +2675,405 @@ static struct board_info __initdata boar
        },
  };
  
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3105,6 +3505,9 @@ static const struct board_info __initcon
+@@ -3112,6 +3512,9 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_ct6373_1,
        &board_HW553,
index 455ccc43eb74e3648168579ca0c29b42a9bfd047..6b1e5f297b5c599b02163fd7f2cbf7cf279b0094 100644 (file)
@@ -61,7 +61,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -3470,6 +3524,7 @@ static const struct board_info __initcon
+@@ -3477,6 +3531,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index d082c499cb92247ed9a2113d6ebc200ff4ba37da..c456e9f469f5754ede1a0645132ead721f0f2045 100644 (file)
@@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -3514,6 +3630,7 @@ static const struct board_info __initcon
+@@ -3521,6 +3637,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
index 88a0f8ff637b514ecc5c98a91dd1fe06da2ff30f..165737d35dff00ebebb2310b57eba80447519d9c 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
-@@ -3469,6 +3469,96 @@ static struct board_info __initdata boar
+@@ -3476,6 +3476,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 /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -3686,6 +3776,7 @@ static const struct board_info __initcon
+@@ -3693,6 +3783,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index 4714ba4fff0c03c5158c0d634844657bbf150dd1..fcbe45d60c6f02c68818fa69ea2ba26f23af11de 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2295,6 +2295,99 @@ static struct board_info __initdata boar
+@@ -2302,6 +2302,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
index 072419dd405af847a9eac5e10f50db44946d0f2a..4a507d09af5a442a1406156fa2339758db2361f7 100644 (file)
@@ -81,7 +81,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2117,6 +2135,8 @@ static struct board_info __initdata boar
+@@ -2124,6 +2142,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -90,7 +90,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2171,6 +2191,8 @@ static struct board_info __initdata boar
+@@ -2178,6 +2198,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -99,7 +99,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2313,6 +2335,8 @@ static struct board_info __initdata boar
+@@ -2320,6 +2342,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2432,6 +2456,8 @@ static struct board_info __initdata boar
+@@ -2439,6 +2463,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
index c8aa53f8056b716f01ae978887f8b1523aaa8bbe..56466c4e4ebf42cee35d86a3fc6ff7fa70ebaf17 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2464,6 +2464,94 @@ static struct board_info __initdata boar
+@@ -2471,6 +2471,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,
index d28ed2f2d6f35192390079df7c9ad5440a66fa34..2d6ecda354a852ab989f3b944069deda75fb45d1 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -3944,6 +4031,9 @@ static const struct board_info __initcon
+@@ -3951,6 +4038,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index 7eff2bc7dee0dfa4fe2ae5f5bd6ceb1704c7493d..38951ef2920b2bf613efe90b928ad5b28cce5f69 100644 (file)
@@ -95,7 +95,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -4033,6 +4121,7 @@ static const struct board_info __initcon
+@@ -4040,6 +4128,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index 9ec979c9bac6c621290eab5685460fb9d1f3b218..4a8b5e7ac682113aa0e4155f9a0a3b165cf20780 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4113,6 +4113,75 @@ static struct board_info __initdata boar
+@@ -4120,6 +4120,75 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4193,6 +4262,9 @@ static const struct board_info __initcon
+@@ -4200,6 +4269,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index 46ea23264a5c7c4ad70120e5a2c8969e21a73bbe..caef662963c7bde592332b68ff48773ebbd3b2ee 100644 (file)
@@ -61,7 +61,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -4233,6 +4279,7 @@ static const struct board_info __initcon
+@@ -4240,6 +4286,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index dda02a5f39fef44cb10d29c485f850030e05cf10..35720a3cc032d998bc4e1912d12060f982afed13 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4225,6 +4225,108 @@ static struct board_info __initdata boar
+@@ -4232,6 +4232,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -4311,6 +4413,7 @@ static const struct board_info __initcon
+@@ -4318,6 +4420,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index e5651337bf1f3e1dbff40a05f31593b42589ceb8..471e034ff6ca1e31a9bc8d8c9e64a6915075817a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4162,6 +4162,131 @@ static struct board_info __initdata boar
+@@ -4169,6 +4169,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,
-@@ -4412,6 +4537,7 @@ static const struct board_info __initcon
+@@ -4419,6 +4544,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index e35d77562d73a03986352713be418cf71d095ca0..37bcd0b52b4bdc0d7262743556b774778bc6406e 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -4156,6 +4157,117 @@ static struct board_info __initdata boar
+@@ -4163,6 +4164,117 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -4535,6 +4647,7 @@ static const struct board_info __initcon
+@@ -4542,6 +4654,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 27f5e691ab2e62577e3a6f8cc3c75d4dc337fb6d..4d5c143442ab88cfecd9ba271b01b51919db7d48 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4158,6 +4158,116 @@ static struct board_info __initdata boar
+@@ -4165,6 +4165,116 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -4647,6 +4757,7 @@ static const struct board_info __initcon
+@@ -4654,6 +4764,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 44bd7ee2af0378dd1d08a5dc277c28abbb103e12..a722c458b752657352f291edb57f47da2a003815 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4268,6 +4268,116 @@ static struct board_info __initdata boar
+@@ -4275,6 +4275,116 @@ static struct board_info __initdata boar
        },
  };
  
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -4758,6 +4868,7 @@ static const struct board_info __initcon
+@@ -4765,6 +4875,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
index 9731cb5e86a1be7cfb02fc124c1d3b4469bc6d96..36d20e72f4656316923b45d3f907c35eb0eece51 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4167,6 +4167,96 @@ static struct sprom_fixup __initdata vr3
+@@ -4174,6 +4174,96 @@ static struct sprom_fixup __initdata vr3
        { .offset = 115, .value = 0xfad9 },
  };
  
@@ -97,7 +97,7 @@
  static struct board_info __initdata board_VR3025u = {
        .name                                   = "96368M-1541N",
        .expected_cpu_id                = 0x6368,
-@@ -4867,6 +4957,7 @@ static const struct board_info __initcon
+@@ -4874,6 +4964,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 4ec1326f448844937e0644e95ee15160c5e11817..159e338967b158876256b6a117b57577cfc7953d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3214,6 +3214,56 @@ static struct board_info __initdata boar
+@@ -3221,6 +3221,56 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(ct6373_spi_devices),
  };
  
@@ -57,7 +57,7 @@
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -4941,6 +4991,7 @@ static const struct board_info __initcon
+@@ -4948,6 +4998,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
        &board_ct6373_1,
index 420433275dec92317546b5cdee4dd6b26284ee5a..904d274093639792f8a4cedb1f33ba36e6776dd6 100644 (file)
@@ -96,7 +96,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -4942,6 +5031,7 @@ static const struct board_info __initcon
+@@ -4949,6 +5038,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
index 55457a5fa5c93ddaaf16fe906628e722fa50bfc4..3a7253662fee518926226df11585cd04a6799398 100644 (file)
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -5025,6 +5160,7 @@ static const struct board_info __initcon
+@@ -5032,6 +5167,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,