brcm63xx: Add fallback sprom for CT6373
authorJonas Gorski <jogo@openwrt.org>
Sun, 10 Aug 2014 12:21:48 +0000 (12:21 +0000)
committerJonas Gorski <jogo@openwrt.org>
Sun, 10 Aug 2014 12:21:48 +0000 (12:21 +0000)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42101 3c298f89-4303-0410-b956-a3cf2f4a3e73

25 files changed:
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/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 4a1cfb4..96ef61c 100644 (file)
@@ -13,7 +13,7 @@
  /*
   * known 3368 boards
   */
-@@ -2427,6 +2433,117 @@ static struct board_info __initdata boar
+@@ -2427,6 +2433,124 @@ static struct board_info __initdata boar
        .num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
  
@@ -62,6 +62,7 @@
 +
 +      .has_uart0                      = 1,
 +      .has_pci                        = 1,
++      .use_fallback_sprom             = 1,
 +      .has_ohci0                      = 1,
 +      .has_ehci0                      = 1,
 +
 +              },
 +      },
 +
++      .fallback_sprom = {
++              .type                           = SPROM_BCM4318,
++              .pci_bus                        = 0,
++              .pci_dev                        = 1,
++      },
++
 +      .devs = ct6373_devices,
 +      .num_devs = ARRAY_SIZE(ct6373_devices),
 +      .spis = ct6373_spi_devices,
  static struct board_info __initdata board_HW553 = {
        .name                           = "HW553",
        .expected_cpu_id                = 0x6358,
-@@ -2705,6 +2822,7 @@ static const struct board_info __initcon
+@@ -2705,6 +2829,7 @@ static const struct board_info __initcon
        &board_nb4_ser_r2,
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
index a998857..8961988 100644 (file)
@@ -74,7 +74,7 @@
  #endif
  
  /*
-@@ -2825,6 +2892,7 @@ static const struct board_info __initcon
+@@ -2832,6 +2899,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
index 8dec4ad..7e4f6eb 100644 (file)
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2689,6 +2692,104 @@ static struct board_info __initdata boar
+@@ -2696,6 +2699,104 @@ static struct board_info __initdata boar
  };
  #endif
  
  /*
   * known 6368 boards
   */
-@@ -2895,6 +2996,10 @@ static const struct board_info __initcon
+@@ -2902,6 +3003,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2916,6 +3021,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2923,6 +3028,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }
  
index b516043..8c03e4a 100644 (file)
@@ -58,7 +58,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
        .name                           = "RTA1025W_16",
        .expected_cpu_id                = 0x6348,
-@@ -2964,6 +3015,7 @@ static const struct board_info __initcon
+@@ -2971,6 +3022,7 @@ static const struct board_info __initcon
        &board_96348gw_10,
        &board_96348gw_11,
        &board_FAST2404,
index d743397..19fe3f6 100644 (file)
  static struct board_info __initdata board_dsl_274xb_f1 = {
        .name                           = "AW4339U",
        .expected_cpu_id                = 0x6328,
-@@ -2996,6 +3116,7 @@ static const struct board_info __initcon
+@@ -3003,6 +3123,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
        &board_963281TAN,
index ea9a3d9..a87ea22 100644 (file)
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
        .name                           = "963281TAN",
        .expected_cpu_id                = 0x6328,
-@@ -3115,6 +3188,7 @@ static const struct board_info __initcon
+@@ -3122,6 +3195,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index e8ad735..f133208 100644 (file)
@@ -74,7 +74,7 @@
  static struct board_info __initdata board_AR5387un = {
        .name                                   = "96328A-1441N1",
        .expected_cpu_id                        = 0x6328,
-@@ -3188,6 +3255,7 @@ static const struct board_info __initcon
+@@ -3195,6 +3262,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
index 8e84c5c..afd8cb6 100644 (file)
@@ -56,7 +56,7 @@
  #endif
  
  /*
-@@ -3269,6 +3318,7 @@ static const struct board_info __initcon
+@@ -3276,6 +3325,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
index 593d973..4d8cf5f 100644 (file)
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
        .name                   = "96358-502V",
-@@ -3357,6 +3844,10 @@ static const struct board_info __initcon
+@@ -3364,6 +3851,10 @@ static const struct board_info __initcon
        &board_nb4_fxc_r2,
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
        &board_DVAG3810BN,
  #endif
-@@ -3376,13 +3867,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3383,13 +3874,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 49a61af..a0ff6b3 100644 (file)
@@ -61,7 +61,7 @@
  #endif
  
  /*
-@@ -3806,6 +3860,7 @@ static const struct board_info __initcon
+@@ -3813,6 +3867,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
index bdcea16..ce3efc1 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,
-@@ -3850,6 +3966,7 @@ static const struct board_info __initcon
+@@ -3857,6 +3973,7 @@ static const struct board_info __initcon
        &board_963281TAN,
        &board_A4001N1,
        &board_dsl_274xb_f1,
index 1773c3c..8f65cef 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
-@@ -3805,6 +3805,96 @@ static struct board_info __initdata boar
+@@ -3812,6 +3812,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
  
  /*
-@@ -4026,6 +4116,7 @@ static const struct board_info __initcon
+@@ -4033,6 +4123,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
index 7b4b5fb..92ee212 100644 (file)
@@ -94,7 +94,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4280,6 +4367,9 @@ static const struct board_info __initcon
+@@ -4287,6 +4374,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
        &board_cvg834g,
  #endif
index 6fdaf81..d2b20b5 100644 (file)
@@ -95,7 +95,7 @@
  #endif
  
  /*
-@@ -4369,6 +4457,7 @@ static const struct board_info __initcon
+@@ -4376,6 +4464,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
index 9a06e79..3ddafa9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4449,6 +4449,75 @@ static struct board_info __initdata boar
+@@ -4456,6 +4456,75 @@ static struct board_info __initdata boar
  #endif
  
  /*
@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4533,6 +4602,9 @@ static const struct board_info __initcon
+@@ -4540,6 +4609,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
index b2e7015..f2958d8 100644 (file)
@@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  /*
-@@ -4569,6 +4614,7 @@ static const struct board_info __initcon
+@@ -4576,6 +4621,7 @@ static const struct board_info __initcon
        &board_96348A_122,
        &board_CPVA502plus,
        &board_96348W3,
index adbd0f9..bffb7ab 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4560,6 +4560,108 @@ static struct board_info __initdata boar
+@@ -4567,6 +4567,108 @@ static struct board_info __initdata boar
                },
        },
  };
  #endif
  
  /*
-@@ -4650,6 +4752,7 @@ static const struct board_info __initcon
+@@ -4657,6 +4759,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
index 531759b..f51b0fc 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4497,6 +4497,131 @@ static struct board_info __initdata boar
+@@ -4504,6 +4504,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,
-@@ -4751,6 +4876,7 @@ static const struct board_info __initcon
+@@ -4758,6 +4883,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
index d60352a..e409cf4 100644 (file)
@@ -8,7 +8,7 @@
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_gpio.h>
-@@ -4491,6 +4492,99 @@ static struct board_info __initdata boar
+@@ -4498,6 +4499,99 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
        .has_ehci0 = 1,
  };
  #endif
  
  /*
-@@ -4874,6 +4968,7 @@ static const struct board_info __initcon
+@@ -4881,6 +4975,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 273d4ef..183baa6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4493,6 +4493,98 @@ static struct board_info __initdata boar
+@@ -4500,6 +4500,98 @@ static struct board_info __initdata boar
        .has_ehci0 = 1,
  };
  
@@ -99,7 +99,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -4968,6 +5060,7 @@ static const struct board_info __initcon
+@@ -4975,6 +5067,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index cfe2261..529f2fb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4585,6 +4585,98 @@ static struct board_info __initdata boar
+@@ -4592,6 +4592,98 @@ static struct board_info __initdata boar
        },
  };
  
@@ -99,7 +99,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
        .alias = "eth0",
  };
-@@ -5061,6 +5153,7 @@ static const struct board_info __initcon
+@@ -5068,6 +5160,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_VR3025u,
index ecfa8ea..551c832 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4493,6 +4493,89 @@ static struct board_info __initdata boar
+@@ -4500,6 +4500,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,
-@@ -5152,6 +5235,7 @@ static const struct board_info __initcon
+@@ -5159,6 +5242,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
index 451b044..cc6acb1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4083,6 +4083,49 @@ static struct board_info __initdata boar
+@@ -4090,6 +4090,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,
-@@ -5218,6 +5261,7 @@ static const struct board_info __initcon
+@@ -5225,6 +5268,7 @@ static const struct board_info __initcon
        &board_nb4_fxc_r1,
        &board_nb4_fxc_r2,
        &board_ct6373_1,
index e961002..7f411df 100644 (file)
@@ -89,7 +89,7 @@
  static struct board_info __initdata board_A4001N1 = {
        .name                                   = "963281T_TEF",
        .expected_cpu_id                        = 0x6328,
-@@ -5209,6 +5291,7 @@ static const struct board_info __initcon
+@@ -5216,6 +5298,7 @@ static const struct board_info __initcon
        &board_AR5381u,
        &board_AR5387un,
        &board_963281TAN,
index e3160d5..f59c6c2 100644 (file)
  #endif
  
  /*
-@@ -5285,6 +5420,7 @@ static const struct board_info __initcon
+@@ -5292,6 +5427,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
        &board_96318ref,
        &board_96318ref_p300,