ath79: ar: convert to nvmem-layout

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7161_buffalo_wzr-hp-ag300h.dtsi

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 053c91557b47e1c1ade08b6c5a9a417c5b7f8764..26147a2c80807b13da75416dfc0ede45fb44316f 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -12,13 +12,6 @@
                led-upgrade = &led_diag;
        };
 
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -75,24 +68,28 @@
                compatible = "gpio-keys";
 
                reset {
+                       label = "reset";
                        linux,code = <KEY_RESTART>;
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
                usb {
+                       label = "usb";
                        linux,code = <BTN_2>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
                aoss {
+                       label = "aoss";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        debounce-interval = <60>;
                };
 
                router_auto {
+                       label = "router_auto";
                        linux,code = <BTN_6>;
                        linux,input-type = <EV_SW>;
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
@@ -100,6 +97,7 @@
                };
 
                router_off {
+                       label = "router_off";
                        linux,code = <BTN_5>;
                        linux,input-type = <EV_SW>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
@@ -107,6 +105,7 @@
                };
 
                movie_engine {
+                       label = "movie_engine";
                        linux,code = <BTN_7>;
                        linux,input-type = <EV_SW>;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
@@ -149,6 +148,20 @@
                                label = "art";
                                reg = <0x0050000 0x0010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_120c: macaddr@120c {
+                                               reg = <0x120c 0x6>;
+                                       };
+
+                                       macaddr_art_520c: macaddr@520c {
+                                               reg = <0x520c 0x6>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -171,25 +184,11 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &pcie0 {
@@ -212,19 +211,9 @@
        };
 };
 
-&uart {
-       status = "okay";
-};
-
-&pll {
-       clocks = <&extosc>;
-};
-
 &spi {
        status = "okay";
 
-       num-cs = <2>;
-       cs-gpios = <0>, <0>;
 
        flash0: flash@0 {
                compatible = "jedec,spi-nor";
@@ -253,7 +242,8 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x120c>;
+       nvmem-cells = <&macaddr_art_120c>;
+       nvmem-cell-names = "mac-address";
 
        fixed-link {
                speed = <1000>;
@@ -264,8 +254,9 @@
 &eth1 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x520c>;
-       mtd-mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_art_520c>;
+       nvmem-cell-names = "mac-address";
+       mac-address-increment = <1>;
 
        phy-handle = <&phy4>;
 };