treewide: convert mtd-mac-address-increment* to generic implementation

[openwrt/staging/chunkeey.git] / target / linux / ath79 / dts / ar7161_aruba_ap-105.dts

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index d7f1a0711f35c325833e92f17d3762e02ce99c74..083db183d421322c209a0fb814780be295fd4c18 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -32,23 +32,23 @@
                compatible = "gpio-leds";
 
                led_power_green: power_green {
-                       label = "ap-105:green:power";
+                       label = "green:power";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: power_red {
-                       label = "ap-105:red:power";
+                       label = "red:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
                wifi_2g_red {
-                       label = "ap-105:red:wlan2g";
+                       label = "red:wlan2g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wifi_5g_red {
-                       label = "ap-105:red:wlan5g";
+                       label = "red:wlan5g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -57,13 +57,13 @@
                compatible = "gpio-leds";
 
                wifi_2g_green {
-                       label = "ap-105:green:wlan2g";
+                       label = "green:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi_5g_green {
-                       label = "ap-105:green:wlan5g";
+                       label = "green:wlan5g";
                        gpios = <&ath9k1 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
@@ -85,10 +85,6 @@
                sda-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                scl-gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 
-               /* can be removed on 4.19 */
-               gpios = <&gpio 5 GPIO_ACTIVE_LOW>,
-                       <&gpio 4 GPIO_ACTIVE_LOW>;
-
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -108,7 +104,7 @@
        ath9k0: wifi@0,11 { /* 2.4 GHz */
                compatible = "pci168c,0029";
                mtd-mac-address = <&hwinfo 0x1c>;
-               mtd-mac-address-increment = <1>;
+               mac-address-increment = <1>;
                reg = <0x8800 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -117,17 +113,13 @@
        ath9k1: wifi@0,12 { /* 5 GHz */
                compatible = "pci168c,0029";
                mtd-mac-address = <&hwinfo 0x1c>;
-               mtd-mac-address-increment = <2>;
+               mac-address-increment = <2>;
                reg = <0x9000 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
 
-&uart {
-       status = "okay";
-};
-
 &mdio0 {
        status = "okay";
 
@@ -151,8 +143,6 @@
 &spi {
        status = "okay";
 
-       num-cs = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;