From a105688c87d9b04a19aeed9cbaf9e386ef3f5047 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 5 Aug 2015 13:55:37 +0000 Subject: [PATCH] brcm63xx: Add support for Plusnet 2704N BCM6318: add support for Plusnet / Sagem 2704N (V1) Signed-off-by: Matt Goring Signed-off-by: Jonas Gorski SVN-Revision: 46562 --- target/linux/brcm63xx/base-files/etc/diag.sh | 3 + .../base-files/etc/uci-defaults/01_leds | 3 + .../base-files/etc/uci-defaults/02_network | 1 + .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 3 + target/linux/brcm63xx/dts/fast2704n.dts | 84 +++++++++++++++++++ target/linux/brcm63xx/image/Makefile | 2 + .../patches-3.18/571-board_fast2704n.patch | 65 ++++++++++++++ .../patches-4.1/571-board_fast2704n.patch | 65 ++++++++++++++ target/linux/brcm63xx/profiles/sagem.mk | 10 +++ 9 files changed, 236 insertions(+) create mode 100644 target/linux/brcm63xx/dts/fast2704n.dts create mode 100644 target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch create mode 100644 target/linux/brcm63xx/patches-4.1/571-board_fast2704n.patch diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/brcm63xx/base-files/etc/diag.sh index 1b0d26d616..7916ac26e2 100644 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/brcm63xx/base-files/etc/diag.sh @@ -70,6 +70,9 @@ set_state() { fast2504n) status_led="fast2504n:green:ok" ;; + fast2704n) + status_led2="F@ST2704N:red:power" + ;; fast2704v2) status_led="F@ST2704V2:green:power" ;; diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds index b964bdb229..bdb3dada33 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/01_leds @@ -22,6 +22,9 @@ dgnd3700v1_dgnd3800b) ucidef_set_led_usbdev "usb1" "USB1" "DGND3700v1_3800B:green:usb-back" "1-1" ucidef_set_led_usbdev "usb2" "USB2" "DGND3700v1_3800B:green:usb-front" "1-2" ;; +fast2704n) + ucidef_set_led_netdev "wan" "WAN" "F@ST2704N:green:inet" "eth0.2" + ;; fast2704v2) ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1" ;; 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 e5880eb414..2ff9e45860 100644 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/02_network @@ -114,6 +114,7 @@ wap-5831n) ucidef_add_switch_vlan "eth0" "2" "4 5t" ;; +fast2704n |\ dgnd3700v1_dgnd3800b) ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" ucidef_add_switch "eth0" "1" "1" diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index 0eb9a750ca..92fa5f2bdb 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -198,6 +198,9 @@ brcm63xx_dt_detect() { "Sagem F@ST2604") board_name="fast2604" ;; + "Sagem F@ST2704N") + board_name="fast2704n" + ;; "Sagem F@ST2704V2") board_name="fast2704v2" ;; diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts new file mode 100644 index 0000000000..232d4d1c8e --- /dev/null +++ b/target/linux/brcm63xx/dts/fast2704n.dts @@ -0,0 +1,84 @@ +/dts-v1/; + +#include "bcm6318.dtsi" + +#include + +/ { + model = "Sagem F@ST2704N"; + compatible = "sagem,f@st2704n", "brcm,bcm6318"; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + debounce-interval = <60>; + + wlan { + label = "wlan"; + gpios = <&gpio0 1 0>; + linux,code = ; + }; + wps { + label = "wps"; + gpios = <&gpio1 1 1>; + linux,code = ; + }; + reset { + label = "reset"; + gpios = <&gpio1 2 1>; + linux,code = ; + }; + }; + + gpio-leds { + compatible = "gpio-leds"; + + wps_green { + label = "F@ST2704N:green:wps"; + gpios = <&gpio0 2 1>; + }; + lan1_green { + label = "F@ST2704N:green:lan1"; + gpios = <&gpio0 4 1>; + }; + lan2_green { + label = "F@ST2704N:green:lan2"; + gpios = <&gpio0 5 1>; + }; + lan3_green { + label = "F@ST2704N:green:lan3"; + gpios = <&gpio0 6 1>; + }; + lan4_green { + label = "F@ST2704N:green:lan4"; + gpios = <&gpio0 7 1>; + }; + inet_green { + label = "F@ST2704N:green:inet"; + gpios = <&gpio0 8 1>; + }; + inet_red { + label = "F@ST2704N:red:inet"; + gpios = <&gpio0 9 1>; + }; + dsl_green { + label = "F@ST2704N:green:dsl"; + gpios = <&gpio0 10 1>; + }; + power_red { + label = "F@ST2704N:red:power"; + gpios = <&gpio0 11 1>; + }; + power_green { + label = "F@ST2704N:green:power"; + gpios = <&gpio1 15 1>; + default-state = "on"; + }; + usb_green { + label = "F@ST2704N:green:usb"; + gpios = <&gpio1 17 1>; + }; + }; +}; diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 8e148aa794..4a52a41a36 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -623,6 +623,8 @@ $(eval $(call bcm63xxCfe,FAST2404,F@ST2404,fast2404,F@ST2404,6348)) $(eval $(call bcm63xxCfe,FAST2504n,F@ST2504n,fast2504n,F@ST2504n,6362)) # Sagem F@ST2604 $(eval $(call bcm63xxCfe,FAST2604,F@ST2604,fast2604,F@ST2604,6348)) +# Sagem F@ST2704N V1 / Plusnet F@ST2704N V1 +$(eval $(call bcm63xxCfe,FAST2704N,FAST2704N,fast2704n,F@ST2704N,6318,--pad 4)) # Sagem F@ST2704V2 $(eval $(call bcm63xxCfe,FAST2704V2,F@ST2704V2,fast2704v2,F@ST2704V2,6328)) # SFR Neufbox 4 diff --git a/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch new file mode 100644 index 0000000000..7b8b727803 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.18/571-board_fast2704n.patch @@ -0,0 +1,65 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -225,6 +225,46 @@ static struct board_info __initdata board_dsl_2751b_d1 = { + .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), + }, + }; ++ ++static struct board_info __initdata board_FAST2704N = { ++ .name = "F@ST2704N", ++ .expected_cpu_id = 0x6318, ++ ++ .has_uart0 = 1, ++ .has_pci = 1, ++ .use_fallback_sprom = 1, ++ ++ .has_enetsw = 1, ++ ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 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", ++ }, ++ }, ++ }, ++}; + #endif /* CONFIG_BCM63XX_CPU_6318 */ + + /* +@@ -2352,6 +2392,7 @@ static const struct board_info __initconst *bcm963xx_boards[] = { + &board_96318ref, + &board_96318ref_p300, + &board_dsl_2751b_d1, ++ &board_FAST2704N, + #endif + #ifdef CONFIG_BCM63XX_CPU_6328 + &board_96328avng, +@@ -2449,6 +2490,7 @@ static struct of_device_id const bcm963xx_boards_dt[] = { + { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, + { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, ++ { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/patches-4.1/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.1/571-board_fast2704n.patch new file mode 100644 index 0000000000..7b8b727803 --- /dev/null +++ b/target/linux/brcm63xx/patches-4.1/571-board_fast2704n.patch @@ -0,0 +1,65 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -225,6 +225,46 @@ static struct board_info __initdata board_dsl_2751b_d1 = { + .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), + }, + }; ++ ++static struct board_info __initdata board_FAST2704N = { ++ .name = "F@ST2704N", ++ .expected_cpu_id = 0x6318, ++ ++ .has_uart0 = 1, ++ .has_pci = 1, ++ .use_fallback_sprom = 1, ++ ++ .has_enetsw = 1, ++ ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 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", ++ }, ++ }, ++ }, ++}; + #endif /* CONFIG_BCM63XX_CPU_6318 */ + + /* +@@ -2352,6 +2392,7 @@ static const struct board_info __initconst *bcm963xx_boards[] = { + &board_96318ref, + &board_96318ref_p300, + &board_dsl_2751b_d1, ++ &board_FAST2704N, + #endif + #ifdef CONFIG_BCM63XX_CPU_6328 + &board_96328avng, +@@ -2449,6 +2490,7 @@ static struct of_device_id const bcm963xx_boards_dt[] = { + { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, + { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, + { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, ++ { .compatible = "sagem,f@st2704n", .data = &board_FAST2704N, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_6328 + { .compatible = "adb,a4001n", .data = &board_A4001N, }, diff --git a/target/linux/brcm63xx/profiles/sagem.mk b/target/linux/brcm63xx/profiles/sagem.mk index 5afb2b7259..7d9a160ede 100644 --- a/target/linux/brcm63xx/profiles/sagem.mk +++ b/target/linux/brcm63xx/profiles/sagem.mk @@ -32,6 +32,16 @@ define Profile/FAST2604/Description endef $(eval $(call Profile,FAST2604)) +define Profile/FAST2704N + NAME:=Sagem F@ST2704N + PACKAGES:=kmod-b43 wpad-mini \ + kmod-usb2 kmod-usb-ohci +endef +define Profile/FAST2704N/Description + Package set optimized for F@ST2704N. +endef +$(eval $(call Profile,FAST2704N)) + define Profile/FAST2704V2 NAME:=Sagem F@ST2704V2 PACKAGES:=kmod-b43 wpad-mini\ -- 2.30.2