lantiq: move partitions into partion table node

[openwrt/openwrt.git] / target / linux / lantiq / dts / FRITZ3370.dts

diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 648e36bcf0d85ff577f6829b074abd1f467abc0e..d802ca70b4f30f267eff6721b4d79b107ec96412 100644 (file)
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -32,31 +32,37 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "kernel";
-                                       reg = <0x0 0x400000>;
-                               };
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               partition@400000 {
-                                       label = "rootfs_ubi";
-                                       reg = <0x400000 0x3000000>;
-                               };
+                                       partition@0 {
+                                               label = "kernel";
+                                               reg = <0x0 0x400000>;
+                                       };
 
-                               partition@3400000 {
-                                       label = "vr9_firmware";
-                                       reg = <0x3400000 0x400000>;
-                               };
-                               partition@3800000 {
-                                       label = "reserved";
-                                       reg = <0x3800000 0x3000000>;
-                               };
-                               partition@6800000 {
-                                       label = "config";
-                                       reg = <0x6800000 0x200000>;
-                               };
-                               partition@6a00000 {
-                                       label = "nand-filesystem";
-                                       reg = <0x6a00000 0x1600000>;
+                                       partition@400000 {
+                                               label = "rootfs_ubi";
+                                               reg = <0x400000 0x3000000>;
+                                       };
+
+                                       partition@3400000 {
+                                               label = "vr9_firmware";
+                                               reg = <0x3400000 0x400000>;
+                                       };
+                                       partition@3800000 {
+                                               label = "reserved";
+                                               reg = <0x3800000 0x3000000>;
+                                       };
+                                       partition@6800000 {
+                                               label = "config";
+                                               reg = <0x6800000 0x200000>;
+                                       };
+                                       partition@6a00000 {
+                                               label = "nand-filesystem";
+                                               reg = <0x6a00000 0x1600000>;
+                                       };
                                };
                        };
                };
@@ -102,77 +108,6 @@
                        };
                };
 
-               eth@E108000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "lantiq,xrx200-net";
-                       reg = < 0xE108000 0x3000 /* switch */
-                               0xE10B100 0x70 /* mdio */
-                               0xE10B1D8 0x30 /* mii */
-                               0xE10B308 0x30 /* pmac */
-                       >;
-                       interrupt-parent = <&icu0>;
-                       interrupts = <73 72>;
-
-                       lan: interface@0 {
-                               compatible = "lantiq,xrx200-pdi";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               reg = <0>;
-                               mac-address = [ 00 11 22 33 44 55 ];
-                               lantiq,switch;
-
-                               ethernet@0 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <0>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy0>;
-                                       gpios = <&gpio 37 0>;
-                               };
-                               ethernet@1 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <1>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy1>;
-                                       gpios = <&gpio 44 0>;
-                               };
-                               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";
-                               phy0: ethernet-phy@0 {
-                                       reg = <0x0>;
-                                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                               };
-                               phy1: ethernet-phy@1 {
-                                       reg = <0x1>;
-                                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
-                               };
-                               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";
-                               };
-                       };
-               };
-
                ifxhcd@E101000 {
                        status = "okay";
                        gpios = <&gpio 5 0
@@ -278,3 +213,63 @@
                };
        };
 };
+
+&eth0 {
+       lan: interface@0 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+               mac-address = [ 00 11 22 33 44 55 ];
+               lantiq,switch;
+
+               ethernet@0 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <0>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy0>;
+                       gpios = <&gpio 37 0>;
+               };
+               ethernet@1 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <1>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy1>;
+                       gpios = <&gpio 44 0>;
+               };
+               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";
+               phy0: ethernet-phy@0 {
+                       reg = <0x0>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+               };
+               phy1: ethernet-phy@1 {
+                       reg = <0x1>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+               };
+               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";
+               };
+       };
+};