ath79: fix MAC address assignment for TP-Link ar7241 devices

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9558_netgear_ex7300.dtsi

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
index 21c25a571788fd3f8ff21c1f95e1effa674e3df5..c266c52dad8e4c18a7b7396367224e6309ec5437 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -1,21 +1,17 @@
 // 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"
-
 / {
-       chosen {
-               bootargs = "console=ttyS0,115200n8";
-       };
-
        aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
+               label-mac-device = &eth0;
        };
 
        led_spi {
@@ -23,8 +19,8 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               gpio-sck = <&gpio 18 GPIO_ACTIVE_HIGH>;
-               gpio-mosi = <&gpio 15 GPIO_ACTIVE_HIGH>;
+               sck-gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
+               mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                num-chipselects = <0>;
 
                led_gpio: led_gpio@0 {
@@ -33,7 +29,6 @@
                        gpio-controller;
                        #gpio-cells = <2>;
                        registers-number = <1>;
-                       lines-initial-states = /bits/ 8 <0xff>;
                        spi-max-frequency = <500000>;
 
                        gpio_latch_bit {
@@ -48,48 +43,48 @@
        leds {
                compatible = "gpio-leds";
 
-               power_green: power_green {
-                       label = "netgear:green:power";
+               led_power_green: power_green {
+                       label = "green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
-                       label = "netgear:amber:power";
+               led_power_amber: power_amber {
+                       label = "amber:power";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
                left_blue {
-                       label = "netgear:blue:left";
+                       label = "blue:left";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                };
 
                right_blue {
-                       label = "netgear:blue:right";
+                       label = "blue:right";
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
                wps_green {
-                       label = "netgear:green:wps";
+                       label = "green:wps";
                        gpios = <&led_gpio 5 GPIO_ACTIVE_LOW>;
                };
 
                client_red {
-                       label = "netgear:red:client";
+                       label = "red:client";
                        gpios = <&led_gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                client_green {
-                       label = "netgear:green:client";
+                       label = "green:client";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                };
 
                router_red {
-                       label = "netgear:red:router";
+                       label = "red:router";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
 
                router_green {
-                       label = "netgear:green:router";
+                       label = "green:router";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                };
        };
@@ -125,17 +120,8 @@
        status = "okay";
 };
 
-&uart {
-       status = "okay";
-};
-
-&pll {
-       clocks = <&extosc>;
-};
-
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -198,7 +184,8 @@
        status = "okay";
 
        mtd-cal-data = <&caldata 0x1000>;
-       mtd-mac-address = <&caldata 0x06>;
+       nvmem-cells = <&macaddr_caldata_6>;
+       nvmem-cell-names = "mac-address";
 };
 
 &mdio0 {
@@ -213,10 +200,25 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&caldata 0x00>;
+       nvmem-cells = <&macaddr_caldata_0>;
+       nvmem-cell-names = "mac-address";
 
        phy-handle = <&phy4>;
-       phy-mode = "rgmii";
+       phy-mode = "rgmii-rxid";
+
+       pll-data = <0x86000000 0x80000101 0x80001313>;
+};
+
+&caldata {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
 
-       pll-data = <0x83000000 0x80000101 0x80001313>;
+       macaddr_caldata_0: macaddr@0 {
+               reg = <0x0 0x6>;
+       };
+
+       macaddr_caldata_6: macaddr@6 {
+               reg = <0x6 0x6>;
+       };
 };