ath79: improve common DTSI name for TP-Link Archer C5, C7 v1/v2

[openwrt/openwrt.git] / target / linux / ath79 / dts / qca9561_avm_fritz4020.dts

diff --git a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
index f023f6601a708ca1322ce3f71168ae520c6f5e52..64122525907020dddc154fb924824deb78335aa7 100644 (file)
--- a/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
+++ b/target/linux/ath79/dts/qca9561_avm_fritz4020.dts
@@ -11,10 +11,10 @@
        model = "AVM FRITZ!Box 4020";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &info_red;
-               led-running = &power;
-               led-upgrade = &info_red;
+               led-boot = &led_power;
+               led-failsafe = &led_info_red;
+               led-running = &led_power;
+               led-upgrade = &led_info_red;
        };
 
        chosen {
@@ -26,8 +26,8 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               sck-gpio = <&gpio 20 GPIO_ACTIVE_HIGH>;
-               mosi-gpio = <&gpio 19 GPIO_ACTIVE_HIGH>;
+               sck-gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+               mosi-gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
                num-chipselects = <0>;
 
                led_gpio: led_gpio@0 {
@@ -36,7 +36,6 @@
                        gpio-controller;
                        #gpio-cells = <2>;
                        registers-number = <1>;
-                       lines-initial-states = /bits/ 8 <0xff>;
                        spi-max-frequency = <10000000>;
 
                        gpio_latch_bit {
@@ -51,7 +50,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "fritz4020:green:power";
                        gpios = <&led_gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -78,23 +77,22 @@
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
                };
 
-               info_red: info_red {
+               led_info_red: info_red {
                        label = "fritz4020:red:info";
                        gpios = <&led_gpio 1 GPIO_ACTIVE_LOW>;
                };
        };
 
        keys {
-               compatible = "gpio-keys-polled";
-               poll-interval = <100>;
+               compatible = "gpio-keys";
 
-               wps_button {
+               wps {
                        label = "WPS button";
                        linux,code = <KEY_WPS_BUTTON>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               wlan_button {
+               wlan {
                        label = "WLAN button";
                        linux,code = <KEY_RFKILL>;
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
@@ -112,6 +110,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
@@ -171,5 +170,6 @@
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };