From c0aea384366002b113c7e89dfc704f1c3ce25c4e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 4 Oct 2020 15:12:57 +0200 Subject: [PATCH] bcm63xx: add a few DTSI files to share definitions After the LED labels have been made more general by removing the model names, we can move several definitions to DTSI files to reduce the amount of duplicate code. Signed-off-by: Adrian Schmutzler --- .../dts/bcm6358-huawei-echolife-hg556a-a.dts | 162 +++--------------- .../dts/bcm6358-huawei-echolife-hg556a-b.dts | 162 +++--------------- .../dts/bcm6358-huawei-echolife-hg556a-c.dts | 153 +++-------------- .../dts/bcm6358-huawei-echolife-hg556a.dtsi | 127 ++++++++++++++ .../bcm63xx/dts/bcm6358-pirelli-a226.dtsi | 93 ++++++++++ .../bcm63xx/dts/bcm6358-pirelli-a226g.dts | 92 +--------- .../bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts | 92 +--------- .../bcm63xx/dts/bcm6358-pirelli-a226m.dts | 92 +--------- .../dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts | 87 +--------- .../dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts | 87 +--------- .../bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi | 88 ++++++++++ 11 files changed, 389 insertions(+), 846 deletions(-) create mode 100644 target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi create mode 100644 target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi create mode 100644 target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts index 47b0618e6c59..3e4f90832ffe 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts @@ -1,153 +1,45 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version A)"; compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 8 1>; + linux,code = ; + debounce-interval = <60>; }; +}; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; +&gpioleds { + message_red { + label = "red:message"; + gpios = <&pinctrl 0 1>; }; - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 8 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 1 1>; }; - leds { - compatible = "gpio-leds"; - - message_red { - label = "red:message"; - gpios = <&pinctrl 0 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - all_red { - label = "red:all"; - gpios = <&pinctrl 6 1>; - default-state = "on"; - }; - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; + all_red { + label = "red:all"; + gpios = <&pinctrl 6 1>; + default-state = "on"; }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; - - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 12 1>; }; -}; -&uart0 { - status = "okay"; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 15 1>; + }; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts index 66d4acf6b475..1bbc325d20fc 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts @@ -1,153 +1,45 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version B)"; compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 8 1>; + linux,code = ; + debounce-interval = <60>; }; +}; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; +&gpioleds { + message_red { + label = "red:message"; + gpios = <&pinctrl 0 1>; }; - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 8 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 1 1>; }; - leds { - compatible = "gpio-leds"; - - message_red { - label = "red:message"; - gpios = <&pinctrl 0 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - all_red { - label = "red:all"; - gpios = <&pinctrl 6 1>; - default-state = "on"; - }; - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; + all_red { + label = "red:all"; + gpios = <&pinctrl 6 1>; + default-state = "on"; }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; - - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 12 1>; }; -}; -&uart0 { - status = "okay"; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 15 1>; + }; }; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts index fe2e5efff4a0..021e2fe5f1d8 100644 --- a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts @@ -1,148 +1,39 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-huawei-echolife-hg556a.dtsi" / { model = "Huawei EchoLife HG556a (version C)"; compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358"; +}; - aliases { - led-boot = &led_power_red; - led-failsafe = &led_power_red; - led-running = &led_power_red; - led-upgrade = &led_power_red; +&gpiokeys { + help { + label = "help"; + gpios = <&pinctrl 36 1>; + linux,code = ; + debounce-interval = <60>; }; +}; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; +&gpioleds { + lan1_green { + label = "green:lan1"; + gpios = <&pinctrl 0 1>; }; - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - help { - label = "help"; - gpios = <&pinctrl 36 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wlan { - label = "wlan"; - gpios = <&pinctrl 9 1>; - linux,code = ; - debounce-interval = <60>; - }; - - restart { - label = "restart"; - gpios = <&pinctrl 10 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 11 1>; - linux,code = ; - debounce-interval = <60>; - }; + lan2_green { + label = "green:lan2"; + gpios = <&pinctrl 1 1>; }; - leds { - compatible = "gpio-leds"; - - lan1_green { - label = "green:lan1"; - gpios = <&pinctrl 0 1>; - }; - lan2_green { - label = "green:lan2"; - gpios = <&pinctrl 1 1>; - }; - dsl_red { - label = "red:dsl"; - gpios = <&pinctrl 2 1>; - }; - led_power_red: power_red { - label = "red:power"; - gpios = <&pinctrl 3 1>; - default-state = "on"; - }; - message_red { - label = "red:message"; - gpios = <&pinctrl 12 1>; - }; - lan1_red { - label = "red:lan1"; - gpios = <&pinctrl 13 1>; - }; - hspa_red { - label = "red:hspa"; - gpios = <&pinctrl 15 1>; - }; - lan2_red { - label = "red:lan2"; - gpios = <&pinctrl 22 1>; - }; - lan3_green { - label = "green:lan3"; - gpios = <&pinctrl 23 1>; - }; - lan3_red { - label = "red:lan3"; - gpios = <&pinctrl 26 1>; - }; - lan4_green { - label = "green:lan4"; - gpios = <&pinctrl 27 1>; - }; - lan4_red { - label = "red:lan4"; - gpios = <&pinctrl 28 1>; - }; + message_red { + label = "red:message"; + gpios = <&pinctrl 12 1>; }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - compatible = "brcm,bcm963xx-imagetag"; - }; - - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; - - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; - }; + hspa_red { + label = "red:hspa"; + gpios = <&pinctrl 15 1>; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi new file mode 100644 index 000000000000..09a21f7ad735 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi @@ -0,0 +1,127 @@ +#include "bcm6358.dtsi" + +#include + +/ { + aliases { + led-boot = &led_power_red; + led-failsafe = &led_power_red; + led-running = &led_power_red; + led-upgrade = &led_power_red; + }; + + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + gpiokeys: keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wlan { + label = "wlan"; + gpios = <&pinctrl 9 1>; + linux,code = ; + debounce-interval = <60>; + }; + + restart { + label = "restart"; + gpios = <&pinctrl 10 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 11 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + gpioleds: leds { + compatible = "gpio-leds"; + + dsl_red { + label = "red:dsl"; + gpios = <&pinctrl 2 1>; + }; + + led_power_red: power_red { + label = "red:power"; + gpios = <&pinctrl 3 1>; + default-state = "on"; + }; + + lan1_red { + label = "red:lan1"; + gpios = <&pinctrl 13 1>; + }; + + lan2_red { + label = "red:lan2"; + gpios = <&pinctrl 22 1>; + }; + + lan3_green { + label = "green:lan3"; + gpios = <&pinctrl 23 1>; + }; + + lan3_red { + label = "red:lan3"; + gpios = <&pinctrl 26 1>; + }; + + lan4_green { + label = "green:lan4"; + gpios = <&pinctrl 27 1>; + }; + + lan4_red { + label = "red:lan4"; + gpios = <&pinctrl 28 1>; + }; + }; +}; + +&pflash { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; + + linux@20000 { + label = "linux"; + reg = <0x020000 0xec0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@ee0000 { + label = "cal_data"; + reg = <0xee0000 0x100000>; + read-only; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi new file mode 100644 index 000000000000..cc833b0c18d7 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi @@ -0,0 +1,93 @@ +#include "bcm6358.dtsi" + +#include + +/ { + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + wps { + label = "wps"; + gpios = <&pinctrl 34 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 37 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + + voip_red { + label = "red:VoIP"; + gpios = <&pinctrl 0 1>; + }; + eth_red { + label = "red:ethernet"; + gpios = <&pinctrl 1 1>; + }; + dsl_green { + label = "green:ADSL"; + gpios = <&pinctrl 2 1>; + }; + usb_green { + label = "green:USB"; + gpios = <&pinctrl 3 1>; + }; + power_green { + label = "green:power"; + gpios = <&pinctrl 4 1>; + default-state = "on"; + }; + power_red { + label = "red:power"; + gpios = <&pinctrl 5 1>; + }; + inet_red { + label = "red:internet"; + gpios = <&pinctrl 6 1>; + }; + inet_green { + label = "green:internet"; + gpios = <&pinctrl 7 1>; + }; + eth_green { + label = "green:ethernet"; + gpios = <&pinctrl 8 1>; + }; + voip_green { + label = "green:VoIP"; + gpios = <&pinctrl 9 1>; + }; + wifi_red { + label = "red:wifi"; + gpios = <&pinctrl 10 1>; + }; + usb_red { + label = "red:USB"; + gpios = <&pinctrl 11 1>; + }; + dsl_red { + label = "red:ADSL"; + gpios = <&pinctrl 12 1>; + }; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts index 2e1cc6b90d8d..c1042f558029 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226g.dts @@ -1,96 +1,10 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226G"; compatible = "pirelli,a226g", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +33,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts index a1d4cdaa9c23..3f8e1511b173 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m-fwb.dts @@ -1,96 +1,10 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226M-FWB"; compatible = "pirelli,a226m-fwb", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +33,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts index db525acbfa1a..1060c004dd35 100644 --- a/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts +++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226m.dts @@ -1,96 +1,10 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-pirelli-a226.dtsi" / { model = "Pirelli A226M"; compatible = "pirelli,a226m", "brcm,bcm6358"; - - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - wps { - label = "wps"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - - voip_red { - label = "red:VoIP"; - gpios = <&pinctrl 0 1>; - }; - eth_red { - label = "red:ethernet"; - gpios = <&pinctrl 1 1>; - }; - dsl_green { - label = "green:ADSL"; - gpios = <&pinctrl 2 1>; - }; - usb_green { - label = "green:USB"; - gpios = <&pinctrl 3 1>; - }; - power_green { - label = "green:power"; - gpios = <&pinctrl 4 1>; - default-state = "on"; - }; - power_red { - label = "red:power"; - gpios = <&pinctrl 5 1>; - }; - inet_red { - label = "red:internet"; - gpios = <&pinctrl 6 1>; - }; - inet_green { - label = "green:internet"; - gpios = <&pinctrl 7 1>; - }; - eth_green { - label = "green:ethernet"; - gpios = <&pinctrl 8 1>; - }; - voip_green { - label = "green:VoIP"; - gpios = <&pinctrl 9 1>; - }; - wifi_red { - label = "red:wifi"; - gpios = <&pinctrl 10 1>; - }; - usb_red { - label = "red:USB"; - gpios = <&pinctrl 11 1>; - }; - dsl_red { - label = "red:ADSL"; - gpios = <&pinctrl 12 1>; - }; - }; }; &pflash { @@ -119,7 +33,3 @@ }; }; }; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts index 5aed0bf529cd..9465508b1077 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts @@ -1,53 +1,11 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-sfr-neufbox-4.dtsi" / { model = "SFR Neufbox 4 (Foxconn)"; compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358"; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - service { - label = "service"; - gpios = <&pinctrl 27 1>; - linux,code = ; - debounce-interval = <60>; - }; - - clip { - label = "clip"; - gpios = <&pinctrl 31 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wps { - label = "wps"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - leds { compatible = "gpio-leds"; @@ -73,46 +31,3 @@ }; }; }; - -&leds { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_serial_led>; - - led@0 { - reg = <0>; - active-low; - label = "white:alarm"; - }; - - led@2 { - reg = <2>; - active-low; - label = "white:tv"; - }; - - led@3 { - reg = <3>; - active-low; - label = "white:tel"; - }; - - led@4 { - reg = <4>; - active-low; - label = "white:adsl"; - }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "brcm,bcm963xx-cfe-nor-partitions"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts index 7d5e77dc6513..222833e29fa7 100644 --- a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts @@ -1,53 +1,11 @@ /dts-v1/; -#include "bcm6358.dtsi" - -#include +#include "bcm6358-sfr-neufbox-4.dtsi" / { model = "SFR Neufbox 4 (Sercomm)"; compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358"; - chosen { - bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; - stdout-path = "serial0:115200n8"; - }; - - keys { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; - - service { - label = "service"; - gpios = <&pinctrl 27 1>; - linux,code = ; - debounce-interval = <60>; - }; - - clip { - label = "clip"; - gpios = <&pinctrl 31 1>; - linux,code = ; - debounce-interval = <60>; - }; - - reset { - label = "reset"; - gpios = <&pinctrl 34 1>; - linux,code = ; - debounce-interval = <60>; - }; - - wps { - label = "wps"; - gpios = <&pinctrl 37 1>; - linux,code = ; - debounce-interval = <60>; - }; - }; - leds { compatible = "gpio-leds"; @@ -73,46 +31,3 @@ }; }; }; - -&leds { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_serial_led>; - - led@0 { - reg = <0>; - active-low; - label = "white:alarm"; - }; - - led@2 { - reg = <2>; - active-low; - label = "white:tv"; - }; - - led@3 { - reg = <3>; - active-low; - label = "white:tel"; - }; - - led@4 { - reg = <4>; - active-low; - label = "white:adsl"; - }; -}; - -&pflash { - status = "okay"; - - partitions { - compatible = "brcm,bcm963xx-cfe-nor-partitions"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi new file mode 100644 index 000000000000..58075c879ad6 --- /dev/null +++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi @@ -0,0 +1,88 @@ +#include "bcm6358.dtsi" + +#include + +/ { + chosen { + bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; + }; + + keys { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + + service { + label = "service"; + gpios = <&pinctrl 27 1>; + linux,code = ; + debounce-interval = <60>; + }; + + clip { + label = "clip"; + gpios = <&pinctrl 31 1>; + linux,code = ; + debounce-interval = <60>; + }; + + reset { + label = "reset"; + gpios = <&pinctrl 34 1>; + linux,code = ; + debounce-interval = <60>; + }; + + wps { + label = "wps"; + gpios = <&pinctrl 37 1>; + linux,code = ; + debounce-interval = <60>; + }; + }; +}; + +&leds { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_serial_led>; + + led@0 { + reg = <0>; + active-low; + label = "white:alarm"; + }; + + led@2 { + reg = <2>; + active-low; + label = "white:tv"; + }; + + led@3 { + reg = <3>; + active-low; + label = "white:tel"; + }; + + led@4 { + reg = <4>; + active-low; + label = "white:adsl"; + }; +}; + +&pflash { + status = "okay"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; +}; + +&uart0 { + status = "okay"; +}; -- 2.30.2