bcm63xx: add missing fallback SPROMs

A couple of SPROM IDs are missing.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
master
Álvaro Fernández Rojas 4 years ago
parent fb589b6142
commit eddf863650

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -204,6 +204,44 @@ static struct board_info __initdata boar
@@ -204,6 +204,49 @@ static struct board_info __initdata boar
.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
},
};
@ -41,11 +41,16 @@
+ },
+
+ .use_fallback_sprom = 1,
+ .fallback_sprom = {
+ .type = SPROM_BCM43217,
+ .pci_bus = 1,
+ .pci_dev = 0,
+ },
+};
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
@@ -2101,6 +2139,7 @@ static const struct board_info __initcon
@@ -2101,6 +2144,7 @@ static const struct board_info __initcon
&board_96318ref,
&board_96318ref_p300,
&board_dsl_2751b_d1,
@ -53,7 +58,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
@@ -2195,6 +2234,7 @@ static struct of_device_id const bcm963x
@@ -2195,6 +2239,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar
@@ -1950,6 +1950,59 @@ static struct board_info __initdata boar
},
};
@ -60,7 +60,7 @@
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
@@ -2216,6 +2269,7 @@ static const struct board_info __initcon
@@ -2221,6 +2274,7 @@ static const struct board_info __initcon
&board_P870HW51A_V2,
&board_VR3025u,
&board_VR3025un,
@ -68,7 +68,7 @@
&board_WAP5813n,
#endif /* CONFIG_BCM63XX_CPU_6368 */
#ifdef CONFIG_BCM63XX_CPU_63268
@@ -2316,6 +2370,7 @@ static struct of_device_id const bcm963x
@@ -2321,6 +2375,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -612,6 +612,50 @@ static struct board_info __initdata boar
@@ -617,6 +617,50 @@ static struct board_info __initdata boar
},
},
};
@ -51,7 +51,7 @@
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
@@ -2203,6 +2247,7 @@ static const struct board_info __initcon
@@ -2208,6 +2252,7 @@ static const struct board_info __initcon
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
@ -59,7 +59,7 @@
#endif /* CONFIG_BCM63XX_CPU_6328 */
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
@@ -2298,6 +2343,7 @@ static struct of_device_id const bcm963x
@@ -2303,6 +2348,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar
@@ -1846,6 +1846,52 @@ static struct board_info __initdata boar
},
};
@ -53,7 +53,7 @@
static struct sprom_fixup __initdata vr3025u_fixups[] = {
{ .offset = 97, .value = 0xfeb3 },
{ .offset = 98, .value = 0x1618 },
@@ -2310,6 +2356,7 @@ static const struct board_info __initcon
@@ -2315,6 +2361,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@ -61,7 +61,7 @@
&board_HG655b,
&board_P870HW51A_V2,
&board_VR3025u,
@@ -2418,6 +2465,7 @@ static struct of_device_id const bcm963x
@@ -2423,6 +2470,7 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar
@@ -1800,6 +1800,43 @@ static struct board_info __initdata boar
},
};
@ -44,7 +44,7 @@
static struct board_info __initdata board_HG655b = {
.name = "HW65x",
.expected_cpu_id = 0x6368,
@@ -2356,6 +2393,7 @@ static const struct board_info __initcon
@@ -2361,6 +2398,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@ -52,7 +52,7 @@
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
@@ -2468,6 +2506,7 @@ static struct of_device_id const bcm963x
@@ -2473,6 +2511,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,echolife-hg622", .data = &board_HG622, },
{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar
@@ -1700,6 +1700,49 @@ static struct board_info __initdata boar
* known 6368 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6368
@ -41,6 +41,7 @@
+
+ .use_fallback_sprom = 1,
+ .fallback_sprom = {
+ .type = SPROM_BCM4322,
+ .pci_bus = 0,
+ .pci_dev = 1,
+ },
@ -49,7 +50,7 @@
static struct board_info __initdata board_96368mvwg = {
.name = "96368MVWG",
.expected_cpu_id = 0x6368,
@@ -2390,6 +2432,7 @@ static const struct board_info __initcon
@@ -2395,6 +2438,7 @@ static const struct board_info __initcon
&board_fast2504n,
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
@ -57,7 +58,7 @@
&board_96368mvwg,
&board_96368mvngr,
&board_DGND3700v1_3800B,
@@ -2497,6 +2540,7 @@ static struct of_device_id const bcm963x
@@ -2502,6 +2546,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar
@@ -2173,6 +2173,106 @@ static struct board_info __initdata boar
},
};
@ -107,7 +107,7 @@
static struct sprom_fixup __initdata wap5813n_fixups[] = {
{ .offset = 97, .value = 0xfeed },
{ .offset = 98, .value = 0x15d1 },
@@ -2440,6 +2540,7 @@ static const struct board_info __initcon
@@ -2446,6 +2546,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
@ -115,7 +115,7 @@
&board_VR3025u,
&board_VR3025un,
&board_VR3026e,
@@ -2551,6 +2652,7 @@ static struct of_device_id const bcm963x
@@ -2557,6 +2658,7 @@ static struct of_device_id const bcm963x
{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar
@@ -2023,6 +2023,29 @@ static struct board_info __initdata boar
},
};
@ -30,7 +30,7 @@
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
@@ -2540,6 +2563,7 @@ static const struct board_info __initcon
@@ -2546,6 +2569,7 @@ static const struct board_info __initcon
&board_HG622,
&board_HG655b,
&board_P870HW51A_V2,
@ -38,7 +38,7 @@
&board_VH4032N,
&board_VR3025u,
&board_VR3025un,
@@ -2641,6 +2665,7 @@ static struct of_device_id const bcm963x
@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x
{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6368

@ -66,7 +66,7 @@
static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
{ .offset = 96, .value = 0x2046 },
{ .offset = 97, .value = 0xfe9d },
@@ -2483,6 +2542,7 @@ static const struct board_info __initcon
@@ -2489,6 +2548,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,
@ -74,7 +74,7 @@
&board_dsl_2751b_d1,
&board_FAST2704N,
#endif /* CONFIG_BCM63XX_CPU_6318 */
@@ -2585,6 +2645,7 @@ static struct of_device_id const bcm963x
@@ -2591,6 +2651,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6318
{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -347,6 +347,71 @@ static struct board_info __initdata boar
@@ -352,6 +352,71 @@ static struct board_info __initdata boar
},
};
@ -72,7 +72,7 @@
static struct sprom_fixup __initdata ar5381u_fixups[] = {
{ .offset = 97, .value = 0xfee5 },
{ .offset = 98, .value = 0x157c },
@@ -2548,6 +2613,7 @@ static const struct board_info __initcon
@@ -2554,6 +2619,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_6318 */
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
@ -80,7 +80,7 @@
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,
@@ -2659,6 +2725,8 @@ static struct of_device_id const bcm963x
@@ -2665,6 +2731,8 @@ static struct of_device_id const bcm963x
{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2595,6 +2595,42 @@ static struct board_info __initdata boar
@@ -2601,6 +2601,42 @@ static struct board_info __initdata boar
},
},
};
@ -43,7 +43,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
@@ -2700,6 +2736,7 @@ static const struct board_info __initcon
@@ -2706,6 +2742,7 @@ static const struct board_info __initcon
&board_963268bu_p300,
&board_963269bhr,
&board_vw6339gu,
@ -51,7 +51,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
};
@@ -2813,6 +2850,7 @@ static struct of_device_id const bcm963x
@@ -2819,6 +2856,7 @@ static struct of_device_id const bcm963x
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2554,6 +2554,41 @@ static struct board_info __initdata boar
@@ -2560,6 +2560,41 @@ static struct board_info __initdata boar
},
};
@ -42,7 +42,7 @@
static struct board_info __initdata board_vw6339gu = {
.name = "VW6339GU",
.expected_cpu_id = 0x63268,
@@ -2735,6 +2770,7 @@ static const struct board_info __initcon
@@ -2741,6 +2776,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
&board_963269bhr,
@ -50,7 +50,7 @@
&board_vw6339gu,
&board_BSKYB_63168,
#endif /* CONFIG_BCM63XX_CPU_63268 */
@@ -2849,6 +2885,7 @@ static struct of_device_id const bcm963x
@@ -2855,6 +2891,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar
@@ -1788,6 +1788,30 @@ static struct board_info __initdata boar
},
};
@ -31,7 +31,7 @@
static struct board_info __initdata board_fast2504n = {
.name = "F@ST2504n",
.expected_cpu_id = 0x6362,
@@ -2749,6 +2773,7 @@ static const struct board_info __initcon
@@ -2755,6 +2779,7 @@ static const struct board_info __initcon
#endif /* CONFIG_BCM63XX_CPU_6358 */
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
@ -39,7 +39,7 @@
&board_fast2504n,
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
@@ -2863,6 +2888,7 @@ static struct of_device_id const bcm963x
@@ -2869,6 +2894,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2578,6 +2578,31 @@ static struct board_info __initdata boar
@@ -2584,6 +2584,31 @@ static struct board_info __initdata boar
},
};
@ -32,7 +32,7 @@
static struct board_info __initdata board_VR3032u = {
.name = "963168M-1841N1",
.expected_cpu_id = 0x63268,
@@ -2795,6 +2820,7 @@ static const struct board_info __initcon
@@ -2801,6 +2826,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963268bu_p300,
&board_963269bhr,
@ -40,7 +40,7 @@
&board_VR3032u,
&board_vw6339gu,
&board_BSKYB_63168,
@@ -2911,6 +2937,7 @@ static struct of_device_id const bcm963x
@@ -2917,6 +2943,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_63268
{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar
@@ -1842,6 +1842,37 @@ static struct board_info __initdata boar
},
},
};
@ -38,7 +38,7 @@
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
@@ -2800,6 +2831,7 @@ static const struct board_info __initcon
@@ -2806,6 +2837,7 @@ static const struct board_info __initcon
&board_nb6,
&board_dgnd3700v2,
&board_fast2504n,
@ -46,7 +46,7 @@
#endif /* CONFIG_BCM63XX_CPU_6362 */
#ifdef CONFIG_BCM63XX_CPU_6368
&board_AV4202N,
@@ -2914,6 +2946,7 @@ static struct of_device_id const bcm963x
@@ -2920,6 +2952,7 @@ static struct of_device_id const bcm963x
{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
#endif
#ifdef CONFIG_BCM63XX_CPU_6362

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -614,6 +614,49 @@ static struct board_info __initdata boar
@@ -619,6 +619,49 @@ static struct board_info __initdata boar
},
};
@ -50,7 +50,7 @@
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
@@ -2769,6 +2812,7 @@ static const struct board_info __initcon
@@ -2775,6 +2818,7 @@ static const struct board_info __initcon
&board_AR5387un,
&board_963281TAN,
&board_A4001N,
@ -58,7 +58,7 @@
&board_A4001N1,
&board_dsl_274xb_f1,
&board_FAST2704V2,
@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x
@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x
#ifdef CONFIG_BCM63XX_CPU_6328
{ .compatible = "adb,a4001n", .data = &board_A4001N, },
{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2789,6 +2789,36 @@ static struct board_info __initdata boar
@@ -2795,6 +2795,36 @@ static struct board_info __initdata boar
},
},
};
@ -37,7 +37,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
@@ -2900,6 +2930,7 @@ static const struct board_info __initcon
@@ -2906,6 +2936,7 @@ static const struct board_info __initcon
&board_VR3032u,
&board_vw6339gu,
&board_BSKYB_63168,
@ -45,7 +45,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
};
@@ -3018,6 +3049,8 @@ static struct of_device_id const bcm963x
@@ -3024,6 +3055,8 @@ static struct of_device_id const bcm963x
{ .compatible = "comtrend,vg-8050", .data = &board_VG8050, },
{ .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, },
{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },

Loading…
Cancel
Save