lantiq: move common FRITZ736X bits into dtsi

Move common FRITZ736X bits into dtsi file
as a preparation for FRITZ7362SL support.

Signed-off-by: Danijel Tudek <danijel.tudek@gmail.com>

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
index 53623ab56c35cfea086dbee11a01f162d736a8d0..599b20a4606e5a8e6492d55c88e9de16f4d25ff0 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ7360SL.dts
@@ -1,171 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "vr9.dtsi"
+#include "FRITZ736X.dtsi"
 
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
-       compatible = "avm,fritz7360sl", "lantiq,xway", "lantiq,vr9";
+       compatible = "avm,fritz7360sl", "avm,fritz736x", "lantiq,xway", "lantiq,vr9";
        model = "AVM FRITZ!Box 7360 SL";
-
-       chosen {
-               bootargs = "console=ttyLTQ0,115200";
-       };
-
-       aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_red;
-               led-running = &power_green;
-               led-upgrade = &power_green;
-
-               led-dsl = &info_green;
-               led-wifi = &wifi;
-       };
-
-       memory@0 {
-               reg = <0x0 0x8000000>;
-       };
-
-       gpio-keys-polled {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-               dect {
-                       label = "dect";
-                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_PHONE>;
-               };
-               wifi {
-                       label = "wifi";
-                       gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_WLAN>;
-               };
-       };
-
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               power_green: power {
-                       label = "fritz7360sl:green:power";
-                       gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
-                       default-state = "keep";
-               };
-               power_red: power2 {
-                       label = "fritz7360sl:red:power";
-                       gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
-               };
-               info_red {
-                       label = "fritz7360sl:red:info";
-                       gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
-               };
-               info_green: info_green {
-                       label = "fritz7360sl:green:info";
-                       gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
-               };
-               wifi: wifi {
-                       label = "fritz7360sl:green:wlan";
-                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
-               };
-               dect {
-                       label = "fritz7360sl:green:dect";
-                       gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
-               };
-       };
 };
 
-&eth0 {
-       lan: interface@0 {
-               compatible = "lantiq,xrx200-pdi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0>;
-               mtd-mac-address = <&urlader 0xa91>;
-               mtd-mac-address-increment = <(-2)>;
-               lantiq,switch;
-
-               ethernet@0 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <0>;
-                       phy-mode = "rmii";
-                       phy-handle = <&phy0>;
-               };
-               ethernet@1 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <1>;
-                       phy-mode = "rmii";
-                       phy-handle = <&phy1>;
-               };
-               ethernet@2 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <2>;
-                       phy-mode = "gmii";
-                       phy-handle = <&phy11>;
-               };
-               ethernet@3 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <4>;
-                       phy-mode = "gmii";
-                       phy-handle = <&phy13>;
-               };
-       };
+&power_green {
+       label = "fritz7360sl:green:power";
+};
 
-       mdio@0 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "lantiq,xrx200-mdio";
-               reg = <0>;
+&power_red {
+       label = "fritz7360sl:red:power";
+};
 
-               phy0: ethernet-phy@0 {
-                       reg = <0x00>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
-               };
-               phy1: ethernet-phy@1 {
-                       reg = <0x01>;
-                       compatible = "ethernet-phy-ieee802.3-c22";
-                       reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
-               };
-               phy11: ethernet-phy@11 {
-                       reg = <0x11>;
-                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-               };
-               phy13: ethernet-phy@13 {
-                       reg = <0x13>;
-                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-               };
-       };
+&info_green {
+       label = "fritz7360sl:green:info";
 };
 
-&gphy0 {
-       lantiq,gphy-mode = <GPHY_MODE_GE>;
+&wifi {
+       label = "fritz7360sl:green:wlan";
 };
 
-&gphy1 {
-       lantiq,gphy-mode = <GPHY_MODE_GE>;
+&info_red {
+       label = "fritz7360sl:red:info";
 };
 
-&gpio {
-       pinctrl-names = "default";
-       pinctrl-0 = <&state_default>;
+&dect {
+       label = "fritz7360sl:green:dect";
+};
 
-       state_default: pinmux {
-               mdio {
-                       lantiq,groups = "mdio";
-                       lantiq,function = "mdio";
-               };
-               phy-rst {
-                       lantiq,pins = "io37", "io44";
-                       lantiq,pull = <0>;
-                       lantiq,open-drain;
-                       lantiq,output = <1>;
-               };
-               pcie-rst {
-                       lantiq,pins = "io38";
-                       lantiq,pull = <0>;
-                       lantiq,output = <1>;
-               };
+&state_default {
+       pcie-rst {
+               lantiq,pins = "io38";
+               lantiq,pull = <0>;
+               lantiq,output = <1>;
        };
 };
 
@@ -206,35 +80,3 @@
                };
        };
 };
-
-&pcie0 {
-       pcie@0 {
-               reg = <0 0 0 0 0>;
-               #interrupt-cells = <1>;
-               #size-cells = <2>;
-               #address-cells = <3>;
-               device_type = "pci";
-
-               wifi@168c,002e {
-                       compatible = "pci168c,002e";
-                       reg = <0 0 0 0 0>;
-                       qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */
-               };
-       };
-};
-
-&usb_phy0 {
-       status = "okay";
-};
-
-&usb_phy1 {
-       status = "okay";
-};
-
-&usb0 {
-       status = "okay";
-};
-
-&usb1 {
-       status = "okay";
-};

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ736X.dtsi
new file mode 100644 (file)
index 0000000..9c1d2db
--- /dev/null
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ736X.dtsi
@@ -0,0 +1,205 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "vr9.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/mips/lantiq_rcu_gphy.h>
+
+/ {
+       compatible = "avm,fritz736x", "lantiq,xway", "lantiq,vr9";
+
+       chosen {
+               bootargs = "console=ttyLTQ0,115200";
+       };
+
+       aliases {
+               led-boot = &power_green;
+               led-failsafe = &power_red;
+               led-running = &power_green;
+               led-upgrade = &power_green;
+               led-dsl = &info_green;
+               led-wifi = &wifi;
+       };
+
+       memory@0 {
+               reg = <0x0 0x8000000>;
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               poll-interval = <100>;
+
+               dect {
+                       label = "dect";
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_PHONE>;
+               };
+
+               wifi {
+                       label = "wifi";
+                       gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_WLAN>;
+               };
+       };
+
+       leds: leds {
+               compatible = "gpio-leds";
+
+               power_green: power {
+                       gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
+                       default-state = "keep";
+               };
+
+               power_red: power2 {
+                       gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
+               };
+
+               info_green: info_green {
+                       gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
+               };
+
+               wifi: wifi {
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+               };
+
+               info_red: info_red {
+                       gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
+               };
+
+               dect: dect {
+                       gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
+               };
+       };
+};
+
+&eth0 {
+       lan: interface@0 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+               mtd-mac-address = <&urlader 0xa91>;
+               mtd-mac-address-increment = <(-2)>;
+               lantiq,switch;
+
+               ethernet@0 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <0>;
+                       phy-mode = "rmii";
+                       phy-handle = <&phy0>;
+               };
+
+               ethernet@1 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <1>;
+                       phy-mode = "rmii";
+                       phy-handle = <&phy1>;
+               };
+
+               ethernet@2 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <2>;
+                       phy-mode = "gmii";
+                       phy-handle = <&phy11>;
+               };
+
+               ethernet@3 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <4>;
+                       phy-mode = "gmii";
+                       phy-handle = <&phy13>;
+               };
+       };
+
+       mdio@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "lantiq,xrx200-mdio";
+               reg = <0>;
+
+               phy0: ethernet-phy@0 {
+                       reg = <0x00>;
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reset-gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
+               };
+
+               phy1: ethernet-phy@1 {
+                       reg = <0x01>;
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
+               };
+
+               phy11: ethernet-phy@11 {
+                       reg = <0x11>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+               };
+
+               phy13: ethernet-phy@13 {
+                       reg = <0x13>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+               };
+       };
+};
+
+&gphy0 {
+       lantiq,gphy-mode = <GPHY_MODE_GE>;
+};
+
+&gphy1 {
+       lantiq,gphy-mode = <GPHY_MODE_GE>;
+};
+
+&gpio {
+       pinctrl-names = "default";
+       pinctrl-0 = <&state_default>;
+
+       state_default: pinmux {
+               mdio {
+                       lantiq,groups = "mdio";
+                       lantiq,function = "mdio";
+               };
+
+               phy-rst {
+                       lantiq,pins = "io37", "io44";
+                       lantiq,pull = <0>;
+                       lantiq,open-drain;
+                       lantiq,output = <1>;
+               };
+       };
+
+};
+
+&pcie0 {
+       status = "okay";
+
+       pcie@0 {
+               reg = <0 0 0 0 0>;
+               #interrupt-cells = <1>;
+               #size-cells = <1>;
+               #address-cells = <2>;
+               device_type = "pci";
+
+               wifi@168c,002e {
+                       compatible = "pci168c,002e";
+                       reg = <0 0 0 0 0>;
+                       qca,no-eeprom; /* load from ath9k-eeprom-pci-0000:01:00.0.bin */
+               };
+       };
+};
+
+&usb_phy0 {
+       status = "okay";
+};
+
+&usb_phy1 {
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};