summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-06 15:44:52 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-06 15:44:52 +0000
commitc69a2cdfbb4f8774e2f7d84084e892bb58b96330 (patch)
tree201a519d3d00023c6427f2b28c7e02bd9cfa2d81
parentce1d4d7ee946f64c21964e62c67ca4aa73d671b1 (diff)
downloadmtk-20170518-c69a2cdfbb4f8774e2f7d84084e892bb58b96330.zip
mtk-20170518-c69a2cdfbb4f8774e2f7d84084e892bb58b96330.tar.gz
mtk-20170518-c69a2cdfbb4f8774e2f7d84084e892bb58b96330.tar.bz2
fix leds naming for all bcm63xx boards
SVN-Revision: 32086
-rw-r--r--target/linux/brcm63xx/patches-3.3/319-board_leds_naming.patch267
-rw-r--r--target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch8
-rw-r--r--target/linux/brcm63xx/patches-3.3/501-board-NB4.patch90
-rw-r--r--target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch26
-rw-r--r--target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch12
-rw-r--r--target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch12
-rw-r--r--target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch16
-rw-r--r--target/linux/brcm63xx/patches-3.3/508-board_hw553.patch23
-rw-r--r--target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch10
-rw-r--r--target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch14
-rw-r--r--target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch6
-rw-r--r--target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch8
-rw-r--r--target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch8
-rw-r--r--target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch16
-rw-r--r--target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch14
-rw-r--r--target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch31
-rw-r--r--target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch4
-rw-r--r--target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch4
26 files changed, 429 insertions, 166 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/319-board_leds_naming.patch b/target/linux/brcm63xx/patches-3.3/319-board_leds_naming.patch
new file mode 100644
index 0000000..798e801
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/319-board_leds_naming.patch
@@ -0,0 +1,267 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -61,28 +61,28 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl",
++ .name = "96338GW:green:adsl",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ses",
++ .name = "96338GW:green:ses",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96338GW:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96338GW!green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96338GW:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ }
+@@ -102,28 +102,28 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl",
++ .name = "96338W:green:adsl",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ses",
++ .name = "96338W:green:ses",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96338W:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96338W:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96338W:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
+@@ -162,29 +162,29 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl-fail",
++ .name = "96348R:green:adsl-fail",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp",
++ .name = "96348R:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96348R:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96348R:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+
+ },
+ {
+- .name = "stop",
++ .name = "96348R:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
+@@ -223,28 +223,28 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl-fail",
++ .name = "96348GW-10:green:adsl-fail",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp",
++ .name = "96348GW-10:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96348GW-10:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96348GW-10:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96348GW-10:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
+@@ -277,28 +277,28 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl-fail",
++ .name = "96348GW-11:green:adsl-fail",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp",
++ .name = "96348GW-11:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96348GW-11:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96348GW-11:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96348GW-11:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
+@@ -345,28 +345,28 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl-fail",
++ .name = "96348GW:green:adsl-fail",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp",
++ .name = "96348GW:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96348GW:green:ppp-fail",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96348GW:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96348GW:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
+@@ -498,27 +498,27 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl-fail",
++ .name = "96358VW:green:adsl-fail",
+ .gpio = 15,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp",
++ .name = "96358VW:green:ppp",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96358VW:green:ppp-fail",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ {
+- .name = "power",
++ .name = "96358VW:green:power",
+ .gpio = 4,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96358VW:green:stop",
+ .gpio = 5,
+ },
+ },
+@@ -550,22 +550,22 @@ static struct board_info __initdata boar
+
+ .leds = {
+ {
+- .name = "adsl",
++ .name = "96358VW2:green:adsl",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
+- .name = "ppp-fail",
++ .name = "96358VW2:green:ppp-fail",
+ .gpio = 23,
+ },
+ {
+- .name = "power",
++ .name = "96358VW2:green:power",
+ .gpio = 5,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
+- .name = "stop",
++ .name = "96358VW2:green:stop",
+ .gpio = 4,
+ .active_low = 1,
+ },
diff --git a/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
index e128359..d3d35d7 100644
--- a/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-3.3/500-board-D4PW.patch
@@ -20,22 +20,22 @@
+
+ .leds = {
+ {
-+ .name = "power:green",
++ .name = "D-4P-W:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ },
+ {
-+ .name = "status",
++ .name = "D-4P-W::status",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
-+ .name = "internet:green",
++ .name = "D-4P-W:green:internet",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "internet:red",
++ .name = "D-4P-W:red:internet",
+ .gpio = 5,
+ .active_low = 1,
+ },
diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
index 812eaa2..2432b3a 100644
--- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
@@ -88,47 +88,47 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "NB4-SER-r0:white:adsl",
+ .gpio = NB4_74HC64_GPIO(4),
+ .active_low = 1,
+ },
+ {
-+ .name = "traffic",
++ .name = "NB4-SER-r0:white:traffic",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "tel",
++ .name = "NB4-SER-r0:white:tel",
+ .gpio = NB4_74HC64_GPIO(3),
+ .active_low = 1,
+ },
+ {
-+ .name = "tv",
++ .name = "NB4-SER-r0:white:tv",
+ .gpio = NB4_74HC64_GPIO(2),
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "NB4-SER-r0:white:wifi",
+ .gpio = 15,
+ .active_low = 1,
+ },
+ {
-+ .name = "alarm",
++ .name = "NB4-SER-r0:white:alarm",
+ .gpio = NB4_74HC64_GPIO(0),
+ .active_low = 1,
+ },
+ {
-+ .name = "service:red",
++ .name = "NB4-SER-r0:red:service",
+ .gpio = 29,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:green",
++ .name = "NB4-SER-r0:green:service",
+ .gpio = 30,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:blue",
++ .name = "NB4-SER-r0:blue:service",
+ .gpio = 4,
+ .active_low = 1,
+ },
@@ -181,47 +181,47 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "NB4-SER-r1:white:adsl",
+ .gpio = NB4_74HC64_GPIO(4),
+ .active_low = 1,
+ },
+ {
-+ .name = "traffic",
++ .name = "NB4-SER-r1:white:traffic",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "tel",
++ .name = "NB4-SER-r1:white:tel",
+ .gpio = NB4_74HC64_GPIO(3),
+ .active_low = 1,
+ },
+ {
-+ .name = "tv",
++ .name = "NB4-SER-r1:white:tv",
+ .gpio = NB4_74HC64_GPIO(2),
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "NB4-SER-r1:white:wifi",
+ .gpio = 15,
+ .active_low = 1,
+ },
+ {
-+ .name = "alarm",
++ .name = "NB4-SER-r1:white:alarm",
+ .gpio = NB4_74HC64_GPIO(0),
+ .active_low = 1,
+ },
+ {
-+ .name = "service:red",
++ .name = "NB4-SER-r1:red:service",
+ .gpio = 29,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:green",
++ .name = "NB4-SER-r1:green:service",
+ .gpio = 30,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:blue",
++ .name = "NB4-SER-r1:blue:service",
+ .gpio = 4,
+ .active_low = 1,
+ },
@@ -274,47 +274,47 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "NB4-SER-r2:white:adsl",
+ .gpio = NB4_74HC64_GPIO(4),
+ .active_low = 1,
+ },
+ {
-+ .name = "traffic",
++ .name = "NB4-SER-r2:white:traffic",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "tel",
++ .name = "NB4-SER-r2:white:tel",
+ .gpio = NB4_74HC64_GPIO(3),
+ .active_low = 1,
+ },
+ {
-+ .name = "tv",
++ .name = "NB4-SER-r2:white:tv",
+ .gpio = NB4_74HC64_GPIO(2),
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "NB4-SER-r2:white:wifi",
+ .gpio = 15,
+ .active_low = 1,
+ },
+ {
-+ .name = "alarm",
++ .name = "NB4-SER-r2:white:alarm",
+ .gpio = NB4_74HC64_GPIO(0),
+ .active_low = 1,
+ },
+ {
-+ .name = "service:red",
++ .name = "NB4-SER-r2:red:service",
+ .gpio = 29,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:green",
++ .name = "NB4-SER-r2:green:service",
+ .gpio = 30,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:blue",
++ .name = "NB4-SER-r2:blue:service",
+ .gpio = 4,
+ .active_low = 1,
+ },
@@ -367,43 +367,43 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "NB4-FXC-r1:white:adsl",
+ .gpio = NB4_74HC64_GPIO(4),
+ .active_low = 1,
+ },
+ {
-+ .name = "traffic",
++ .name = "NB4-FXC-r1:white:traffic",
+ .gpio = 2,
+ },
+ {
-+ .name = "tel",
++ .name = "NB4-FXC-r1:white:tel",
+ .gpio = NB4_74HC64_GPIO(3),
+ .active_low = 1,
+ },
+ {
-+ .name = "tv",
++ .name = "NB4-FXC-r1:white:tv",
+ .gpio = NB4_74HC64_GPIO(2),
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "NB4-FXC-r1:white:wifi",
+ .gpio = 15,
+ },
+ {
-+ .name = "alarm",
++ .name = "NB4-FXC-r1:white:alarm",
+ .gpio = NB4_74HC64_GPIO(0),
+ .active_low = 1,
+ },
+ {
-+ .name = "service:red",
++ .name = "NB4-FXC-r1:red:service",
+ .gpio = 29,
+ },
+ {
-+ .name = "service:green",
++ .name = "NB4-FXC-r1:green:service",
+ .gpio = 30,
+ },
+ {
-+ .name = "service:blue",
++ .name = "NB4-FXC-r1:blue:service",
+ .gpio = 4,
+ },
+ },
@@ -455,43 +455,43 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "NB4-FXC-r2:white:adsl",
+ .gpio = NB4_74HC64_GPIO(4),
+ .active_low = 1,
+ },
+ {
-+ .name = "traffic",
++ .name = "NB4-FXC-r2:white:traffic",
+ .gpio = 2,
+ },
+ {
-+ .name = "tel",
++ .name = "NB4-FXC-r2:white:tel",
+ .gpio = NB4_74HC64_GPIO(3),
+ .active_low = 1,
+ },
+ {
-+ .name = "tv",
++ .name = "NB4-FXC-r2:white:tv",
+ .gpio = NB4_74HC64_GPIO(2),
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "NB4-FXC-r2:white:wifi",
+ .gpio = 15,
+ },
+ {
-+ .name = "alarm",
++ .name = "NB4-FXC-r2:white:alarm",
+ .gpio = NB4_74HC64_GPIO(0),
+ .active_low = 1,
+ },
+ {
-+ .name = "service:red",
++ .name = "NB4-FXC-r2:red:service",
+ .gpio = 29,
+ },
+ {
-+ .name = "service:green",
++ .name = "NB4-FXC-r2:green:service",
+ .gpio = 30,
+ },
+ {
-+ .name = "service:blue",
++ .name = "NB4-FXC-r2:blue:service",
+ .gpio = 4,
+ },
+ },
diff --git a/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
index ff27572..a9e3998 100644
--- a/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.3/502-board-96338W2_E7T.patch
@@ -18,17 +18,17 @@
+
+ .leds = {
+ {
-+ .name = "ppp",
++ .name = "96338W2_E7T:green:ppp",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "ppp-fail",
++ .name = "96338W2_E7T:green:ppp-fail",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
-+ .name = "power",
++ .name = "96338W2_E7T:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
diff --git a/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
index a9cca53..2edadfd 100644
--- a/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.3/503-board-CPVA642.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -663,6 +663,98 @@ static struct board_info __initdata boar
+@@ -663,6 +663,96 @@ static struct board_info __initdata boar
},
};
@@ -21,56 +21,54 @@
+ .has_ehci0 = 1,
+
+ .leds = {
-+ /* bi-color */
+ {
-+ .name = "power:red",
++ .name = "CPVA642:red:power",
+ .gpio = 14,
+ .active_low = 1,
+ },
+ {
-+ .name = "power:green",
++ .name = "CPVA642:green:power",
+ .gpio = 11,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "wifi:red",
++ .name = "CPVA642:red:wifi",
+ .gpio = 6,
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi:green",
++ .name = "CPVA642:green:wifi",
+ .gpio = 28,
+ .active_low = 0,
+ },
+ {
-+ .name = "link:red",
++ .name = "CPVA642:red:link",
+ .gpio = 9,
+ .active_low = 1,
+ },
+ {
-+ .name = "link:green",
++ .name = "CPVA642:green:link",
+ .gpio = 10,
+ .active_low = 1,
+ },
-+ /* green only */
+ {
-+ .name = "ether",
++ .name = "CPVA642:green:ether",
+ .gpio = 1,
+ .active_low = 1,
+ },
+ {
-+ .name = "phone1",
++ .name = "CPVA642:green:phone1",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "phone2",
++ .name = "CPVA642:green:phone2",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "usb",
++ .name = "CPVA642:green:usb",
+ .gpio = 3,
+ .active_low = 1,
+ },
@@ -99,7 +97,7 @@
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
-@@ -1226,6 +1318,7 @@ static const struct board_info __initdat
+@@ -1226,6 +1316,7 @@ static const struct board_info __initdat
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,
diff --git a/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
index ba10d15..13844f6 100644
--- a/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.3/504-board_dsl_274xb_rev_c.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -799,6 +799,59 @@ static struct board_info __initdata boar
+@@ -797,6 +797,59 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@@ -60,7 +60,7 @@
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
-@@ -1320,6 +1373,7 @@ static const struct board_info __initdat
+@@ -1318,6 +1371,7 @@ static const struct board_info __initdat
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,
diff --git a/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
index 520678d..559130b 100644
--- a/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.3/505-board_spw500v.patch
@@ -28,27 +28,27 @@
+
+ .leds = {
+ {
-+ .name = "power:red",
++ .name = "SPW500V:red:power",
+ .gpio = 1,
+ .active_low = 1,
+ },
+ {
-+ .name = "power:green",
++ .name = "SPW500V:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "ppp",
++ .name = "SPW500V:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
-+ { .name = "pstn",
++ { .name = "SPW500V:green:pstn",
+ .gpio = 28,
+ .active_low = 1,
+ },
+ {
-+ .name = "voip",
++ .name = "SPW500V:green:voip",
+ .gpio = 32,
+ .active_low = 1,
+ },
@@ -68,7 +68,7 @@
#endif
/*
-@@ -1365,6 +1426,7 @@ static const struct board_info __initdat
+@@ -1363,6 +1424,7 @@ static const struct board_info __initdat
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,
diff --git a/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
index 5547222..c1cb917 100644
--- a/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.3/506-board_gw6200_gw6000.patch
@@ -26,7 +26,7 @@
+
+ .has_dsp = 1,
+ .dsp = {
-+ .gpio_rst = 8, /* FIXME: What is real GPIO here? */
++ .gpio_rst = 8, /* FIXME: What is real GPIO here? */
+ .gpio_int = 34,
+ .ext_irq = 2,
+ .cs = 2,
@@ -34,22 +34,22 @@
+
+ .leds = {
+ {
-+ .name = "line1",
++ .name = "GW6200:green:line1",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "line2",
++ .name = "GW6200:green:line2",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
-+ .name = "line3",
++ .name = "GW6200:green:line3",
+ .gpio = 6,
+ .active_low = 1,
+ },
+ {
-+ .name = "tel",
++ .name = "GW6200:green:tel",
+ .gpio = 7,
+ .active_low = 1,
+ },
@@ -113,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1419,6 +1525,8 @@ static const struct board_info __initdat
+@@ -1417,6 +1523,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
diff --git a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
index 63d9e14..5b2c2af 100644
--- a/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.3/507-board-MAGIC.patch
@@ -38,37 +38,37 @@
+
+ .leds = {
+ {
-+ .name = "voip",
++ .name = "MAGIC:green:voip",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl",
++ .name = "MAGIC:green:adsl",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi",
++ .name = "MAGIC:green:wifi",
+ .gpio = 28,
+ },
+ {
-+ .name = "usb",
++ .name = "MAGIC:green:usb",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "hpna",
++ .name = "MAGIC:green:hpna",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "power",
++ .name = "MAGIC:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "stop",
++ .name = "MAGIC:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
@@ -77,7 +77,7 @@
#endif
/*
-@@ -1535,6 +1605,7 @@ static const struct board_info __initdat
+@@ -1533,6 +1603,7 @@ static const struct board_info __initdat
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
diff --git a/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
index 43f6b73..15c669b 100644
--- a/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.3/508-board_hw553.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1578,6 +1578,81 @@ static struct board_info __initdata boar
+@@ -1576,6 +1576,80 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@@ -29,51 +29,50 @@
+ .has_ehci0 = 1,
+
+ .leds = {
-+ /*Each led on HW553 is bi-color (except wifi) */
+ {
-+ .name = "lan:red",
++ .name = "HW553:red:lan",
+ .gpio = 34,
+ .active_low = 1,
+ },
+ {
-+ .name = "lan:blue",
++ .name = "HW553:blue:lan",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl:red",
++ .name = "HW553:red:adsl",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl:blue",
++ .name = "HW553:blue:adsl",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ {
-+ .name = "power:red",
++ .name = "HW553:red:power",
+ .gpio = 5,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+
+ {
-+ .name = "power:blue",
++ .name = "HW553:blue:power",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi:red",
++ .name = "HW553:red:wifi",
+ .gpio = 25,
+ .active_low = 1,
+ },
+ {
-+ .name = "internetkey:red",
++ .name = "HW553:red:internetkey",
+ .gpio = 12,
+ .active_low = 1,
+ },
+ {
-+ .name = "internetkey:blue",
++ .name = "HW553:blue:internetkey",
+ .gpio = 13,
+ .active_low = 1,
+ },
@@ -82,7 +81,7 @@
#endif
/*
-@@ -1620,6 +1695,7 @@ static const struct board_info __initdat
+@@ -1618,6 +1692,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
index 79251f4..8735d7d 100644
--- a/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.3/509-board_rta1320_16m.patch
@@ -19,23 +19,23 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "RTA1320_16M:green:adsl",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
-+ .name = "ppp",
++ .name = "RTA1320_16M:green:ppp",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "power",
++ .name = "RTA1320_16M:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "stop",
++ .name = "RTA1320_16M:green:stop",
+ .gpio = 1,
+ .active_low = 1,
+ },
@@ -44,7 +44,7 @@
#endif
/*
-@@ -1663,6 +1700,7 @@ static const struct board_info __initdat
+@@ -1660,6 +1697,7 @@ static const struct board_info __initdat
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
diff --git a/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
index 9bbde4b..87e0ae6 100644
--- a/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.3/510-board_spw303v.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1690,6 +1690,72 @@ static struct board_info __initdata boar
+@@ -1687,6 +1687,72 @@ static struct board_info __initdata boar
},
},
};
@@ -73,7 +73,7 @@
#endif
/*
-@@ -1734,6 +1800,7 @@ static const struct board_info __initdat
+@@ -1731,6 +1797,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
index 419f3a0..376b57e 100644
--- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
@@ -25,27 +25,27 @@
+
+ .leds = {
+ {
-+ .name = "power:green",
++ .name = "V2500V_BB:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "power:red",
++ .name = "V2500V_BB:red:power",
+ .gpio = 1,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl",
++ .name = "V2500V_BB:green:adsl",
+ .gpio = 2,
+ .active_low = 1,
+ },
-+ { .name = "ppp",
++ { .name = "V2500V_BB:green:ppp",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
-+ .name = "wireless",
++ .name = "V2500V_BB:green:wireless",
+ .gpio = 6,
+ .active_low = 1,
+ },
@@ -64,7 +64,7 @@
#endif
/*
-@@ -1785,6 +1842,7 @@ static const struct board_info __initdat
+@@ -1782,6 +1839,7 @@ static const struct board_info __initdat
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@@ -72,7 +72,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1911,6 +1969,23 @@ void __init board_prom_init(void)
+@@ -1908,6 +1966,23 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
diff --git a/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
index d7f583c..1cf9532 100644
--- a/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.3/512-board_BTV2110.patch
@@ -63,7 +63,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1843,6 +1899,7 @@ static const struct board_info __initdat
+@@ -1840,6 +1896,7 @@ static const struct board_info __initdat
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
diff --git a/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
index 756b2a3..7b7a832 100644
--- a/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.3/514-board_ct536_ct5621.patch
@@ -24,12 +24,12 @@
+
+ .leds = {
+ {
-+ .name = "adsl-fail",
++ .name = "CT536_CT5621:green:adsl-fail",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "power",
++ .name = "CT536_CT5621:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
@@ -50,7 +50,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1900,6 +1943,7 @@ static const struct board_info __initdat
+@@ -1897,6 +1940,7 @@ static const struct board_info __initdat
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
diff --git a/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
index d10af1c..22d7a18 100644
--- a/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.3/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1212,6 +1212,8 @@ static struct board_info __initdata boar
+@@ -1210,6 +1210,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,
-@@ -1227,6 +1229,7 @@ static struct board_info __initdata boar
+@@ -1225,6 +1227,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
diff --git a/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
index 00da3a2..7e20e0d 100644
--- a/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.3/516-board_96348A-122.patch
@@ -21,18 +21,18 @@
+
+ .leds = {
+ {
-+ .name = "power",
++ .name = "96348A-122:green:power",
+ .gpio = 0,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "alarm",
++ .name = "96348A-122:green:alarm",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "wps",
++ .name = "96348A-122:green:wps",
+ .gpio = 6,
+ .active_low = 1,
+ },
@@ -68,7 +68,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1947,6 +2008,7 @@ static const struct board_info __initdat
+@@ -1944,6 +2005,7 @@ static const struct board_info __initdat
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
diff --git a/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
index d272bdb..48f1530 100644
--- a/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.3/519_board_CPVA502plus.patch
@@ -25,17 +25,17 @@
+
+ .leds = {
+ {
-+ .name = "phone",
++ .name = "CPVA502+:green:phone",
+ .gpio = 0,
+ .active_low = 1,
+ },
+ {
-+ .name = "link",
++ .name = "CPVA502+:green:link",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
-+ .name = "feth1", /* FIXME:does gpio4 enable eth1 phy? */
++ .name = "CPVA502+:green:feth1", /* FIXME:does gpio4 enable eth1 phy? */
+ .gpio = 4,
+ .active_low = 1,
+ },
@@ -45,7 +45,7 @@
#endif
/*
-@@ -2010,6 +2048,7 @@ static const struct board_info __initdat
+@@ -2007,6 +2045,7 @@ static const struct board_info __initdat
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
diff --git a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 94526cc..f408a8c 100644
--- a/target/linux/brcm63xx/patches-3.3/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/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
-@@ -2018,6 +2018,80 @@ static struct board_info __initdata boar
+@@ -2015,6 +2015,80 @@ static struct board_info __initdata boar
#endif
/*
@@ -57,27 +57,27 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "96368MVWG:green:adsl",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "ppp",
++ .name = "96368MVWG:green:ppp",
+ .gpio = 5,
+ },
+ {
-+ .name = "power",
++ .name = "96368MVWG:green:power",
+ .gpio = 22,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "wps",
++ .name = "96368MVWG:green:wps",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ {
-+ .name = "ppp-fail",
++ .name = "96368MVWG:green:ppp-fail",
+ .gpio = 31,
+ },
+ },
@@ -91,7 +91,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
* all boards
*/
static const struct board_info __initdata *bcm963xx_boards[] = {
-@@ -2066,6 +2140,10 @@ static const struct board_info __initdat
+@@ -2063,6 +2137,10 @@ static const struct board_info __initdat
&board_HW553,
&board_spw303v,
#endif
@@ -102,7 +102,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
};
static void __init nb4_nvram_fixup(void)
-@@ -2243,12 +2321,25 @@ void __init board_prom_init(void)
+@@ -2240,12 +2318,25 @@ void __init board_prom_init(void)
if (board.has_pci) {
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
diff --git a/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index b743a95..19002f1 100644
--- a/target/linux/brcm63xx/patches-3.3/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/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
-@@ -2089,6 +2089,72 @@ static struct board_info __initdata boar
+@@ -2086,6 +2086,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@@ -52,26 +52,26 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "96368MVNgr:green:adsl",
+ .gpio = 2,
+ .active_low = 1,
+ },
+ {
-+ .name = "inet",
++ .name = "96368MVNgr:green:inet",
+ .gpio = 5,
+ },
+ {
-+ .name = "power",
++ .name = "96368MVNgr:green:power",
+ .gpio = 22,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "wps",
++ .name = "96368MVNgr:green:wps",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ {
-+ .name = "inet-fail",
++ .name = "96368MVNgr:green:inet-fail",
+ .gpio = 3,
+ },
+ },
@@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif
/*
-@@ -2143,6 +2209,7 @@ static const struct board_info __initdat
+@@ -2140,6 +2206,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
diff --git a/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
index cbf1879..29bbf82 100644
--- a/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
@@ -90,7 +90,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -2161,6 +2235,9 @@ static struct board_info __initdata boar
+@@ -2158,6 +2232,9 @@ static struct board_info __initdata boar
* all boards
*/
static const struct board_info __initdata *bcm963xx_boards[] = {
diff --git a/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index a5f3ce9..604515b 100644
--- a/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.3/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif
/*
-@@ -2237,6 +2307,7 @@ static struct board_info __initdata boar
+@@ -2234,6 +2304,7 @@ static struct board_info __initdata boar
static const struct board_info __initdata *bcm963xx_boards[] = {
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
diff --git a/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
index 53c0af2..52b0832 100644
--- a/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.3/524-board_dsl_274xb_rev_f.patch
@@ -120,7 +120,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif
/*
-@@ -2308,6 +2411,7 @@ static const struct board_info __initdat
+@@ -2305,6 +2408,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
index a8b3be2..bd43da5 100644
--- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
@@ -1,80 +1,79 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1553,6 +1553,99 @@ static struct board_info __initdata boar
+@@ -1551,6 +1551,98 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
+
+ .leds = {
-+ /*Each led on alice gate is bi-color */
+ {
-+ .name = "power:red",
++ .name = "AGPF-S0:red:power",
+ .gpio = 5,
+ .active_low = 1,
+ },
+ {
-+ .name = "power:green",
++ .name = "AGPF-S0:green:power",
+ .gpio = 4,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "service:red",
++ .name = "AGPF-S0:red:service",
+ .gpio = 7,
+ .active_low = 1,
+ },
+ {
-+ .name = "service:green",
++ .name = "AGPF-S0:green:service",
+ .gpio = 6,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl:green",
++ .name = "AGPF-S0:green:adsl",
+ .gpio = 9,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl:red",
++ .name = "AGPF-S0:red:adsl",
+ .gpio = 10,
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi:red",
++ .name = "AGPF-S0:red:wifi",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ {
-+ .name = "wifi:green",
++ .name = "AGPF-S0:green:wifi",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "internet:green",
++ .name = "AGPF-S0:green:internet",
+ .gpio = 25,
+ .active_low = 1,
+ },
+ {
-+ .name = "internet:red",
++ .name = "AGPF-S0:red:internet",
+ .gpio = 24,
+ .active_low = 1,
+ },
+ {
-+ .name = "usr1:red",
++ .name = "AGPF-S0:red:usr1",
+ .gpio = 27,
+ .active_low = 1,
+ },
+ {
-+ .name = "usr1:green",
++ .name = "AGPF-S0:green:usr1",
+ .gpio = 26,
+ .active_low = 1,
+ },
+ {
-+ .name = "usr2:red",
++ .name = "AGPF-S0:red:usr2",
+ .gpio = 30,
+ .active_low = 1,
+ },
+ {
-+ .name = "usr2:green",
++ .name = "AGPF-S0:green:usr2",
+ .gpio = 29,
+ .active_low = 1,
+ },
diff --git a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
index cb86b61..06ecfb6 100644
--- a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
@@ -7,12 +7,12 @@
+
+ .leds = {
+ {
-+ .name = "adsl",
++ .name = "96348GW-A::adsl",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
-+ .name = "usb",
++ .name = "96348GW-A::usb",
+ .gpio = 0,
+ .active_low = 1,
+ }
diff --git a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
index 569e9ae..bb6ea36 100644
--- a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch
@@ -8,7 +8,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h>
-@@ -2604,7 +2605,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2600,7 +2601,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work
*/
#ifdef CONFIG_SSB_PCIHOST
@@ -17,7 +17,7 @@
.revision = 0x02,
.board_rev = 0x17,
.country_code = 0x0,
-@@ -2624,6 +2625,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2620,6 +2621,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};