brcm63xx: fix board patches offsets
authorJonas Gorski <jogo@openwrt.org>
Mon, 11 Aug 2014 11:36:30 +0000 (11:36 +0000)
committerJonas Gorski <jogo@openwrt.org>
Mon, 11 Aug 2014 11:36:30 +0000 (11:36 +0000)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
[jogo fix 553-boards_probe_switch.patch]
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 42116

43 files changed:
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/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/552-board_96348gw-10_reset_button.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 ff1c453..7ab05a3 100644 (file)
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -922,6 +922,72 @@ static struct board_info __initdata boar
-               },
+@@ -1898,6 +1898,72 @@ static struct board_info __initdata boar
+               .pci_dev                        = 1,
        },
  };
 +
index 48de722..d830d98 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -288,6 +288,65 @@ static struct board_info __initdata boar
+@@ -922,6 +922,65 @@ static struct board_info __initdata boar
                },
        },
  };
index 72da427..d816dc3 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -536,6 +536,64 @@ static struct board_info __initdata boar
+@@ -477,6 +477,64 @@ static struct board_info __initdata boar
        },
  };
  
index 94cd8cf..6985975 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,58 @@ static struct board_info __initdata boar
+@@ -535,6 +535,58 @@ static struct board_info __initdata boar
  };
  
  
index cead4ab..0d7acdb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1385,6 +1385,8 @@ static struct board_info __initdata boar
+@@ -1319,6 +1319,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,
-@@ -1401,6 +1403,7 @@ static struct board_info __initdata boar
+@@ -1335,6 +1337,7 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0                      = 1,
index 586fe1d..0a19ec6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -646,6 +646,76 @@ static struct board_info __initdata boar
+@@ -587,6 +587,76 @@ static struct board_info __initdata boar
        },
  };
  
index 73053dc..adbf0ec 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -920,6 +920,7 @@ static struct board_info __initdata boar
+@@ -861,6 +861,7 @@ static struct board_info __initdata boar
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
  
index 6af06f0..762e53c 100644 (file)
@@ -1,10 +1,9 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -347,6 +347,42 @@ static struct board_info __initdata boar
-               },
+@@ -534,6 +534,40 @@ static struct board_info __initdata boar
        },
  };
-+
 +static struct board_info __initdata board_CPVA502plus = {
 +      .name                           = "CPVA502+",
 +      .expected_cpu_id                = 0x6348,
 +      .ephy_reset_gpio                = 4,
 +      .ephy_reset_gpio_flags          = GPIOF_INIT_HIGH,
 +};
-+
- #endif
  
- /*
-@@ -2246,6 +2282,7 @@ static const struct board_info __initcon
+ static struct board_info __initdata board_ct536_ct5621 = {
+       .name                           = "CT536_CT5621",
+@@ -2246,6 +2280,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
index 4c47c7f..22c0036 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
-@@ -2246,6 +2246,85 @@ static struct board_info __initdata boar
+@@ -2244,6 +2244,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[] = {
-@@ -2300,6 +2379,10 @@ static const struct board_info __initcon
+@@ -2298,6 +2377,10 @@ static const struct board_info __initcon
        &board_HW553,
        &board_spw303v,
  #endif
index af5c467..f604fae 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
-@@ -2322,6 +2322,72 @@ static struct board_info __initdata boar
+@@ -2320,6 +2320,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
  
  /*
-@@ -2382,6 +2448,7 @@ static const struct board_info __initcon
+@@ -2380,6 +2446,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
index 6cd2046..2e7a9d7 100644 (file)
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  
  /*
-@@ -2431,6 +2501,7 @@ static const struct board_info __initcon
+@@ -2429,6 +2499,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 6818ee1..298f343 100644 (file)
@@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  
  /*
-@@ -2502,6 +2607,7 @@ static const struct board_info __initcon
+@@ -2500,6 +2605,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index ae89cf7..1294163 100644 (file)
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -590,6 +590,59 @@ static struct board_info __initdata boar
-       .ephy_reset_gpio_flags          = GPIOF_INIT_HIGH,
+@@ -1162,6 +1162,59 @@ static struct board_info __initdata boar
+       .has_ohci0 = 1,
  };
  
 +/* NetGear DG834G v4 */
 +      },
 +};
 +
- #endif
- /*
-@@ -2637,6 +2690,7 @@ static const struct board_info __initcon
+ static struct board_info __initdata board_96348_D4PW = {
+       .name                           = "D-4P-W",
+       .expected_cpu_id                = 0x6348,
+@@ -2635,6 +2688,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,
index 96ef61c..713b72f 100644 (file)
@@ -13,7 +13,7 @@
  /*
   * known 3368 boards
   */
-@@ -2427,6 +2433,124 @@ static struct board_info __initdata boar
+@@ -2359,6 +2365,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,
-@@ -2705,6 +2829,7 @@ static const struct board_info __initcon
+@@ -2703,6 +2827,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
index 8961988..28a00e1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1530,6 +1530,73 @@ static struct board_info __initdata boar
+@@ -2625,6 +2625,73 @@ static struct board_info __initdata boar
                },
        }
  };
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2832,6 +2899,7 @@ static const struct board_info __initcon
+@@ -2830,6 +2897,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
index 7e4f6eb..f706734 100644 (file)
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2696,6 +2699,104 @@ static struct board_info __initdata boar
+@@ -2694,6 +2697,104 @@ static struct board_info __initdata boar
  };
  #endif
  
  /*
   * known 6368 boards
   */
-@@ -2902,6 +3003,10 @@ static const struct board_info __initcon
+@@ -2900,6 +3001,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2923,6 +3028,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2921,6 +3026,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  
index 8c03e4a..3ae1ea2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1221,6 +1221,57 @@ static struct board_info __initdata boar
+@@ -1107,6 +1107,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,
-@@ -2971,6 +3022,7 @@ static const struct board_info __initcon
+@@ -2969,6 +3020,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
index b11a974..b8adaaa 100644 (file)
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -3003,6 +3130,7 @@ static const struct board_info __initcon
+@@ -3001,6 +3128,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index b7a8663..cc8cb76 100644 (file)
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3129,6 +3238,7 @@ static const struct board_info __initcon
+@@ -3127,6 +3236,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 9fe99a5..d4e428b 100644 (file)
@@ -92,7 +92,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
        { .offset = 2, .value = 0x05bb },
        { .offset = 65, .value = 0x1204 },
-@@ -3238,6 +3323,7 @@ static const struct board_info __initcon
+@@ -3236,6 +3321,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 24528b5..0e23f4a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -985,6 +985,55 @@ static struct board_info __initdata boar
+@@ -837,6 +837,55 @@ static struct board_info __initdata boar
  
        .has_uart0                      = 1,
  };
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3337,6 +3386,7 @@ static const struct board_info __initcon
+@@ -3335,6 +3384,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
index b18ae08..3473bda 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -1889,6 +1890,492 @@ static struct board_info __initdata boar
+@@ -2984,6 +2985,492 @@ static struct board_info __initdata boar
        },
  };
  
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3425,6 +3912,10 @@ static const struct board_info __initcon
+@@ -3423,6 +3910,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3444,13 +3935,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3442,13 +3933,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 c074cb0..8cfbf09 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1035,6 +1035,60 @@ static struct board_info __initdata boar
+@@ -887,6 +887,60 @@ static struct board_info __initdata boar
                },
        },
  };
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3874,6 +3928,7 @@ static const struct board_info __initcon
+@@ -3872,6 +3926,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index 7480fdf..ecd1e2e 100644 (file)
@@ -12,10 +12,11 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1697,6 +1697,122 @@ static struct board_info __initdata boar
+@@ -664,6 +664,122 @@ static struct board_info __initdata boar
+               },
        },
  };
++
 +static struct board_info __initdata board_FAST2704V2 = {
 +      .name                           = "F@ST2704V2",
 +      .expected_cpu_id                = 0x6328,
@@ -131,11 +132,10 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 +              },
 +      },
 +};
-+
- static struct board_info __initdata board_rta1025w_16 = {
-       .name                           = "RTA1025W_16",
-       .expected_cpu_id                = 0x6348,
-@@ -3918,6 +4034,7 @@ static const struct board_info __initcon
+ #endif
+ /*
+@@ -3916,6 +4032,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
index be8a066..b3a4d34 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
-@@ -3873,6 +3873,96 @@ static struct board_info __initdata boar
+@@ -3871,6 +3871,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
  
  /*
-@@ -4094,6 +4184,7 @@ static const struct board_info __initcon
+@@ -4092,6 +4182,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index c5508c5..b5d1874 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,99 @@ static struct board_info __initdata boar
+@@ -2279,6 +2279,99 @@ static struct board_info __initdata boar
  
        .has_ohci0 = 1,
        .has_ehci0 = 1,
index 902fb39..7761c62 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1875,6 +1875,19 @@ static struct board_info __initdata boar
+@@ -1761,6 +1761,19 @@ static struct board_info __initdata boar
        },
  
        .has_ohci0 = 1,
@@ -19,4 +19,4 @@
 +      },
  };
  
- static struct board_info __initdata board_96348_D4PW = {
+ /* NetGear DG834G v4 */
index edf7d2f..b934fd5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1199,6 +1199,17 @@ static struct board_info __initdata boar
+@@ -1167,6 +1167,17 @@ static struct board_info __initdata boar
                        .active_low     = 1,
                },
        },
index 206b53f..edd73f5 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -677,6 +677,8 @@ static struct board_info __initdata boar
+@@ -793,6 +793,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -9,7 +9,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -720,6 +722,8 @@ static struct board_info __initdata boar
+@@ -836,6 +838,8 @@ static struct board_info __initdata boar
        .has_uart0                      = 1,
        .has_enet0                      = 1,
        .enet0 = {
@@ -18,7 +18,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1155,6 +1159,8 @@ static struct board_info __initdata boar
+@@ -1123,6 +1127,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -27,7 +27,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1228,6 +1234,8 @@ static struct board_info __initdata boar
+@@ -1196,6 +1202,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -36,7 +36,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1472,6 +1480,8 @@ static struct board_info __initdata boar
+@@ -1474,6 +1482,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +45,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1648,6 +1658,8 @@ static struct board_info __initdata boar
+@@ -1650,6 +1660,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +54,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1839,6 +1851,8 @@ static struct board_info __initdata boar
+@@ -1725,6 +1737,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -63,7 +63,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1861,6 +1875,8 @@ static struct board_info __initdata boar
+@@ -1747,6 +1761,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -72,7 +72,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1881,6 +1897,8 @@ static struct board_info __initdata boar
+@@ -1767,6 +1783,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -81,7 +81,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2724,6 +2742,8 @@ static struct board_info __initdata boar
+@@ -2103,6 +2121,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -90,7 +90,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2777,6 +2797,8 @@ static struct board_info __initdata boar
+@@ -2156,6 +2176,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -99,7 +99,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2918,6 +2940,8 @@ static struct board_info __initdata boar
+@@ -2297,6 +2319,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -3036,6 +3060,8 @@ static struct board_info __initdata boar
+@@ -2415,6 +2439,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
index b31f365..444f2ff 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3068,6 +3068,94 @@ static struct board_info __initdata boar
+@@ -2447,6 +2447,94 @@ static struct board_info __initdata boar
  
        .has_ohci0                      = 1,
        .has_ehci0                      = 1,
index 5fff5ce..10b3102 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4348,6 +4435,9 @@ static const struct board_info __initcon
+@@ -4346,6 +4433,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index 8f190ba..959f190 100644 (file)
@@ -95,7 +95,7 @@
  #endif
  
  /*
-@@ -4437,6 +4525,7 @@ static const struct board_info __initcon
+@@ -4435,6 +4523,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index 9497580..4a53980 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4517,6 +4517,75 @@ static struct board_info __initdata boar
+@@ -4515,6 +4515,75 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4601,6 +4670,9 @@ static const struct board_info __initcon
+@@ -4599,6 +4668,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index 8b81c4d..79cf7e2 100644 (file)
@@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1153,6 +1153,51 @@ static struct board_info __initdata boar
+@@ -1428,6 +1428,51 @@ static struct board_info __initdata boar
        },
  };
  
@@ -57,10 +57,10 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 +      },
 +};
 +
- #endif
  
- /*
-@@ -4637,6 +4682,7 @@ static const struct board_info __initcon
+ /* BT Voyager 2110 */
+ static struct board_info __initdata board_V2110 = {
+@@ -4635,6 +4680,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index 26e12db..69685eb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4628,6 +4628,108 @@ static struct board_info __initdata boar
+@@ -4626,6 +4626,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif
  
  /*
-@@ -4718,6 +4820,7 @@ static const struct board_info __initcon
+@@ -4716,6 +4818,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index 274b995..89e6fc6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4565,6 +4565,131 @@ static struct board_info __initdata boar
+@@ -4563,6 +4563,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,
-@@ -4819,6 +4944,7 @@ static const struct board_info __initcon
+@@ -4817,6 +4942,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index 6bafd89..c24de10 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -4559,6 +4560,117 @@ static struct board_info __initdata boar
+@@ -4557,6 +4558,117 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
  #endif
  
  /*
-@@ -4942,6 +5054,7 @@ static const struct board_info __initcon
+@@ -4940,6 +5052,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 67f99dc..9bd864f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4561,6 +4561,116 @@ static struct board_info __initdata boar
+@@ -4559,6 +4559,116 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -5054,6 +5164,7 @@ static const struct board_info __initcon
+@@ -5052,6 +5162,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 6a88d13..7cadfb2 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4671,6 +4671,116 @@ static struct board_info __initdata boar
+@@ -4669,6 +4669,116 @@ static struct board_info __initdata boar
        },
  };
  
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -5165,6 +5275,7 @@ static const struct board_info __initcon
+@@ -5163,6 +5273,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
index fe2de6a..b89ddea 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4570,6 +4570,96 @@ static struct sprom_fixup __initdata vr3
+@@ -4568,6 +4568,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,
-@@ -5274,6 +5364,7 @@ static const struct board_info __initcon
+@@ -5272,6 +5362,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 7a18e37..f2dfabc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4151,6 +4151,56 @@ static struct board_info __initdata boar
+@@ -3530,6 +3530,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,
-@@ -5347,6 +5397,7 @@ static const struct board_info __initcon
+@@ -5345,6 +5395,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_ct6373_1,
index 5b31e7f..ac441e2 100644 (file)
@@ -96,7 +96,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -5345,6 +5434,7 @@ static const struct board_info __initcon
+@@ -5343,6 +5432,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
index 3cfe3a6..11cee3b 100644 (file)
  #endif
  
  /*
-@@ -5428,6 +5563,7 @@ static const struct board_info __initcon
+@@ -5426,6 +5561,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,