ramips: specify "firmware" partition format in JBOOT devices

[openwrt/openwrt.git] / target / linux / ramips / dts / AC1200RM.dts

diff --git a/target/linux/ramips/dts/AC1200RM.dts b/target/linux/ramips/dts/AC1200RM.dts
index 9bdbf5cadf84f1818ffd72fcebb3332a76e5a8cb..29f54be0f063db842c751f733be59359394320c8 100644 (file)
--- a/target/linux/ramips/dts/AC1200RM.dts
+++ b/target/linux/ramips/dts/AC1200RM.dts
@@ -41,14 +41,17 @@
        compatible = "alfa-network,ac1200rm", "ralink,mt7620a-soc";
        model = "ALFA Network AC1200RM";
 
+       aliases {
+               led-boot = &led_wps;
+               led-failsafe = &led_wps;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200";
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
@@ -66,7 +69,7 @@
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
-               wps {
+               led_wps: wps {
                        label = "ac1200rm:green:wps";
                        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                };
@@ -106,18 +109,17 @@
 
 &pcie {
        status = "okay";
+};
 
-       pcie-bridge {
-               mt76@0,0 {
-                       reg = <0x0000 0 0 0 0>;
-                       device_type = "pci";
-                       mediatek,mtd-eeprom = <&factory 0x8000>;
-                       ieee80211-freq-limit = <5000000 6000000>;
+&pcie0 {
+       mt76@0,0 {
+               reg = <0x0000 0 0 0 0>;
+               mediatek,mtd-eeprom = <&factory 0x8000>;
+               ieee80211-freq-limit = <5000000 6000000>;
 
-                       led {
-                               led-sources = <2>;
-                               led-active-low;
-                       };
+               led {
+                       led-sources = <2>;
+                       led-active-low;
                };
        };
 };
@@ -135,38 +137,43 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
 
-               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 0x1000>;
-               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-               partition@031000 {
-                       label = "config";
-                       reg = <0x31000 0xf000>;
-                       read-only;
-               };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x1000>;
+                       };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+                       partition@31000 {
+                               label = "config";
+                               reg = <0x31000 0xf000>;
+                               read-only;
+                       };
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0xfb0000>;
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0xfb0000>;
+                       };
                };
        };
 };