rootfs: fix USE_APK detection

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7240_netgear_wnr612-v2.dtsi

diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 4bff7c8b78f3cb61f2b3022cfd4c0cf31c9d7fe9..c197a90ec5aaacb3dc4af7948cfe57352642cc9c 100644 (file)
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -1,17 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "ar7240.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "ar7240.dtsi"
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth1;
        };
 
@@ -33,23 +34,25 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
-               power: power {
-                       label = "netgear:green:power";
+               led_power: power {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
                lan1 {
-                       label = "netgear:green:lan1";
+                       label = "green:lan1";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
                lan2 {
-                       label = "netgear:green:lan2";
+                       label = "green:lan2";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
                wan {
-                       label = "netgear:green:wan";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,8 +60,9 @@
        ath9k-leds {
                compatible = "gpio-leds";
 
-               wlan: wlan {
-                       label = "netgear:green:wlan";
+               wlan {
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
@@ -67,7 +71,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -91,7 +94,9 @@
                        };
 
                        partition@50000 {
-                               compatible = "netgear,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,ih-magic = <0x32303631>;
+                               openwrt,ih-type = <IH_TYPE_FILESYSTEM>;
                                reg = <0x50000 0x3a0000>;
                                label = "firmware";
                        };
@@ -100,21 +105,37 @@
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
 };
 
 &eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &pcie {
@@ -123,14 +144,10 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,002b";
                reg = <0x0000 0 0 0 0>;
-               mtd-mac-address = <&art 0x0>;
-               mtd-mac-address-increment = <1>;
+               nvmem-cells = <&macaddr_art_0 1>;
+               nvmem-cell-names = "mac-address";
                qca,no-eeprom;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
-
-&uart {
-       status = "okay";
-};