ath79: qca: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / qca9558_tplink_tl-wr941n-v7-cn.dts

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
index 82dee361bc7deadd4446a03b8f5c646a99fac506..9d329000c9bd99fbbeed408e7ef7ba187fdde84d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts
@@ -21,19 +21,19 @@
                compatible = "gpio-leds";
 
                led_system: system {
-                       label = "tp-link:green:system";
+                       label = "green:system";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
                wlan {
-                       label = "tp-link:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                qss {
-                       label = "tp-link:green:qss";
+                       label = "green:qss";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,13 +57,8 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
-       num-cs = <1>;
 
        flash@0 {
                compatible = "jedec,spi-nor";
@@ -79,6 +74,16 @@
                                label = "u-boot";
                                reg = <0x000000 0x020000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               reg = <0x1fc00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -108,7 +113,8 @@
 &eth0 {
        status = "okay";
        phy-mode = "mii";
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
        fixed-link {
                speed = <100>;
                full-duplex;
@@ -118,5 +124,6 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&uboot 0x1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cell-names = "mac-address";
 };