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 <freifunk@adrianschmutzler.de>

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 47b0618e6c59f1f8df76635c872ba0d64d972d9c..3e4f90832ffedf6d81d2c10e05330f6865bfe5a7 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_HELP>;
+               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 = <KEY_HELP>;
-                       debounce-interval = <60>;
-               };
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&pinctrl 9 1>;
-                       linux,code = <KEY_WLAN>;
-                       debounce-interval = <60>;
-               };
-
-               restart {
-                       label = "restart";
-                       gpios = <&pinctrl 10 1>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 11 1>;
-                       linux,code = <KEY_CONFIG>;
-                       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 66d4acf6b4754a10899d1bdd95de970204284103..1bbc325d20fc8b2ca87539fc5b8478695de095ae 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_HELP>;
+               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 = <KEY_HELP>;
-                       debounce-interval = <60>;
-               };
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&pinctrl 9 1>;
-                       linux,code = <KEY_WLAN>;
-                       debounce-interval = <60>;
-               };
-
-               restart {
-                       label = "restart";
-                       gpios = <&pinctrl 10 1>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 11 1>;
-                       linux,code = <KEY_CONFIG>;
-                       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 fe2e5efff4a0bdcf3e8ad08f4caefc3b5f7f2c5f..021e2fe5f1d85ba2ac94eb961b8510d212baf495 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_HELP>;
+               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 = <KEY_HELP>;
-                       debounce-interval = <60>;
-               };
-
-               wlan {
-                       label = "wlan";
-                       gpios = <&pinctrl 9 1>;
-                       linux,code = <KEY_WLAN>;
-                       debounce-interval = <60>;
-               };
-
-               restart {
-                       label = "restart";
-                       gpios = <&pinctrl 10 1>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 11 1>;
-                       linux,code = <KEY_CONFIG>;
-                       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 (file)
index 0000000..09a21f7
--- /dev/null
+++ b/target/linux/bcm63xx/dts/bcm6358-huawei-echolife-hg556a.dtsi
@@ -0,0 +1,127 @@
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
+
+/ {
+       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 = <KEY_WLAN>;
+                       debounce-interval = <60>;
+               };
+
+               restart {
+                       label = "restart";
+                       gpios = <&pinctrl 10 1>;
+                       linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
+               };
+
+               reset {
+                       label = "reset";
+                       gpios = <&pinctrl 11 1>;
+                       linux,code = <KEY_CONFIG>;
+                       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 (file)
index 0000000..cc833b0
--- /dev/null
+++ b/target/linux/bcm63xx/dts/bcm6358-pirelli-a226.dtsi
@@ -0,0 +1,93 @@
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
+
+/ {
+       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 = <KEY_WPS_BUTTON>;
+                       debounce-interval = <60>;
+               };
+
+               reset {
+                       label = "reset";
+                       gpios = <&pinctrl 37 1>;
+                       linux,code = <KEY_RESTART>;
+                       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 2e1cc6b90d8d64d22a47c29435bd71e4a73e3e68..c1042f55802992c92afded76056748c7fc8e40cd 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_WPS_BUTTON>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 37 1>;
-                       linux,code = <KEY_RESTART>;
-                       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 a1d4cdaa9c23daf1c27a0e4109c3cfafd6f4a2ac..3f8e1511b1736a15ce1867f9f0bacf05cf87edcf 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_WPS_BUTTON>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 37 1>;
-                       linux,code = <KEY_RESTART>;
-                       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 db525acbfa1ab8ef2a66f2bf6e2c094a4b968e23..1060c004dd35fb72b1732e41102f90667faf8be3 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <KEY_WPS_BUTTON>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 37 1>;
-                       linux,code = <KEY_RESTART>;
-                       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 5aed0bf529cd54dcff2395d56362535305f73149..9465508b10777cf06129b679751e6a3389c3da91 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <BTN_0>;
-                       debounce-interval = <60>;
-               };
-
-               clip {
-                       label = "clip";
-                       gpios = <&pinctrl 31 1>;
-                       linux,code = <BTN_1>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 34 1>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&pinctrl 37 1>;
-                       linux,code = <KEY_WPS_BUTTON>;
-                       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 7d5e77dc6513a0e1bb72a05ce6fb367975e7bc93..222833e29fa77b0e99216a1a77ece7551a57a878 100644 (file)
--- 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 <dt-bindings/input/input.h>
+#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 = <BTN_0>;
-                       debounce-interval = <60>;
-               };
-
-               clip {
-                       label = "clip";
-                       gpios = <&pinctrl 31 1>;
-                       linux,code = <BTN_1>;
-                       debounce-interval = <60>;
-               };
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 34 1>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-
-               wps {
-                       label = "wps";
-                       gpios = <&pinctrl 37 1>;
-                       linux,code = <KEY_WPS_BUTTON>;
-                       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 (file)
index 0000000..58075c8
--- /dev/null
+++ b/target/linux/bcm63xx/dts/bcm6358-sfr-neufbox-4.dtsi
@@ -0,0 +1,88 @@
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
+
+/ {
+       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 = <BTN_0>;
+                       debounce-interval = <60>;
+               };
+
+               clip {
+                       label = "clip";
+                       gpios = <&pinctrl 31 1>;
+                       linux,code = <BTN_1>;
+                       debounce-interval = <60>;
+               };
+
+               reset {
+                       label = "reset";
+                       gpios = <&pinctrl 34 1>;
+                       linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
+               };
+
+               wps {
+                       label = "wps";
+                       gpios = <&pinctrl 37 1>;
+                       linux,code = <KEY_WPS_BUTTON>;
+                       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";
+};