lantiq: move partitions into partion table node

[openwrt/openwrt.git] / target / linux / lantiq / dts / EASY80920.dtsi

diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index ad89ed95158ad030b9c0a9edc994fb0a63489598..e8cbc429800f2659addce661eda40ef6dfde1c7d 100644 (file)
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -100,101 +100,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 ];
-
-                               ethernet@0 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <0>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy0>;
-                               };
-                               ethernet@1 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <1>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy1>;
-                               };
-                               ethernet@2 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <2>;
-                                       phy-mode = "gmii";
-                                       phy-handle = <&phy11>;
-                               };
-                       };
-
-                       wan: interface@1 {
-                               compatible = "lantiq,xrx200-pdi";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               reg = <1>;
-                               mac-address = [ 00 11 22 33 44 56 ];
-                               lantiq,wan;
-                               ethernet@5 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <5>;
-                                       phy-mode = "rgmii";
-                                       phy-handle = <&phy5>;
-                               };
-                       };
-
-                       test: interface@2 {
-                               compatible = "lantiq,xrx200-pdi";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               reg = <2>;
-                               mac-address = [ 00 11 22 33 44 57 ];
-                               ethernet@4 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <4>;
-                                       phynmode0 = "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";
-                               };
-                               phy5: ethernet-phy@5 {
-                                       reg = <0x5>;
-                                       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";
-                               };
-                       };
-               };
-
                stp: stp@E100BB0 {
                        compatible = "lantiq,gpio-stp-xway";
                        reg = <0xE100BB0 0x40>;
@@ -317,33 +222,123 @@
                reg = <4 0>;
                spi-max-frequency = <1000000>;
 
-               partition@0 {
-                       reg = <0x0 0x20000>;
-                       label = "SPI (RO) U-Boot Image";
-                       read-only;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               reg = <0x0 0x20000>;
+                               label = "SPI (RO) U-Boot Image";
+                               read-only;
+                       };
+
+                       partition@20000 {
+                               reg = <0x20000 0x10000>;
+                               label = "ENV_MAC";
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               reg = <0x30000 0x10000>;
+                               label = "DPF";
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               reg = <0x40000 0x10000>;
+                               label = "NVRAM";
+                               read-only;
+                       };
+
+                       partition@500000 {
+                               reg = <0x50000 0x003a0000>;
+                               label = "kernel";
+                       };
                };
+       };
+};
 
-               partition@20000 {
-                       reg = <0x20000 0x10000>;
-                       label = "ENV_MAC";
-                       read-only;
+&eth0 {
+       lan: interface@0 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0>;
+               mac-address = [ 00 11 22 33 44 55 ];
+
+               ethernet@0 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <0>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy0>;
+               };
+               ethernet@1 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <1>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy1>;
+               };
+               ethernet@2 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <2>;
+                       phy-mode = "gmii";
+                       phy-handle = <&phy11>;
                };
+       };
 
-               partition@30000 {
-                       reg = <0x30000 0x10000>;
-                       label = "DPF";
-                       read-only;
+       wan: interface@1 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <1>;
+               mac-address = [ 00 11 22 33 44 56 ];
+               lantiq,wan;
+               ethernet@5 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <5>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy5>;
                };
+       };
 
-               partition@40000 {
-                       reg = <0x40000 0x10000>;
-                       label = "NVRAM";
-                       read-only;
+       test: interface@2 {
+               compatible = "lantiq,xrx200-pdi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <2>;
+               mac-address = [ 00 11 22 33 44 57 ];
+               ethernet@4 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <4>;
+                       phynmode0 = "gmii";
+                       phy-handle = <&phy13>;
                };
+       };
 
-               partition@500000 {
-                       reg = <0x50000 0x003a0000>;
-                       label = "kernel";
+       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";
+               };
+               phy5: ethernet-phy@5 {
+                       reg = <0x5>;
+                       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";
                };
        };
 };