lantiq: move partitions into partion table node

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

diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index 24ded3e8537b62ea8ecb07538fca398eb0cc2863..10bc4b1c054bcf8104bb8c9b7c1a14f2d09a2fd3 100644 (file)
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -5,6 +5,13 @@
 / {
        model = "P2812HNUF1 - ZyXEL P-2812HNU-F1";
 
+       chosen {
+               leds {
+                       usb = &usb1;
+                       usb2 = &usb2;
+               };
+       };
+
        fpi@10000000 {
                localbus@0 {
                        nand-parts@0 {
@@ -15,21 +22,27 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "uboot";
-                                       reg = <0x00000 0x40000>;
-                               };
-                               partition@40000 {
-                                       label = "uboot-env";
-                                       reg = <0x40000 0x20000>;
-                               };
-                               partition@60000 {
-                                       label = "kernel";
-                                       reg = <0x60000 0x200000>;
-                               };
-                               partition@260000 {
-                                       label = "ubi";
-                                       reg = <0x260000 0x7da0000>;
+                               partitions {
+                                       compatible = "fixed-partitions";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       partition@0 {
+                                               label = "uboot";
+                                               reg = <0x00000 0x40000>;
+                                       };
+                                       partition@40000 {
+                                               label = "uboot-env";
+                                               reg = <0x40000 0x20000>;
+                                       };
+                                       partition@60000 {
+                                               label = "kernel";
+                                               reg = <0x60000 0x200000>;
+                                       };
+                                       partition@260000 {
+                                               label = "ubi";
+                                               reg = <0x260000 0x7da0000>;
+                                       };
                                };
                        };
                };
@@ -44,63 +57,13 @@
        };
 
        gpio-leds {
-               compatible = "gpio-leds";
-
-               internet_red {                          /* red */
-                       label = "internet_red";
-                       gpios = <&stp 16 1>;
-               };
-               internet_green {
-                       label = "internet_green";       /* green */
-                       gpios = <&stp 17 1>;
-               };
-               dsl {
-                       label = "dsl";
-                       gpios = <&stp 18 1>;
-               };
-               dsl2 {
-                       label = "dsl2";
-                       gpios = <&stp 19 1>;
-               };
-               wireless_red {                          /* red */
-                       label = "wireless_red";
-                       gpios = <&stp 20 1>;
-               };
-               wireless_green {                        /* green */
-                       label = "wireless_green";
-                       gpios = <&stp 21 1>;
-               };
-               power {                                 /* red */
-                       label = "power";
-                       gpios = <&stp 22 1>;
-               };
-               power2 {                                /* green */
-                       label = "power2";
-                       gpios = <&stp 23 1>;
-               };
-               usb1 {                                  /* green */
-                       label = "usb1";
+               usb1: usb1 {
+                       label = "p2812hnuf1:green:usb1";
                        gpios = <&gpio 38 1>;
                };
-               usb2 {                                  /* green */
-                       label = "usb2";
+               usb2: usb2 {
+                       label = "p2812hnuf1:green:usb2";
                        gpios = <&gpio 44 1>;
                };
-               phone1 {                                /* green */
-                       label = "phone1";
-                       gpios = <&gpio 11 1>;
-               };
-               phone1warn {                            /* red */
-                       label = "phone1warn";
-                       gpios = <&gpio 12 1>;
-               };
-               phone2warn {                            /* red */
-                       label = "phone2warn";
-                       gpios = <&gpio 26 1>;
-               };
-               phone2 {                                /* green */
-                       label = "phone2";
-                       gpios = <&gpio 28 1>;
-               };
        };
 };