aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-05-11 13:33:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-05-11 13:33:50 +0000
commit93e4186e52cb545eb4ea364eea5077ecfc71ea4f (patch)
treea84efc8f34db130263f074e1f0d2b6c3e68f5f45
parentbc014cb9cd0dff710d2ea8dee93ea2d139797cda (diff)
downloadupstream-93e4186e52cb545eb4ea364eea5077ecfc71ea4f.tar.gz
upstream-93e4186e52cb545eb4ea364eea5077ecfc71ea4f.tar.bz2
upstream-93e4186e52cb545eb4ea364eea5077ecfc71ea4f.zip
bcm63xx: Update support for the DSL-274xB revision C
Rename the DSL-274xB rev C2's board ID to "AW4139" to match the one used for the rev C3 (same hardware) and add a fixup for C2. Also generate images for C3. While we are at it, rename the LEDs to conform to the Linux LED naming conventions. Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26876 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network (renamed from target/linux/brcm63xx/base-files/etc/defconfig/96358GW/network)0
-rwxr-xr-xtarget/linux/brcm63xx/base-files/lib/brcm63xx.sh7
-rw-r--r--target/linux/brcm63xx/image/Makefile4
-rw-r--r--target/linux/brcm63xx/patches-2.6.37/400-board_dsl_274xb_rev_c.patch (renamed from target/linux/brcm63xx/patches-2.6.37/400-board_96358gw.patch)44
4 files changed, 31 insertions, 24 deletions
diff --git a/target/linux/brcm63xx/base-files/etc/defconfig/96358GW/network b/target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network
index a35fd2ef9a..a35fd2ef9a 100644
--- a/target/linux/brcm63xx/base-files/etc/defconfig/96358GW/network
+++ b/target/linux/brcm63xx/base-files/etc/defconfig/AW4139/network
diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index 71c188022c..b18386e0dd 100755
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -39,11 +39,16 @@ brcm63xx_detect() {
brcm63xx_has_reset_button="true"
ifname=eth0
;;
- "bcm63xx/96358GW "* | "bcm63xx/SPW500V "*)
+ "bcm63xx/SPW500V "*)
status_led="power:green"
brcm63xx_has_reset_button="true"
ifname=eth0
;;
+ "bcm63xx/AW4139 "*)
+ status_led="dsl-274xb:green:power"
+ brcm63xx_has_reset_button="true"
+ ifname=eth0
+ ;;
"bcm63xx/CPVA642 "* )
status_led="power:green"
brcm63xx_has_reset_button="true"
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 22d297137c..144f5559ea 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -177,7 +177,9 @@ define Image/Build
# D-Link DSL-2640B
$(call Image/Build/CFE,$(1),D-4P-W,6348,DSL2640B)
# D-Link DSL-2740B/DSL-2741B, rev C2
- $(call Image/Build/CFE,$(1),96358GW,6358,DSL274XB-C2)
+ $(call Image/Build/CFEFIXUP,$(1),96358GW,AW4139,6358,DSL274XB-C2)
+ # D-Link DSL-2740B/DSL-2741B, rev C3
+ $(call Image/Build/CFE,$(1),AW4139,6358,DSL274XB-C3)
# TP-Link TD-8810A, TD-8810B, TD-8811A, TD-8811B
$(call Image/Build/CFE,$(1),8L-2M-8M,6338,TP8810_8811)
diff --git a/target/linux/brcm63xx/patches-2.6.37/400-board_96358gw.patch b/target/linux/brcm63xx/patches-2.6.37/400-board_dsl_274xb_rev_c.patch
index d008e1d8f7..a0a7407984 100644
--- a/target/linux/brcm63xx/patches-2.6.37/400-board_96358gw.patch
+++ b/target/linux/brcm63xx/patches-2.6.37/400-board_dsl_274xb_rev_c.patch
@@ -1,12 +1,12 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -562,6 +562,59 @@ static struct board_info __initdata boar
- * known 6358 boards
- */
- #ifdef CONFIG_BCM63XX_CPU_6358
-+
-+static struct board_info __initdata board_96358gw = {
-+ .name = "96358GW",
+@@ -891,6 +891,59 @@ static struct board_info __initdata boar
+ .has_ohci0 = 1,
+ };
+
++/* D-Link DSL-274xB revison C2/C3 */
++static struct board_info __initdata board_dsl_274xb_rev_c = {
++ .name = "AW4139",
+ .expected_cpu_id = 0x6358,
+
+ .has_uart0 = 1,
@@ -20,27 +20,27 @@
+
+ .leds = {
+ {
-+ .name = "power:green",
++ .name = "dsl-274xb:green:power",
+ .gpio = 5,
+ .active_low = 1,
+ .default_trigger = "default-on",
+ },
+ {
-+ .name = "power:red",
++ .name = "dsl-274xb:red:power",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
-+ .name = "adsl",
++ .name = "dsl-274xb:green:adsl",
+ .gpio = 9,
+ .active_low = 1,
+ },
+ {
-+ .name = "internet:green",
++ .name = "dsl-274xb:green:internet",
+ .gpio = 2,
+ },
+ {
-+ .name = "internet:red",
++ .name = "dsl-274xb:red:internet",
+ .gpio = 10,
+ },
+ },
@@ -57,14 +57,14 @@
+ },
+};
+
- static struct board_info __initdata board_96358vw = {
- .name = "96358VW",
- .expected_cpu_id = 0x6358,
-@@ -1413,6 +1466,7 @@ static const struct board_info __initdat
- #endif
-
- #ifdef CONFIG_BCM63XX_CPU_6358
-+ &board_96358gw,
- &board_96358vw,
- &board_96358vw2,
+ struct spi_gpio_platform_data nb4_spi_gpio_data = {
+ .sck = NB4_SPI_GPIO_CLK,
+ .mosi = NB4_SPI_GPIO_MOSI,
+@@ -1418,6 +1471,7 @@ static const struct board_info __initdat
&board_AGPFS0,
+ &board_CPVA642,
+ &board_DWVS0,
++ &board_dsl_274xb_rev_c,
+ &board_nb4_ser_r0,
+ &board_nb4_ser_r1,
+ &board_nb4_ser_r2,