diff options
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 0000000000..798e8018fc --- /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 e1283596e5..d3d35d7a72 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 812eaa2cf2..2432b3a0be 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 ff27572ba8..a9e39987c2 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 a9cca53a14..2edadfdcc1 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 ba10d15c2a..13844f69cb 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 520678d9eb..559130b7ed 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 5547222d71..c1cb917691 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 63d9e14d7e..5b2c2aff11 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 43f6b73ad8..15c669be5e 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 79251f4eaa..8735d7d809 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 9bbde4b016..87e0ae6acc 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 419f3a0ae3..376b57e2fa 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 d7f583cd57..1cf9532afd 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 756b2a369b..7b7a832aca 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 d10af1c7ec..22d7a18364 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 00da3a29d0..7e20e0dec2 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 d272bdb78a..48f1530085 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 94526ccc31..f408a8c737 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 b743a95278..19002f1fdb 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 cbf1879926..29bbf82af3 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 a5f3ce95e4..604515b7d2 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 53c0af2c70..52b083207d 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 a8b3be294e..bd43da5c0c 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 cb86b61388..06ecfb6a89 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 569e9ae9d4..bb6ea36611 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, }; |