From fb185fea7d3e0af50bfc3eae37c190f132f9d8c6 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 23 Oct 2012 10:57:47 +0000 Subject: [PATCH] [bcm63xx] add support for Comtrend AR5381u. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Router: Comtrend AR5381u. Signed-off-by: Álvaro Fernández Rojas [jogo: fix subject, indentation in patch] Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33895 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../etc/uci-defaults/brcm63xx_fixcrc.sh | 1 + .../base-files/etc/uci-defaults/network | 1 + .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 5 ++ target/linux/brcm63xx/image/Makefile | 1 + .../patches-3.3/532-board_96328a-1241N.patch | 83 +++++++++++++++++++ .../patches-3.3/550-alice_gate2_leds.patch | 2 +- .../patches-3.3/551-96348gw_a_leds.patch | 2 +- .../552-board_96348gw-10_reset_button.patch | 2 +- .../801-ssb_export_fallback_sprom.patch | 4 +- 9 files changed, 96 insertions(+), 5 deletions(-) mode change 100644 => 100755 target/linux/brcm63xx/image/Makefile create mode 100644 target/linux/brcm63xx/patches-3.3/532-board_96328a-1241N.patch diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh index 4da4e0a650..bf4e4e9908 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh @@ -14,6 +14,7 @@ brcm63xx_detect case "$board_name" in 96328avng |\ + 96328A-1241N |\ 96328A-1441N1 |\ 963281TAN |\ 963281T_TEF |\ diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/network b/target/linux/brcm63xx/base-files/etc/uci-defaults/network index 871d597b49..00914b3e3f 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/network @@ -15,6 +15,7 @@ ucidef_set_interface_loopback case "$board_name" in 96328avng |\ +96328A-1241N |\ 96328A-1441N1 |\ 963281TAN |\ 963281T_TEF |\ diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index d3d1b02ead..18df042610 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -22,6 +22,11 @@ brcm63xx_detect() { status_led="96328avng::power" ifname=eth0 ;; + 96328A-1241N) + brcm63xx_has_reset_button="true" + status_led="96328A-1241N:green:power" + ifname=eth0 + ;; 96328A-1441N1) brcm63xx_has_reset_button="true" status_led="96328A-1441N1:green:power" diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile old mode 100644 new mode 100755 index 98f8465977..99dc8c5be3 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -148,6 +148,7 @@ define Image/Build $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-4M-flash-generic,,--pad 2) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4) $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8) + $(call Image/Build/CFE,$(1),96328A-1241N,6328,96328A-1241N-generic,,--pad 8) $(call Image/Build/CFE,$(1),96328A-1441N1,6328,96328A-1441N1-generic,,--pad 8) $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-4M-flash-generic,,--pad 2) $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-8M-flash-generic,,--pad 4) diff --git a/target/linux/brcm63xx/patches-3.3/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.3/532-board_96328a-1241N.patch new file mode 100644 index 0000000000..c2e2ef9035 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.3/532-board_96328a-1241N.patch @@ -0,0 +1,83 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -136,6 +136,72 @@ static struct board_info __initdata boar + }, + }; + ++static struct board_info __initdata board_96328A_1241N = { ++ .name = "96328A-1241N", ++ .expected_cpu_id = 0x6328, ++ ++ .has_uart0 = 1, ++ .has_pci = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .has_enetsw = 1, ++ ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 4", ++ }, ++ }, ++ }, ++ ++ .leds = { ++ { ++ .name = "96328A-1241N:green:power", ++ .gpio = 8, ++ .active_low = 1, ++ .default_trigger = "default-on", ++ }, ++ { ++ .name = "96328A-1241N:red:alarm", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "96328A-1241N:green:inet", ++ .gpio = 3, ++ .active_low = 1, ++ }, ++ }, ++ ++ .buttons = { ++ { ++ .desc = "reset", ++ .gpio = 23, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ }, ++ }, ++}; ++ + static struct board_info __initdata board_96328A_1441N1 = { + .name = "96328A-1441N1", + .expected_cpu_id = 0x6328, +@@ -3063,6 +3129,7 @@ static struct board_info __initdata boar + static const struct board_info __initdata *bcm963xx_boards[] = { + #ifdef CONFIG_BCM63XX_CPU_6328 + &board_96328avng, ++ &board_96328A_1241N, + &board_96328A_1441N1, + &board_963281TAN, + &board_963281T_TEF, 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 87c1546dc5..d151cab9e7 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,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1852,6 +1852,99 @@ static struct board_info __initdata boar +@@ -1918,6 +1918,99 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 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 869f6926d4..ce263b28af 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 @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1309,6 +1309,19 @@ static struct board_info __initdata boar +@@ -1375,6 +1375,19 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch index 1c32eda685..095a851b2c 100644 --- a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch +++ b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -777,6 +777,17 @@ static struct board_info __initdata boar +@@ -843,6 +843,17 @@ static struct board_info __initdata boar .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 a098659d04..820a8e8f12 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 #include #include -@@ -3250,7 +3251,7 @@ static const struct board_info __initdat +@@ -3317,7 +3318,7 @@ static const struct board_info __initdat * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -17,7 +17,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -3270,6 +3271,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -3337,6 +3338,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, };