From 3114410a1320307fd50217c608968f53bc56c28a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 15 Jan 2014 00:06:08 +0000 Subject: [PATCH] brcm63xx: fix BCM96318MVWG LEDs Power LED is not active low, and ppp-fail is red, not green. Signed-off-by: Florian Fainelli SVN-Revision: 39294 --- .../520-bcm63xx-add-support-for-96368MVWG-board.patch | 9 ++++----- .../521-bcm63xx-add-support-for-96368MVNgr-board.patch | 4 ++-- .../523-MIPS-BCM63XX-add-963281TAN-reference-board.patch | 2 +- .../patches-3.10/524-board_dsl_274xb_rev_f.patch | 2 +- .../linux/brcm63xx/patches-3.10/525-board_96348w3.patch | 2 +- .../linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch | 2 +- .../patches-3.10/527-board_dva-g3810bn-tl-1.patch | 2 +- target/linux/brcm63xx/patches-3.10/528-board_nb6.patch | 4 ++-- .../linux/brcm63xx/patches-3.10/529-board_fast2604.patch | 2 +- .../brcm63xx/patches-3.10/530-board_963281T_TEF.patch | 2 +- .../brcm63xx/patches-3.10/531-board_96328A-1441N1.patch | 2 +- .../brcm63xx/patches-3.10/532-board_96328a-1241N.patch | 2 +- .../linux/brcm63xx/patches-3.10/533-board_rta770bw.patch | 2 +- target/linux/brcm63xx/patches-3.10/534-board_hw556.patch | 4 ++-- .../linux/brcm63xx/patches-3.10/535-board_rta770w.patch | 2 +- .../linux/brcm63xx/patches-3.10/555-board_96318ref.patch | 2 +- .../brcm63xx/patches-3.10/556-board_96318ref_p300.patch | 2 +- .../patches-3.10/801-ssb_export_fallback_sprom.patch | 4 ++-- 18 files changed, 25 insertions(+), 26 deletions(-) diff --git a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch index d01e179f9589..067ab3b792bc 100644 --- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch @@ -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 -@@ -2225,6 +2225,86 @@ static struct board_info __initdata boar +@@ -2225,6 +2225,85 @@ static struct board_info __initdata boar #endif /* @@ -74,7 +74,6 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. + { + .name = "96368MVWG:green:power", + .gpio = 22, -+ .active_low = 1, + .default_trigger = "default-on", + }, + { @@ -83,7 +82,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. + .active_low = 1, + }, + { -+ .name = "96368MVWG:green:ppp-fail", ++ .name = "96368MVWG:red:ppp-fail", + .gpio = 31, + }, + }, @@ -97,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -2279,6 +2359,10 @@ static const struct board_info __initcon +@@ -2279,6 +2358,10 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif @@ -108,7 +107,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; /* -@@ -2460,12 +2544,25 @@ void __init board_prom_init(void) +@@ -2460,12 +2543,25 @@ void __init board_prom_init(void) bcm63xx_pci_enabled = 1; if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G2_PCI; diff --git a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch index b92f0693612a..f42f2c9a3157 100644 --- a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -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 -@@ -2302,6 +2302,72 @@ static struct board_info __initdata boar +@@ -2301,6 +2301,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 /* -@@ -2362,6 +2428,7 @@ static const struct board_info __initcon +@@ -2361,6 +2427,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, diff --git a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index b094aba57f27..30229d41f259 100644 --- a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* -@@ -2411,6 +2481,7 @@ static const struct board_info __initcon +@@ -2410,6 +2480,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch index 6c933533a2ea..fc7176bab97e 100644 --- a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch @@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* -@@ -2482,6 +2587,7 @@ static const struct board_info __initcon +@@ -2481,6 +2586,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, diff --git a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch index e93b4c1e3abb..9d8d965ecb9a 100644 --- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch @@ -60,7 +60,7 @@ #endif /* -@@ -2617,6 +2670,7 @@ static const struct board_info __initcon +@@ -2616,6 +2669,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch index 572de788424b..607e9c0b609a 100644 --- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch +++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch @@ -128,7 +128,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -2685,6 +2799,7 @@ static const struct board_info __initcon +@@ -2684,6 +2798,7 @@ static const struct board_info __initcon &board_nb4_ser_r2, &board_nb4_fxc_r1, &board_nb4_fxc_r2, diff --git a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch index 1e8f43b4b20e..9c4a9a5c839f 100644 --- a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch @@ -74,7 +74,7 @@ #endif /* -@@ -2802,6 +2869,7 @@ static const struct board_info __initcon +@@ -2801,6 +2868,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch index 0a7196d96d42..6b6d00de88ee 100644 --- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch @@ -121,7 +121,7 @@ /* * known 6368 boards */ -@@ -2872,6 +2972,10 @@ static const struct board_info __initcon +@@ -2871,6 +2971,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -132,7 +132,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2939,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2938,6 +3042,11 @@ static void __init boardid_fixup(u8 *boo } } diff --git a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch index fb346456603d..ab79266276d5 100644 --- a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch @@ -58,7 +58,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -2940,6 +2991,7 @@ static const struct board_info __initcon +@@ -2939,6 +2990,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, diff --git a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch index c864caed66b2..c894eb266c4f 100644 --- a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch +++ b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch @@ -126,7 +126,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -2972,6 +3091,7 @@ static const struct board_info __initcon +@@ -2971,6 +3090,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch index bb2adfdd933f..9ec63200e12d 100644 --- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch +++ b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch @@ -79,7 +79,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -3090,6 +3162,7 @@ static const struct board_info __initcon +@@ -3089,6 +3161,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch index 8ccdf9c5909b..f887a3c9a4b7 100644 --- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch +++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch @@ -73,7 +73,7 @@ static struct board_info __initdata board_96328A_1441N1 = { .name = "96328A-1441N1", .expected_cpu_id = 0x6328, -@@ -3162,6 +3228,7 @@ static const struct board_info __initcon +@@ -3161,6 +3227,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch index a4cffe020d9c..7ffc1ec75970 100644 --- a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch @@ -56,7 +56,7 @@ #endif /* -@@ -3242,6 +3291,7 @@ static const struct board_info __initcon +@@ -3241,6 +3290,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch index 193d9c9d97be..cb15163fe0ba 100644 --- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch @@ -489,7 +489,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -3330,6 +3812,10 @@ static const struct board_info __initcon +@@ -3329,6 +3811,10 @@ static const struct board_info __initcon &board_nb4_fxc_r2, &board_ct6373_1, &board_HW553, @@ -500,7 +500,7 @@ &board_spw303v, &board_DVAG3810BN, #endif -@@ -3395,13 +3881,37 @@ static void __init boardid_fixup(u8 *boo +@@ -3394,13 +3880,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(); diff --git a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch index 7d3707495e25..2bf5ca458256 100644 --- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch @@ -61,7 +61,7 @@ #endif /* -@@ -3774,6 +3828,7 @@ static const struct board_info __initcon +@@ -3773,6 +3827,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch index 91c9100df12e..901a0d85877f 100644 --- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch @@ -93,7 +93,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -4042,6 +4128,9 @@ static const struct board_info __initcon +@@ -4041,6 +4127,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif diff --git a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch index b8e451bb943e..35454d778af0 100644 --- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch @@ -94,7 +94,7 @@ #endif /* -@@ -4130,6 +4217,7 @@ static const struct board_info __initcon +@@ -4129,6 +4216,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, diff --git a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch index 0dac578d8bf2..9c3b299de986 100644 --- a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -4298,7 +4299,7 @@ static const struct board_info __initcon +@@ -4297,7 +4298,7 @@ static const struct board_info __initcon * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -17,7 +17,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -4318,6 +4319,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -4317,6 +4318,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; -- 2.30.2