From: Daniel Gonzalez Cabanelas Date: Wed, 14 Nov 2018 00:48:15 +0000 (+0100) Subject: brcm63xx: VH4032N: add the SPROM fixups X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33bff49a31692b0ab8cb32921bbce01ad7da850d;p=openwrt%2Fstaging%2Fdedeckeh.git brcm63xx: VH4032N: add the SPROM fixups Add the SPROM fixups for the onboard BCM43222 wifi on the Observa VH4032N Signed-off-by: Daniel Gonzalez Cabanelas --- diff --git a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch index e9bf9a7681..8339d42056 100644 --- a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch +++ b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch @@ -1,14 +1,70 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2266,6 +2266,44 @@ static struct board_info __initdata boar +@@ -2266,6 +2266,106 @@ static struct board_info __initdata boar }, }; ++static struct sprom_fixup __initdata vh4032n_fixups[] = { ++ { .offset = 2, .value = 0x04d2 }, ++ { .offset = 4, .value = 0x4350 }, ++ { .offset = 65, .value = 0x1300 }, ++ { .offset = 68, .value = 0x0402 }, ++ { .offset = 70, .value = 0x0090 }, ++ { .offset = 71, .value = 0x4c19 }, ++ { .offset = 72, .value = 0x2345 }, ++ { .offset = 87, .value = 0x0315 }, ++ { .offset = 88, .value = 0x0315 }, ++ { .offset = 96, .value = 0x2048 }, ++ { .offset = 97, .value = 0xfed7 }, ++ { .offset = 98, .value = 0x15a6 }, ++ { .offset = 99, .value = 0xfaee }, ++ { .offset = 100, .value = 0x3e3a }, ++ { .offset = 101, .value = 0x3a36 }, ++ { .offset = 102, .value = 0xff7f }, ++ { .offset = 103, .value = 0x11b9 }, ++ { .offset = 104, .value = 0xfc53 }, ++ { .offset = 105, .value = 0xffe6 }, ++ { .offset = 106, .value = 0xfdd2 }, ++ { .offset = 107, .value = 0xfe49 }, ++ { .offset = 108, .value = 0xff6a }, ++ { .offset = 109, .value = 0x136e }, ++ { .offset = 110, .value = 0xfbed }, ++ { .offset = 111, .value = 0x0000 }, ++ { .offset = 112, .value = 0x2048 }, ++ { .offset = 113, .value = 0xfee2 }, ++ { .offset = 114, .value = 0x15e5 }, ++ { .offset = 115, .value = 0xfaed }, ++ { .offset = 116, .value = 0x3e3a }, ++ { .offset = 117, .value = 0x3a36 }, ++ { .offset = 118, .value = 0xffc8 }, ++ { .offset = 119, .value = 0x12b8 }, ++ { .offset = 120, .value = 0xfca1 }, ++ { .offset = 121, .value = 0xff9b }, ++ { .offset = 122, .value = 0x122a }, ++ { .offset = 123, .value = 0xfcc8 }, ++ { .offset = 124, .value = 0xff95 }, ++ { .offset = 125, .value = 0x146b }, ++ { .offset = 126, .value = 0xfbba }, ++ { .offset = 127, .value = 0x0000 }, ++ { .offset = 161, .value = 0x0000 }, ++ { .offset = 162, .value = 0x0000 }, ++ { .offset = 169, .value = 0x0000 }, ++ { .offset = 170, .value = 0x0000 }, ++ { .offset = 171, .value = 0x0000 }, ++ { .offset = 172, .value = 0x0000 }, ++ { .offset = 173, .value = 0x0000 }, ++ { .offset = 174, .value = 0x0000 }, ++ { .offset = 175, .value = 0x0000 }, ++ { .offset = 176, .value = 0x0000 }, ++ { .offset = 219, .value = 0x1108 }, ++}; ++ +static struct board_info __initdata board_VH4032N = { + .name = "VH4032N", + .expected_cpu_id = 0x6368, + + .has_pci = 1, ++ .use_fallback_sprom = 1, + .has_ohci0 = 1, + .has_ehci0 = 1, + .num_usbh_ports = 2, @@ -39,13 +95,19 @@ + }, + }, + -+ .use_fallback_sprom = 1, ++ .fallback_sprom = { ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vh4032n_fixups, ++ .num_board_fixups = ARRAY_SIZE(vh4032n_fixups), ++ }, +}; + static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2548,6 +2586,7 @@ static const struct board_info __initcon +@@ -2548,6 +2648,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -53,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2659,6 +2698,7 @@ static struct of_device_id const bcm963x +@@ -2659,6 +2760,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch index 4b4b1a0de5..a77cea1762 100644 --- a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch +++ b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2586,6 +2609,7 @@ static const struct board_info __initcon +@@ -2648,6 +2671,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2687,6 +2711,7 @@ static struct of_device_id const bcm963x +@@ -2749,6 +2773,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch index 1974ccd817..78436c5a0b 100644 --- a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch +++ b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch @@ -68,7 +68,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2526,6 +2587,7 @@ static const struct board_info __initcon +@@ -2588,6 +2649,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -76,7 +76,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif -@@ -2631,6 +2693,7 @@ static struct of_device_id const bcm963x +@@ -2693,6 +2755,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, }, diff --git a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch index 7b28a24e3f..b625237aea 100644 --- a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch +++ b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch @@ -74,7 +74,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2593,6 +2660,7 @@ static const struct board_info __initcon +@@ -2655,6 +2722,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -82,7 +82,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2707,6 +2775,7 @@ static struct of_device_id const bcm963x +@@ -2769,6 +2837,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch index 9383e55f7c..15dcf6955e 100644 --- a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch +++ b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2642,6 +2642,49 @@ static struct board_info __initdata boar +@@ -2704,6 +2704,49 @@ static struct board_info __initdata boar }, }, }; @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2750,6 +2793,7 @@ static const struct board_info __initcon +@@ -2812,6 +2855,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -58,7 +58,7 @@ #endif }; -@@ -2862,6 +2906,7 @@ static struct of_device_id const bcm963x +@@ -2924,6 +2968,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, },