netifd: fix bogus warnings in packet_steering init script

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9557_buffalo_bhr-4grv2.dts

diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
index 1c778f57ac9eac4fec29e8d2cdc5caf07a1b3943..62c1124cb6df054e1cf0776159e937a442cc37d4 100644 (file)
--- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
+++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
@@ -1,54 +1,50 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
+
+#include "qca955x.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-
-#include "qca9557.dtsi"
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "buffalo,bhr-4grv2", "qca,qca9557";
        model = "Buffalo BHR-4GRV2";
 
        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;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               power: power {
-                       label = "bhr-4grv2:green:power";
+               led_power: power {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                diag {
-                       label = "bhr-4grv2:orange:diag";
+                       label = "orange:diag";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                vpn_orange {
-                       label = "bhr-4grv2:orange:vpn";
+                       label = "orange:vpn";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                vpn_green {
-                       label = "bhr-4grv2:green:vpn";
+                       label = "green:vpn";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
@@ -69,7 +65,6 @@
 
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -102,6 +97,20 @@
                                label = "art";
                                reg = <0xff0000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
                };
        };
@@ -125,7 +134,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x0>;
+       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy0>;
        pll-data = <0x56000000 0x00000101 0x00001616>;
 };
@@ -133,7 +143,8 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x6>;
+       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
        fixed-link {
@@ -141,7 +152,3 @@
                full-duplex;
        };
 };
-
-&uart {
-       status = "okay";
-};