lantiq: move partitions into partion table node

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

diff --git a/target/linux/lantiq/dts/VG3503J.dtsi b/target/linux/lantiq/dts/VG3503J.dtsi
index e56792353464e6006cc59291f9bc412cb4cf9681..f68d22cceb66fe3292e91d8fc6ec507d078ca48b 100644 (file)
--- a/target/linux/lantiq/dts/VG3503J.dtsi
+++ b/target/linux/lantiq/dts/VG3503J.dtsi
@@ -7,9 +7,11 @@
                bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
 
                leds {
+                       boot = &power_green;
+                       failsafe = &power_red;
+                       running = &power_green;
+
                        internet = &dsl;
-                       power = &power;
-                       power2 = &power2;
                };
        };
 
@@ -27,44 +29,50 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x00000 0x20000>;
-                               };
-
-                               partition@20000 {
-                                       label = "kernel";
-                                       reg = <0x20000 0x300000>;
-                               };
-
-                               partition@1a0000 {
-                                       label = "rootfs";
-                                       reg = <0x320000 0x420000>;
-                               };
-
-                               partition@740000 {
-                                       label = "btagent";
-                                       reg = <0x740000 0x80000>;
-                               };
-
-                               partition@7c0000 {
-                                       label = "pri_bfocus_cfg";
-                                       reg = <0x7c0000 0x10000>;
-                               };
-
-                               partition@7d0000 {
-                                       label = "sec_bfocus_cfg";
-                                       reg = <0x7d0000 0x10000>;
-                               };
-
-                               partition@7e0000 {
-                                       label = "sysconfig";
-                                       reg = <0x7e0000 0x10000>;
-                               };
-
-                               partition@7f0000 {
-                                       label = "misc_cfg";
-                                       reg = <0x7f0000 0x10000>;
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       partition@0 {
+                                               label = "uboot";
+                                               reg = <0x00000 0x20000>;
+                                       };
+
+                                       partition@20000 {
+                                               label = "kernel";
+                                               reg = <0x20000 0x300000>;
+                                       };
+
+                                       partition@1a0000 {
+                                               label = "rootfs";
+                                               reg = <0x320000 0x420000>;
+                                       };
+
+                                       partition@740000 {
+                                               label = "btagent";
+                                               reg = <0x740000 0x80000>;
+                                       };
+
+                                       partition@7c0000 {
+                                               label = "pri_bfocus_cfg";
+                                               reg = <0x7c0000 0x10000>;
+                                       };
+
+                                       partition@7d0000 {
+                                               label = "sec_bfocus_cfg";
+                                               reg = <0x7d0000 0x10000>;
+                                       };
+
+                                       partition@7e0000 {
+                                               label = "sysconfig";
+                                               reg = <0x7e0000 0x10000>;
+                                       };
+
+                                       partition@7f0000 {
+                                               label = "misc_cfg";
+                                               reg = <0x7f0000 0x10000>;
+                                       };
                                };
                        };
                };
@@ -89,54 +97,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>;
-
-                       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@2 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <2>;
-                                       phy-mode = "mii";
-                                       phy-handle = <&phy11>;
-                               };
-                               ethernet@4 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <4>;
-                                       phy-mode = "mii";
-                                       phy-handle = <&phy13>;
-                               };
-                       };
-
-                       mdio@0 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "lantiq,xrx200-mdio";
-                               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";
-                               };
-                       };
-               };
        };
 
        gpio-keys-polled {
@@ -154,17 +114,63 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               power2: power2 {
-                       label = "power2";
+               power_red: power2 {
+                       label = "vg3503j:red:power";
                        gpios = <&gpio 14 1>;
                };
                dsl: dsl {
-                       label = "bt:green:dsl";
+                       label = "vg3503j:green:dsl";
                        gpios = <&gpio 19 1>;
                };
-               power: power {
-                       label = "power";
+               power_green: power {
+                       label = "vg3503j:green:power";
                        gpios = <&gpio 28 1>;
+                       default-state = "keep";
+               };
+       };
+};
+
+&eth0 {
+       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@2 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <2>;
+                       phy-mode = "mii";
+                       phy-handle = <&phy11>;
+               };
+               ethernet@4 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <4>;
+                       phy-mode = "mii";
+                       phy-handle = <&phy13>;
+               };
+       };
+
+       mdio@0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "lantiq,xrx200-mdio";
+               phy11: ethernet-phy@11 {
+                       reg = <0x11>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+                       lantiq,led1h = <0x70>;
+                       lantiq,led1l = <0x00>;
+                       lantiq,led2h = <0x00>;
+                       lantiq,led2l = <0x03>;
+               };
+               phy13: ethernet-phy@13 {
+                       reg = <0x13>;
+                       compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
+                       lantiq,led1h = <0x70>;
+                       lantiq,led1l = <0x00>;
+                       lantiq,led2h = <0x00>;
+                       lantiq,led2l = <0x03>;
                };
        };
 };