From b26139eb3fd4abdb7339b0bd1dfa8f3a08810574 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 27 Jul 2014 17:44:48 +0000 Subject: [PATCH] brcm63xx: Add support for Comtrend VR-3025un MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas Signed-off-by: José Vázquez Fernández Signed-off-by: Jonas Gorski SVN-Revision: 41848 --- .../base-files/etc/uci-defaults/02_network | 1 + .../base-files/etc/uci-defaults/09_fix_crc | 1 + .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 5 + target/linux/brcm63xx/image/Makefile | 2 + .../patches-3.10/563-board_VR-3025un.patch | 109 ++++++++++++++++++ .../patches-3.14/563-board_VR-3025un.patch | 109 ++++++++++++++++++ 6 files changed, 227 insertions(+) create mode 100644 target/linux/brcm63xx/patches-3.10/563-board_VR-3025un.patch create mode 100644 target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network index 1d42d472b5..aa32099a07 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network @@ -81,6 +81,7 @@ DVG3810BN) 96328A-1441N1 |\ 963281TAN |\ 963281T_TEF |\ +96368M-1341N |\ 96368M-1541N |\ 96368MVNgr |\ "F@ST2504n" |\ diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc index 7d9a6f7925..9c966e7eaf 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/09_fix_crc @@ -19,6 +19,7 @@ case "$board_name" in 963281TAN |\ 963281T_TEF |\ 96358-502V |\ + 96368M-1341N |\ 96368M-1541N |\ 96369R-1231N |\ AW4339U |\ diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index 85d499e785..74e6a0d776 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -57,6 +57,11 @@ brcm63xx_detect() { brcm63xx_has_reset_button="true" ifname=eth0 ;; + 96368M-1341N) + brcm63xx_has_reset_button="true" + status_led="VR-3025un:green:power" + ifname="eth0" + ;; 96368M-1541N) brcm63xx_has_reset_button="true" status_led="VR-3025u:green:power" diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 01235e4b26..f36d182d22 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -232,6 +232,8 @@ define Image/Build $(call Image/Build/CFE,$(1),96328A-1441N1,6328,AR-5387un,,--pad 8) # Comtrend VR-3025u $(call Image/Build/CFE,$(1),96368M-1541N,6368,VR-3025u,,--pad 16) + # Comtrend VR-3025un + $(call Image/Build/CFE,$(1),96368M-1341N,6368,VR-3025un,,--pad 4) # Comtrend WAP-5813n $(call Image/Build/CFE,$(1),96369R-1231N,6368,WAP-5813n,,--pad 4) # Davolink DV201AMR diff --git a/target/linux/brcm63xx/patches-3.10/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.10/563-board_VR-3025un.patch new file mode 100644 index 0000000000..73d95e5bae --- /dev/null +++ b/target/linux/brcm63xx/patches-3.10/563-board_VR-3025un.patch @@ -0,0 +1,109 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -4542,6 +4542,98 @@ static struct board_info __initdata boar + }, + }; + ++static struct board_info __initdata board_VR3025un = { ++ .name = "96368M-1341N", ++ .expected_cpu_id = 0x6368, ++ ++ .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 = "port1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", ++ }, ++ }, ++ }, ++ ++ .leds = { ++ { ++ .name = "VR-3025un:green:dsl", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:inet", ++ .gpio = 5, ++ }, ++ { ++ .name = "VR-3025un:green:lan1", ++ .gpio = 6, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:lan2", ++ .gpio = 7, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:lan3", ++ .gpio = 8, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:iptv", ++ .gpio = 9, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:power", ++ .gpio = 22, ++ .default_trigger = "default-on", ++ }, ++ { ++ .name = "VR-3025un:red:power", ++ .gpio = 24, ++ }, ++ { ++ .name = "VR-3025un:red:inet", ++ .gpio = 31, ++ }, ++ }, ++ ++ .buttons = { ++ { ++ .desc = "reset", ++ .gpio = 34, ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ .active_low = 1, ++ }, ++ }, ++}; ++ + static struct b53_platform_data WAP5813n_b53_pdata = { + .alias = "eth0", + }; +@@ -5018,6 +5110,7 @@ static const struct board_info __initcon + &board_96368mvwg, + &board_96368mvngr, + &board_VR3025u, ++ &board_VR3025un, + &board_WAP5813n, + #endif + #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch new file mode 100644 index 0000000000..16350a3875 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch @@ -0,0 +1,109 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -4552,6 +4552,98 @@ static struct board_info __initdata boar + }, + }; + ++static struct board_info __initdata board_VR3025un = { ++ .name = "96368M-1341N", ++ .expected_cpu_id = 0x6368, ++ ++ .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 = "port1", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "port2", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "port3", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "port4", ++ }, ++ }, ++ }, ++ ++ .leds = { ++ { ++ .name = "VR-3025un:green:dsl", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:inet", ++ .gpio = 5, ++ }, ++ { ++ .name = "VR-3025un:green:lan1", ++ .gpio = 6, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:lan2", ++ .gpio = 7, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:lan3", ++ .gpio = 8, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:iptv", ++ .gpio = 9, ++ .active_low = 1, ++ }, ++ { ++ .name = "VR-3025un:green:power", ++ .gpio = 22, ++ .default_trigger = "default-on", ++ }, ++ { ++ .name = "VR-3025un:red:power", ++ .gpio = 24, ++ }, ++ { ++ .name = "VR-3025un:red:inet", ++ .gpio = 31, ++ }, ++ }, ++ ++ .buttons = { ++ { ++ .desc = "reset", ++ .gpio = 34, ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ .active_low = 1, ++ }, ++ }, ++}; ++ + static struct b53_platform_data WAP5813n_b53_pdata = { + .alias = "eth0", + }; +@@ -5028,6 +5120,7 @@ static const struct board_info __initcon + &board_96368mvwg, + &board_96368mvngr, + &board_VR3025u, ++ &board_VR3025un, + &board_WAP5813n, + #endif + #ifdef CONFIG_BCM63XX_CPU_63268