ath79: use caldata partition label consistently

[openwrt/openwrt.git] / target / linux / ath79 / dts / ar7242_buffalo_wzr-hp-g302h-a1a0.dts

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index 3e2c80e059fda8bc71189ffebfab0cfccdebcdd6..71769ef9f734eb85029fd5d8675ca02b5652b708 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -11,9 +11,9 @@
        model = "Buffalo WZR-HP-G302H A1A0";
 
        aliases {
-               led-boot = &diag;
-               led-failsafe = &diag;
-               led-upgrade = &diag;
+               led-boot = &led_diag;
+               led-failsafe = &led_diag;
+               led-upgrade = &led_diag;
        };
 
        extosc: ref {
@@ -23,8 +23,7 @@
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               compatible = "gpio-keys";
 
                reset {
                        label = "reset";
@@ -33,7 +32,7 @@
                        debounce-interval = <60>;
                };
 
-               button_usb {
+               usb {
                        label = "usb";
                        linux,code = <BTN_2>;
                        gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
@@ -67,10 +66,9 @@
        leds {
                compatible = "gpio-leds";
 
-               diag: diag {
+               led_diag: diag {
                        label = "buffalo:red:diag";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
        };
 
@@ -80,7 +78,6 @@
                usb {
                        label = "buffalo:blue:usb";
                        gpios = <&ath9k 4 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
@@ -88,32 +85,27 @@
                wireless {
                        label = "buffalo:green:wireless";
                        gpios = <&ath9k 5 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                        linux,default-trigger = "phy0tpt";
                };
 
                security {
                        label = "buffalo:orange:security";
                        gpios = <&ath9k 6 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
 
                router {
                        label = "buffalo:green:router";
                        gpios = <&ath9k 7 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
 
                movie_engine_on {
                        label = "buffalo:blue:movie_engine_on";
                        gpios = <&ath9k 8 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
 
                movie_engine_off {
                        label = "buffalo:blue:movie_engine_off";
                        gpios = <&ath9k 9 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
                };
        };
 
@@ -171,6 +163,7 @@
 
 &spi {
        status = "okay";
+
        cs-gpios = <0>, <0>;
        num-cs = <2>;