ipq806x: switch default to 6.6

[openwrt/staging/pepe2k.git] / target / linux / ipq806x / files-6.1 / arch / arm / boot / dts / qcom-ipq8068-mr52.dts

diff --git a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8068-mr52.dts b/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
index f81e3ef690dcc33193dc381d166faedccf30bf62..7512bfb74f1c2de77556c2e95003e6d57f2d67cb 100644 (file)
--- a/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
+++ b/target/linux/ipq806x/files-6.1/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq8068-cryptid-common.dtsi"
 
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Meraki MR52";
@@ -40,7 +41,8 @@
                pinctrl-names = "default";
 
                led_power: power {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&qcom_pinmux 19 GPIO_ACTIVE_HIGH>;
                };
 
@@ -80,7 +82,7 @@
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -93,9 +95,8 @@
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &gsbi7 {
@@ -142,11 +143,17 @@
                pagesize = <32>;
                reg = <0x52>;
                read-only;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               mac_address: mac-address@66 {
-                       reg = <0x66 0x6>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       mac_address: mac-address@66 {
+                               compatible = "mac-base";
+                               reg = <0x66 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
                };
        };
 };
@@ -212,21 +219,18 @@
 };
 
 &wifi0 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 4>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <4>;
 };
 
 &wifi1 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 3>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <3>;
 };
 
 &wifi2 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &hs_phy_0 {