ramips: move partitions into partition table node

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / WLR-6000.dts

diff --git a/target/linux/ramips/dts/WLR-6000.dts b/target/linux/ramips/dts/WLR-6000.dts
index 4f8ba6fff9cf8179a93081b881108e2fc7104bd5..a005774d0bf0d398cb0ef47b3a421a13cdf5ada9 100644 (file)
--- a/target/linux/ramips/dts/WLR-6000.dts
+++ b/target/linux/ramips/dts/WLR-6000.dts
@@ -9,10 +9,12 @@
        compatible = "sitecom,wlr-6000", "ralink,rt3883-soc";
        model = "Sitecom WLR-6000";
 
+       aliases {
+               led-status = &led_power;
+       };
+
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -25,7 +27,7 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               power {
+               led_power: power {
                        label = "wlr-6000:red:power";
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
                };
@@ -97,78 +99,71 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <8600000>;
                m25p,fast-read;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x713000>;
-               };
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-               partition@763000 {
-                       label = "manufacture";
-                       reg = <0x763000 0x7D000>;
-                       read-only;
-               };
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x713000>;
+                       };
 
-               partition@7E0000 {
-                       label = "backup";
-                       reg = <0x7E0000 0x10000>;
-                       read-only;
-               };
+                       partition@763000 {
+                               label = "manufacture";
+                               reg = <0x763000 0x7D000>;
+                               read-only;
+                       };
+
+                       partition@7E0000 {
+                               label = "backup";
+                               reg = <0x7E0000 0x10000>;
+                               read-only;
+                       };
 
-               partition@7F0000 {
-                       label = "storage";
-                       reg = <0x7F0000 0x10000>;
-                       read-only;
+                       partition@7F0000 {
+                               label = "storage";
+                               reg = <0x7F0000 0x10000>;
+                               read-only;
+                       };
                };
        };
 };
 
 &pci {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pci_pins>;
-
-       pci_pins: pci {
-               pci {
-                       ralink,group = "pci";
-                       ralink,function = "pci-fnc";
-               };
-       };
+};
 
-       host-bridge {
-               pci-bridge@1 {
-                       status = "okay";
+&pci1 {
+       status = "okay";
 
-                       wifi@1814,3091 {
-                               compatible = "pci1814,3091";
-                               reg = <0x10000 0 0 0 0>;
-                               ralink,mtd-eeprom = <&factory 0x8000>;
-                       };
-               };
+       wifi@0,0 {
+               compatible = "pci1814,3091";
+               reg = <0x10000 0 0 0 0>;
+               ralink,mtd-eeprom = <&factory 0x8000>;
        };
 };