ath79: DTS file style update and harmonization
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 5 Nov 2019 18:23:33 +0000 (19:23 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 5 Nov 2019 23:27:55 +0000 (00:27 +0100)
This applies several style adjustments that have been requested in
recent reviews to older DTS files. Despite making the code base more
consistent, this will also help to reduce review time when DTSes
are copy/pasted.

Applied changes:
- Rename gpio-keys/gpio-leds to keys/leds
- Remove node labels that are not used
- Use label property for partitions
- Prefix led node labels with "led_"
- Remove redundant includes
- Harmonize new lines after status property
- Several smaller style fixes

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
120 files changed:
target/linux/ath79/dts/ar1022_iodata_wn-ag300dgr.dts
target/linux/ath79/dts/ar1022_sitecom_wlr-7100.dts
target/linux/ath79/dts/ar7161_adtran_bsap1880.dtsi
target/linux/ath79/dts/ar7161_aruba_ap-105.dts
target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dts
target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
target/linux/ath79/dts/ar7161_jjplus_ja76pf2.dts
target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi
target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
target/linux/ath79/dts/ar7241_tplink.dtsi
target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
target/linux/ath79/dts/ar7241_ubnt_unifi.dts
target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi
target/linux/ath79/dts/ar7242_avm_fritz300e.dts
target/linux/ath79/dts/ar7242_buffalo_bhr-4grv.dts
target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts
target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
target/linux/ath79/dts/ar9330_glinet_gl-ar150.dts
target/linux/ath79/dts/ar9330_pqi_air-pen.dts
target/linux/ath79/dts/ar9331_alfa-network_ap121f.dts
target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi
target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
target/linux/ath79/dts/ar9341_pcs_cr3000.dts
target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
target/linux/ath79/dts/ar9341_tplink.dtsi
target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
target/linux/ath79/dts/ar9342_iodata_etg3-r.dts
target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
target/linux/ath79/dts/ar9344_comfast_cf-e120a-v3.dts
target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
target/linux/ath79/dts/ar9344_dlink_dir-835-a1.dts
target/linux/ath79/dts/ar9344_netgear_wndr4300.dts
target/linux/ath79/dts/ar9344_ocedo_raccoon.dts
target/linux/ath79/dts/ar9344_pcs_cap324.dts
target/linux/ath79/dts/ar9344_pcs_cr5000.dts
target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi
target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts
target/linux/ath79/dts/ar9344_tplink_tl-wdrxxxx.dtsi
target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
target/linux/ath79/dts/ar9344_wd_mynet-wifi-rangeextender.dts
target/linux/ath79/dts/qca9531_comfast_cf-e313ac.dts
target/linux/ath79/dts/qca9531_comfast_cf-e314n-v2.dts
target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
target/linux/ath79/dts/qca9531_tplink_tl-wr810n-v1.dts
target/linux/ath79/dts/qca9531_yuncore_a770.dts
target/linux/ath79/dts/qca9533_comfast_cf-e110n-v2.dts
target/linux/ath79/dts/qca9533_tplink_cpe210.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wr810n-v2.dts
target/linux/ath79/dts/qca9533_tplink_tl-wr841-v10.dts
target/linux/ath79/dts/qca9533_tplink_tl-wr841-v11.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wr841-v9.dts
target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts
target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi
target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
target/linux/ath79/dts/qca9558_devolo_dvl1200i.dts
target/linux/ath79/dts/qca9558_devolo_dvl1750c.dts
target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
target/linux/ath79/dts/qca9558_devolo_dvl1750i.dts
target/linux/ath79/dts/qca9558_devolo_dvl1750x.dts
target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
target/linux/ath79/dts/qca9558_engenius_epg5000.dts
target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
target/linux/ath79/dts/qca9558_ocedo_koala.dts
target/linux/ath79/dts/qca9558_tplink_archer-c5-v1.dts
target/linux/ath79/dts/qca9558_tplink_archer-c7-v1.dts
target/linux/ath79/dts/qca9558_tplink_archer-c7-v2.dts
target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi
target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
target/linux/ath79/dts/qca9561_avm_fritz4020.dts
target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
target/linux/ath79/dts/qca9563_dlink_dir-859-a1.dts
target/linux/ath79/dts/qca9563_elecom_wrc-1750ghbk2-i.dts
target/linux/ath79/dts/qca9563_elecom_wrc-300ghbk2-i.dts
target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
target/linux/ath79/dts/qca9563_nec_wg1200cr.dts
target/linux/ath79/dts/qca9563_nec_wg800hp.dts
target/linux/ath79/dts/qca9563_rosinson_wr818.dts
target/linux/ath79/dts/qca9563_tplink_archer-a7-v5.dts
target/linux/ath79/dts/qca9563_tplink_archer-c2-v3.dts
target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
target/linux/ath79/dts/qca9563_tplink_archer-c7-v5.dts
target/linux/ath79/dts/qca9563_tplink_archer-x6-v2.dtsi
target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi
target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v4.dts

index 64f471649e68f18c25d504e78e64315f5d4b5e32..536432e250eb6e243c702fb4b5a6f752169bd233 100644 (file)
        model = "I-O DATA WN-AG300DGR";
 
        aliases {
-               led-boot = &router;
-               led-failsafe = &router;
-               led-running = &router;
-               led-upgrade = &router;
+               led-boot = &led_router;
+               led-failsafe = &led_router;
+               led-running = &led_router;
+               led-upgrade = &led_router;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               router: router {
+               led_router: router {
                        label = "wn-ag300dgr:green:router";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 };
 
 &spi {
-       num-cs = <1>;
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
index 8a70b597b0fe7491104a43d169a677836e25e31c..c08a1277c22e38b3607f6b6def859a1b98c45a22 100644 (file)
        compatible = "sitecom,wlr-7100", "qca,ar9344";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        keys {
@@ -41,7 +41,7 @@
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
 
-               power: power {
+               led_power: power {
                        label = "wlr-7100:amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 };
 
 &spi {
-       num-cs = <1>;
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index ba9b588bec1e06fc5a49ee51e9cc778c614cd893..f5dfa77912b2b301f9705f6e64c1fabeae5f453b 100644 (file)
        };
 
        aliases {
-               led-boot = &led_green_status;
-               led-failsafe = &led_yellow_status;
-               led-running = &led_green_status;
-               led-upgrade = &led_yellow_status;
+               led-boot = &led_status_green;
+               led-failsafe = &led_status_yellow;
+               led-running = &led_status_green;
+               led-upgrade = &led_status_yellow;
        };
 
        leds {
                        linux,default-trigger = "phy0tpt";
                };
 
-               led_green_status: green_status {
+               led_status_green: status_green {
                        label = "bluesocket:green:status";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
-               led_yellow_status: yellow_status {
+               led_status_yellow: status_yellow {
                        label = "bluesocket:yellow:status";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
@@ -79,6 +79,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 91f6e1dc0272cde44e03d066eff80d6ea38937ad..d2a56f83ce4ac2bacfac2b72c40a96a6ef579177 100644 (file)
        };
 
        aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_red;
-               led-running = &power_green;
-               led-upgrade = &power_green;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_red;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
                label-mac-device = &eth0;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "ap-105:green:power";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
-               power_red: power_red {
+               led_power_red: power_red {
                        label = "ap-105:red:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        panic-indicator;
                };
 
-               wifi_2g_red: wifi_2g_red {
+               wifi_2g_red {
                        label = "ap-105:red:wlan2g";
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               wifi_5g_red: wifi_5g_red {
+               wifi_5g_red {
                        label = "ap-105:red:wlan5g";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index f51bc0f7710be9d51977e62e08a12eca3dc80651..2e00de8887ecf24a65e36e261fb7b72865bee69f 100644 (file)
@@ -11,9 +11,9 @@
        model = "Buffalo WZR-HP-AG300H/WZR-600DHP";
 
        aliases {
-               led-boot = &diag;
-               led-failsafe = &diag;
-               led-upgrade = &diag;
+               led-boot = &led_diag;
+               led-failsafe = &led_diag;
+               led-upgrade = &led_diag;
        };
 
        chosen {
                clock-frequency = <40000000>;
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
-               diag: diag {
+               led_diag: diag {
                        label = "buffalo:red:diag";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
        };
 
        ath9k-leds {
-               // those leds are indeed attached to the wifi chips
-
                compatible = "gpio-leds";
+
                band2g_a {
                        label = "buffalo:amber:band2g";
                        gpios = <&ath9k0 1 GPIO_ACTIVE_LOW>;
 
 &spi {
        status = "okay";
+
        num-cs = <2>;
        cs-gpios = <0>, <0>;
 
index 11b23d48791fc168a11627ff3f91e5407c8a5414..92de193aba46de2115fb844689ce15097553153a 100644 (file)
        model = "D-Link DIR825B1";
 
        aliases {
-               led-boot = &orange_power;
-               led-failsafe = &orange_power;
-               led-running = &blue_power;
-               led-upgrade = &orange_power;
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_blue;
+               led-upgrade = &led_power_orange;
        };
 
        chosen {
 
        leds {
                compatible = "gpio-leds";
-               blue_usb {
+
+               usb {
                        label = "d-link:blue:usb";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&usb_ochi_port>, <&usb_echi_port>;
                        linux,default-trigger = "usbport";
                };
 
-               orange_power: orange_power {
+               led_power_orange: power_orange {
                        label = "d-link:orange:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               blue_power: blue_power {
+               led_power_blue: power_blue {
                        label = "d-link:blue:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               blue_wps {
+               wps {
                        label = "d-link:blue:wps";
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
-               orange_planet {
+               planet_orange {
                        label = "d-link:orange:planet";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
 
-               blue_planet {
+               planet_blue {
                        label = "d-link:blue:planet";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
        fixed-link {
 
 &eth1 {
        status = "okay";
+
        pll-data = <0x11110000 0x00001099 0x00991099>;
 
        phy-handle = <&phy4>;
index 9dc92a482d1327ef506b21260cecf35972964d33..cce95d7dea5555a0e55163e6fe9bb44b26d078f8 100644 (file)
        };
 
        aliases {
-               led-boot = &d2;
-               led-failsafe = &d2;
-               led-running = &d2;
-               led-upgrade = &d2;
+               led-boot = &led_d2;
+               led-failsafe = &led_d2;
+               led-running = &led_d2;
+               led-upgrade = &led_d2;
        };
 
        extosc: ref {
@@ -36,7 +36,7 @@
        leds {
                compatible = "gpio-leds";
 
-               d2: d2 {
+               led_d2: d2 {
                        label = "ja76pf2:green:d2";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 070f4507788fbd4237b5f76c5537fcf1cb6efac3..7d842af060713b780f4ac04920a4b3b7fb36f330 100644 (file)
@@ -8,10 +8,10 @@
 
 / {
        aliases {
-               led-boot = &power_orange;
-               led-failsafe = &power_orange;
-               led-running = &power_green;
-               led-upgrade = &power_orange;
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_orange;
                label-mac-device = &eth0;
        };
 
@@ -37,7 +37,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                wps {
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               power_orange: power_orange {
+               led_power_orange: power_orange {
                        label = "netgear:orange:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -69,6 +69,7 @@
 
        ath9k-leds {
                compatible = "gpio-leds";
+
                wlan2g {
                        label = "netgear:green:wlan2g";
                        gpios = <&ath9k0 5 GPIO_ACTIVE_LOW>;
 
        rtl8366s {
                compatible = "realtek,rtl8366s";
+
                gpio-sda = <&gpio 5 GPIO_ACTIVE_HIGH>;
                gpio-sck = <&gpio 7 GPIO_ACTIVE_HIGH>;
 
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index f21ffecc050258a2a789ffe6eafb4b893683ff2a..4f52e3cc4096b7414a24d81a6e45318e77dfedb1 100644 (file)
        };
 
        aliases {
-               led-boot = &rf;
-               led-failsafe = &rf;
-               led-running = &rf;
-               led-upgrade = &rf;
+               led-boot = &led_rf;
+               led-failsafe = &led_rf;
+               led-running = &led_rf;
+               led-upgrade = &led_rf;
        };
 
        extosc: ref {
@@ -28,7 +28,7 @@
        leds {
                compatible = "gpio-leds";
 
-               rf: rf_green {
+               led_rf: rf_green {
                        label = "ubnt:green:rf";
                        gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
                };
index fcd17b8d13f1c596c5e62f559accbe6076a0a8b6..a2d3a99430511a14fb9d9112afe548e1781bf5de 100644 (file)
@@ -11,9 +11,9 @@
        model = "Buffalo WHR-G301N";
 
        aliases {
-               led-boot = &diag;
-               led-failsafe = &diag;
-               led-upgrade = &diag;
+               led-boot = &led_diag;
+               led-failsafe = &led_diag;
+               led-upgrade = &led_diag;
        };
 
        keys {
@@ -50,7 +50,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_pins>;
@@ -60,7 +60,7 @@
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
-               diag: diag {
+               led_diag: diag {
                        label = "whr-g301n:red:diag";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 5660ea5cafcf11ac53aa36f3c15a2d94ecb30bf7..c231f4721cfde1c1a8196db1fb8a22dd925df069 100644 (file)
        };
 
        aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth1;
        };
 
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
+               led_power_amber: power_amber {
                        label = "netgear:amber:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 4bff7c8b78f3cb61f2b3022cfd4c0cf31c9d7fe9..4ce7a0ec3d71c9372bce9fdb89d79f23477fe5fa 100644 (file)
@@ -8,10 +8,10 @@
 
 / {
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth1;
        };
 
@@ -33,7 +33,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins &clks_disable_pins>;
 
-               power: power {
+               led_power: power {
                        label = "netgear:green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
@@ -57,7 +57,7 @@
        ath9k-leds {
                compatible = "gpio-leds";
 
-               wlan: wlan {
+               wlan {
                        label = "netgear:green:wlan";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
@@ -67,6 +67,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index b017aa35972ea6b0aa8740998bab9664d89b26db..147fcad66639eb5edb628fd0943ebb2f2799da70 100644 (file)
@@ -32,7 +32,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_pins>;
@@ -86,6 +86,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index deb031b353a1208dfaebfcbbc75db744e411b16d..4d080c82f815b12c626bc8ffa90a20f21872c7d2 100644 (file)
        };
 
        aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth1;
        };
 
        ath9k-leds {
                compatible = "gpio-leds";
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&ath9k 3 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
+               led_power_amber: power_amber {
                        label = "netgear:amber:power";
                        gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 1ce4d1183512c8c6327ad71783c962a71e790192..4c5ae697d6a4ae36bcd07235bdf54bfdaf4aba5f 100644 (file)
        };
 
        aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth1;
        };
 
        ath9k-leds {
                compatible = "gpio-leds";
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&ath9k 2 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
+               led_power_amber: power_amber {
                        label = "netgear:amber:power";
                        gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
index 536f49b83580e0141868727737dbbb3cbb1e6233..09a239f67ee30072937aee266d0b518b1b87fb7f 100644 (file)
@@ -32,7 +32,7 @@
                };
        };
 
-       gpio_leds: gpio-leds {
+       leds: leds {
                compatible = "gpio-leds";
 
                led_system: system {
@@ -49,6 +49,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 04403637b625565837a47338915057ade70bffbe..9d4f3f20273ff78ab970651d7ea5a6fd32f55fb1 100644 (file)
@@ -15,7 +15,7 @@
        };
 };
 
-&gpio_leds {
+&leds {
        led3g {
                label = "tp-link:green:3g";
                gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
index 162b5f283898763b8ba87245be51f177207fc531..64833bf2c9943fb426174056111f3222afb0eadd 100644 (file)
@@ -36,7 +36,7 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
 
                led_system: system {
@@ -95,6 +95,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index f12d4341c64a233cc3b8e1f6f9249316310fb1d0..03306de5d942263d184e97a3df16752cb6689d7e 100644 (file)
@@ -8,17 +8,17 @@
        model = "Ubiquiti AirRouter";
 
        aliases {
-               led-boot = &globe;
-               led-failsafe = &globe;
-               led-running = &globe;
-               led-upgrade = &globe;
+               led-boot = &led_globe;
+               led-failsafe = &led_globe;
+               led-running = &led_globe;
+               led-upgrade = &led_globe;
                label-mac-device = &wifi;
        };
 
        airrouter-leds {
                compatible = "gpio-leds";
 
-               globe: globe {
+               led_globe: globe {
                        label = "ubnt:green:globe";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
index 25e3fe027829766ef48de4248875ba8e6e452c45..3e73eba9ed1b6788bca2bb5fecfb2a95fdced686 100644 (file)
        model = "Ubiquiti UniFi AP";
 
        aliases {
-               led-boot = &dome_green;
-               led-failsafe = &dome_green;
-               led-running = &dome_green;
-               led-upgrade = &dome_green;
+               led-boot = &led_dome_green;
+               led-failsafe = &led_dome_green;
+               led-running = &led_dome_green;
+               led-upgrade = &led_dome_green;
                label-mac-device = &wifi;
        };
 
 
        leds {
                compatible = "gpio-leds";
-               dome_green: dome-green {
+
+               led_dome_green: dome_green {
                        label = "ubnt:green:dome";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                };
 
-               dome-orange {
+               dome_orange {
                        label = "ubnt:orange:dome";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
@@ -58,6 +59,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 787a01771ed96a0e6a2dd9e0e1a7180586a5ebab..337da5b4b77eb46760c38d00e1cceac5e94d19c8 100644 (file)
@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "ar7241_ubnt_xm.dtsi"
 
 / {
        aliases {
-               led-boot = &link4;
-               led-failsafe = &link4;
+               led-boot = &led_link4;
+               led-failsafe = &led_link4;
                label-mac-device = &wifi;
        };
 
@@ -29,7 +26,7 @@
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                };
 
-               link4: link4 {
+               led_link4: link4 {
                        label = "ubnt:green:link4";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
index dbf4569980f8df8e13af50541a2a3fde08e8df0d..14c80963d5e6bca1a0dfd81d7a9d9ad74aaf56bf 100644 (file)
        model = "AVM FRITZ!WLAN Repeater 300E";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &ath9k;
        };
 
@@ -32,7 +32,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "fritz300e:green:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -96,6 +96,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index ac3230f37853964959389cd4d0bb85ee3f4cacb2..d62878e508640fe3390930e23623c7a4e6bd6b99 100644 (file)
@@ -8,10 +8,13 @@
        model = "Buffalo BHR-4GRV";
 };
 
-&eth0 {
-       mtd-mac-address = <&art 0x0>;
+&leds {
+       sec_vpn {
+               label = "buffalo:orange:vpn";
+               gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+       };
 };
 
-&sec_vpn {
-       label = "buffalo:orange:vpn";
+&eth0 {
+       mtd-mac-address = <&art 0x0>;
 };
index 3b5a4dd13d6faee868f0d8d5660463d774a0b72d..4a848cb89614965eb50ffb1332cd0143a79eba90 100644 (file)
@@ -8,9 +8,9 @@
 
 / {
        aliases {
-               led-boot = &diag;
-               led-failsafe = &diag;
-               led-upgrade = &diag;
+               led-boot = &led_diag;
+               led-failsafe = &led_diag;
+               led-upgrade = &led_diag;
        };
 
        extosc: ref {
                };
        };
 
-       leds {
+       leds: leds {
                compatible = "gpio-leds";
 
-               sec_vpn: sec_vpn {
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-               };
-
-               diag: diag {
+               led_diag: diag {
                        label = "buffalo:red:diag";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        cs-gpios = <0>, <0>;
        num-cs = <2>;
 
index 8ac4df2194e086ee64d1201e4a82eaa5c2bb4204..e3971d1e956ae145508e9e1afe67062065573e66 100644 (file)
@@ -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 {
@@ -66,7 +66,7 @@
        leds {
                compatible = "gpio-leds";
 
-               diag: diag {
+               led_diag: diag {
                        label = "buffalo:red:diag";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        cs-gpios = <0>, <0>;
        num-cs = <2>;
 
index 37c98604adcbf629b9032ccf6ce41b0924c996dc..16a617a2547cd067966a00f0d9bbba37b53a7d8e 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "ar7242_buffalo_wzr-bhr.dtsi"
 
 / {
        };
 };
 
-&eth0 {
-       mtd-mac-address = <&art 0x1002>;
+&leds {
+       sec_vpn {
+               label = "buffalo:orange:security";
+               gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+       };
 };
 
-&sec_vpn {
-       label = "buffalo:orange:security";
+&eth0 {
+       mtd-mac-address = <&art 0x1002>;
 };
 
 &pcie {
index e683de5aeef31a434778a13be065c95a9dc29494..e6ea8b68e2162be4c254707a629e78820a9a7076 100644 (file)
        model = "TP-Link TL-WR2543N/ND";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_wps;
+               led-failsafe = &led_wps;
+               led-running = &led_wps;
+               led-upgrade = &led_wps;
                label-mac-device = &eth0;
        };
 
@@ -49,7 +49,7 @@
        leds {
                compatible = "gpio-leds";
 
-               system: wps {
+               led_wps: wps {
                        label = "tplink:green:wps";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 2fff08195b12be2f978dbe843604f0c0dbe2f40d..804b71170ee8e4ebffa1d198b956927100f65a79 100644 (file)
        model = "TP-Link TL-WA901ND v2";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -45,7 +45,7 @@
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
@@ -73,6 +73,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index 88b9d36a2d6d6d2a9d3e3f295f1a235d72696484..3728b682c820b0a6b025d4ff85f119c9ff960dac 100644 (file)
        model = "TP-Link TL-WR1043ND v1";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -44,6 +44,7 @@
 
        leds {
                compatible = "gpio-leds";
+
                usb {
                        label = "tp-link:green:usb";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
@@ -51,7 +52,7 @@
                        linux,default-trigger = "usbport";
                };
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index a8433532f1780f7b5e495c95b5bbfa0d14251721..70754c905edb5d4e9bfc5594e2f4177f34ba94c8 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &wlan;
-               led-failsafe = &wlan;
-               led-upgrade = &wlan;
+               led-boot = &led_wlan;
+               led-failsafe = &led_wlan;
+               led-upgrade = &led_wlan;
                label-mac-device = &eth0;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               wlan: wlan {
+               led_wlan: wlan {
                        label = "gl-ar150:orange:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
 };
 
 &spi {
-       num-chipselects = <1>;
        status = "okay";
 
+       num-chipselects = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <104000000>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&art 0x0>;
 };
index ffb28c7417edadd39e61ff1a9178603b7de91021..92484f9331d4504b2f4faa3eb1160893098326f8 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &wlan;
-               led-failsafe = &wlan;
-               led-upgrade = &wlan;
+               led-boot = &led_wlan;
+               led-failsafe = &led_wlan;
+               led-upgrade = &led_wlan;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               wlan: wlan {
+               led_wlan: wlan {
                        label = "air-pen:blue:wlan";
                        gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
 };
 
 &spi {
-       num-cs = <1>;
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <104000000>;
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&art 0x2>;
 };
index 82e6f74074b88af9c4af835c505141c72c8975ab..971d158faf94be4924ab5f69c9dd32dc5d6b67e4 100644 (file)
@@ -12,9 +12,9 @@
 
        aliases {
                label-mac-device = &wmac;
-               led-boot = &vpn;
-               led-failsafe = &vpn;
-               led-upgrade = &vpn;
+               led-boot = &led_vpn;
+               led-failsafe = &led_vpn;
+               led-upgrade = &led_vpn;
                serial0 = &uart;
        };
 
@@ -42,7 +42,7 @@
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
-               vpn: vpn {
+               led_vpn: vpn {
                        label = "ap121f:green:vpn";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
@@ -57,6 +57,7 @@
 
 &eth0 {
        status = "okay";
+
        mtd-mac-address = <&art 0x0>;
 
        gmac-config {
@@ -68,6 +69,7 @@
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
@@ -77,6 +79,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
index 639c6523d62a686e3ca6e6994f9446752405d22f..3489a972d4e74aedc75082a87889dc2b19eb50e8 100644 (file)
        compatible = "embeddedwireless,dorin", "qca,ar9331";
 
        aliases {
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &status;
-               led-upgrade = &status;
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
                serial0 = &uart;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status: status {
+               led_status: status {
                        label = "dorin:green:status";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 };
 
 &spi {
-       num-chipselects = <1>;
        status = "okay";
 
+       num-chipselects = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <104000000>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
index 0d8c4defa82273f20800da14371922dadbb86b8f..9b222904e14fd376d4f36f5d0fbb8e150104295f 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_wps;
+               led-failsafe = &led_wps;
+               led-running = &led_wps;
+               led-upgrade = &led_wps;
                label-mac-device = &eth0;
        };
 
@@ -33,7 +33,7 @@
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                };
 
-               system: wps {
+               led_wps: wps {
                        label = "tp-link:green:wps";
                        gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
                };
 };
 
 &spi {
-       num-chipselects = <1>;
        status = "okay";
 
+       num-chipselects = <1>;
+
        /* Spansion S25FL032PIF SPI flash */
        flash@0 {
                compatible = "jedec,spi-nor";
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index 005e263894588fd89448d0b64ecc01fbeb3e7564..e8a3dfbce798b6e13bf61443996fcd0cc28d2cf3 100644 (file)
@@ -18,6 +18,7 @@
 
        leds {
                compatible = "gpio-leds";
+
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_disable_pins>;
 
 };
 
 &spi {
-       num-chipselects = <1>;
        status = "okay";
 
+       num-chipselects = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                spi-max-frequency = <104000000>;
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index c4ec8a840e2ed474b6a040abf71256ac0394dd75..a8e0331f088b44a5ac47d749879a3640f4715d6b 100644 (file)
@@ -9,10 +9,10 @@
 / {
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -30,7 +30,7 @@
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tl-wr703n:blue:system";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
@@ -47,6 +47,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
@@ -65,7 +66,7 @@
                                read-only;
                        };
 
-                       firmware: partition@20000 {
+                       partition@20000 {
                                compatible = "tplink,firmware";
                                reg = <0x20000 0x3d0000>;
                                label = "firmware";
@@ -95,6 +96,7 @@
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
 
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index c9be157cc966352ba3f95c7e620823b0672fe6c0..4fb06494a4c229b63b2f8944d3429ffd891ff8e1 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &wmac;
        };
 
@@ -39,6 +39,7 @@
 
        leds {
                compatible = "gpio-leds";
+
                pinctrl-names = "default";
                pinctrl-0 = <&switch_led_disable_pins>;
 
@@ -67,7 +68,7 @@
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                };
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
@@ -87,6 +88,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index a6348d4cbad57b5e0d0786ba6b716e2c1d767782..222516f9b7927f9aa142e7f84622ff01aa47e244 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &status;
-               led-upgrade = &status;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        keys {
@@ -42,7 +42,7 @@
        leds {
                compatible = "gpio-leds";
 
-               status: power {
+               led_power: power {
                        label = "pcs:amber:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index 8029de549581002eae33a4f6f4c2e5bef4cc4cd2..46b6053cce49045786e962ba6224f7bbfa4574f3 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &wifi;
-               led-failsafe = &wifi;
-               led-running = &wifi;
-               led-upgrade = &wifi;
+               led-boot = &led_wifi;
+               led-failsafe = &led_wifi;
+               led-running = &led_wifi;
+               led-upgrade = &led_wifi;
        };
 
        i2c {
@@ -89,7 +89,7 @@
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
-               wifi: wifi {
+               led_wifi: wifi {
                        label = "wmb001n:blue:wifi";
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
                };
index 5dbcac34af96cfa2e9a7c30e720389853f70145c..f99b6da67e7447edfc56c20f80370d12f3a69adf 100644 (file)
@@ -9,10 +9,10 @@
 / {
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &wmac;
        };
 
@@ -33,7 +33,7 @@
        leds: leds {
                compatible = "gpio-leds";
 
-               system: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index 86a316b5182e477afbd67c425afc7d594cbced45..d9b0ee86f501f50ae0926f5a659d40840546de60 100644 (file)
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index 5daa06711b36b45a9e6639c9fb50985a95404e10..1ced60d5fd19981be484742e42c6f22460bac716 100644 (file)
        model = "I-O DATA ETG3-R";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "etg3-r:green:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 };
 
 &spi {
-       num-cs = <1>;
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index 24fe34b3a77bc92bcb8910c444f382e89825b4a6..3232db981ba8e20d87ad4bbd2c6a863a15d4879d 100644 (file)
        model = "Ubiquiti Networks XW board";
 
        aliases {
-               led-boot = &system;
-               led-running = &system;
-               led-upgrade = &system;
-               led-failsafe = &system;
+               led-boot = &led_link4;
+               led-running = &led_link4;
+               led-upgrade = &led_link4;
+               led-failsafe = &led_link4;
                label-mac-device = &wmac;
        };
 
@@ -35,7 +35,7 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               system: link4 {
+               led_link4: link4 {
                        label = "ubnt:green:link4";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
index f96fe4114500fb2c6d2a75655a6209678cb21cb5..ede248759b3852832699171baa7deae38467696e 100644 (file)
        model = "Aerohive HiveAP 121";
 
        aliases {
-               led-boot = &power_white;
-               led-failsafe = &power_orange;
-               led-running = &power_white;
-               led-upgrade = &power_orange;
+               led-boot = &led_power_white;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_white;
+               led-upgrade = &led_power_orange;
                label-mac-device = &eth0;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power_orange: power_orange {
+               led_power_orange: power_orange {
                        label = "hiveap-121:orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               power_white: power_white {
+               led_power_white: power_white {
                        label = "hiveap-121:white:power";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 33c117b2f4a0b970ac913ab573343d9d1f84d571..66ac718264bcbac02905aae46d037be7b64afe88 100644 (file)
@@ -12,9 +12,9 @@
 
        aliases {
                serial0 = &uart;
-               led-boot = &wan;
-               led-failsafe = &wan;
-               led-upgrade = &wan;
+               led-boot = &led_wan;
+               led-failsafe = &led_wan;
+               led-upgrade = &led_wan;
                label-mac-device = &eth0;
        };
 
@@ -24,7 +24,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_rssimediumhigh_pin>;
 
-               wan: wan {
+               led_wan: wan {
                        label = "cf-e120a-v3:green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 };
 
 &pinmux {
-               led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin {
-                       pinctrl-single,bits = <0x10 0x0 0xff>;
-               };
+       led_rssimediumhigh_pin: pinmux_rssimediumhigh_pin {
+               pinctrl-single,bits = <0x10 0x0 0xff>;
+       };
 };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
@@ -93,7 +94,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot:  partition@0 {
+                       partition@0 {
                                label = "u-boot";
                                reg = <0x000000 0x010000>;
                                read-only;
                                read-only;
                        };
 
-                       firmware: partition@20000 {
+                       partition@20000 {
                                compatible = "denx,uimage";
                                label = "firmware";
                                reg = <0x020000 0x7d0000>;
                        };
 
-                       nvram: partition@7f0000 {
+                       partition@7f0000 {
                                label = "nvram";
                                reg = <0x7f0000 0x010000>;
                                read-only;
index f060e29eef52546a288af4730c5a3d09adce75aa..882ec5e13adf0dbb3b54ad98aade8876718154ea 100644 (file)
@@ -8,10 +8,10 @@
        compatible = "dlink,dir-825-c1", "qca,ar9344";
 
        aliases {
-               led-boot = &orange_power;
-               led-failsafe = &orange_power;
-               led-running = &blue_power;
-               led-upgrade = &orange_power;
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_blue;
+               led-upgrade = &led_power_orange;
                serial0 = &uart;
        };
 
                pinctrl-names = "default";
                pinctrl-0 = <&enable_gpio_11>;
 
-               blue_power: blue_power {
+               led_power_blue: power_blue {
                        label = "d-link:blue:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
-               blue_usb {
+               usb {
                        label = "d-link:blue:usb";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
                        trigger-sources = <&hub_port1>;
                };
 
-               blue_wan {
+               wan_blue {
                        label = "d-link:blue:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
-               blue_wlan2g {
+               wlan2g {
                        label = "d-link:blue:wlan2g";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               blue_wps {
+               wps {
                        label = "d-link:blue:wps";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               orange_power: orange_power {
+               led_power_orange: power_orange {
                        label = "d-link:orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               orange_wan {
+               wan_orange {
                        label = "d-link:orange:wan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
@@ -63,7 +63,7 @@
        leds-ath9k {
                compatible = "gpio-leds";
 
-               blue_wlan5g {
+               wlan5g {
                        label = "d-link:blue:wlan5g";
                        gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
index 29f30028b2708d17c5d375cab2aceabe7783b1a6..48853a270a992d62a0cea5a9ab6f20ad56d7492b 100644 (file)
@@ -8,37 +8,37 @@
        compatible = "dlink,dir-835-a1", "qca,ar9344";
 
        aliases {
-               led-boot = &orange_power;
-               led-failsafe = &orange_power;
-               led-running = &green_power;
-               led-upgrade = &orange_power;
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_orange;
                serial0 = &uart;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               green_power: green_power {
+               led_power_green: power_green {
                        label = "d-link:green:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
 
-               green_wan {
+               wan_green {
                        label = "d-link:green:wan";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                };
 
-               green_wps {
+               wps {
                        label = "d-link:green:wps";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               orange_power: orange_power {
+               led_power_orange: power_orange {
                        label = "d-link:orange:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               orange_wan {
+               wan_orange {
                        label = "d-link:orange:wan";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
index c2c395e8cf1bcd135e4e5f95abf73b0388a3de05..08cd84e51e6d8b6f075dd23f00d8017309b8b6ba 100644 (file)
        };
 
        aliases {
-               led-boot = &power_amber;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth0;
        };
 
                pinctrl-names = "default";
                pinctrl-0 = <&enable_gpio_11>;
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
+               led_power_amber: power_amber {
                        label = "netgear:amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
index 9e3177acae5db3cfd9639fb59efc3715d19f0de8..e7186425f398145e25245db872b8dee037956c2c 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds {
@@ -36,7 +36,7 @@
                        linux,default-trigger = "phy0tpt";
                };
 
-               system: system {
+               led_system: system {
                        label = "raccoon:blue:sys";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index 390beebab570cf6072627f5879dc5e9364e15976..50a069cb6368b81cec40f8d9d96124488319d49b 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &running;
-               led-upgrade = &status;
+               led-boot = &led_power_amber;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
        };
 
        keys {
        leds {
                compatible = "gpio-leds";
 
-               status: power_amber {
+               led_power_amber: power_amber {
                        label = "pcs:amber:power";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               running: power_green {
+               led_power_green: power_green {
                        label = "pcs:green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index 65891010994ef76998e2d88882ee3ac43d443c14..a43ac4e93577d07a849404824e85b49e0ccafa44 100644 (file)
 
        aliases {
                serial0 = &uart;
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &status;
-               led-upgrade = &status;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        keys {
@@ -42,7 +42,7 @@
        leds {
                compatible = "gpio-leds";
 
-               status: power {
+               led_power: power {
                        label = "pcs:amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>,
                                <&gpio 4 GPIO_ACTIVE_LOW>;
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index e1ffc29e831c3f57547d79482f8d50671a68cd51..ff96401afc5e82b7866818d83c87016efa172390 100644 (file)
@@ -5,10 +5,10 @@
 
 / {
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds {
@@ -34,7 +34,7 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               system: link4 {
+               led_system: link4 {
                        label = "tp-link:green:link4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
index eaf0acc1645714373be0c0e5db4ef4e7d5b9937e..2b0f52cf4f330d32e0453fb20206a3c9d9929fe8 100644 (file)
@@ -8,15 +8,15 @@
        compatible = "tplink,cpe610-v1", "qca,ar9344";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-upgrade = &system;
+               led-boot = &led_lan;
+               led-failsafe = &led_lan;
+               led-upgrade = &led_lan;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: lan {
+               led_lan: lan {
                        label = "tp-link:green:lan";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
@@ -40,5 +40,6 @@
 
 &eth1 {
        status = "okay";
+
        compatible = "syscon", "simple-mfd";
 };
index 9ef7906365b767972dd61e07c646a2cdaa017809..124f4d50b2a930d8d3bc72092a96a33655c4ee92 100644 (file)
@@ -7,10 +7,10 @@
 
 / {
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds: leds {
@@ -22,7 +22,7 @@
                        linux,default-trigger = "phy0tpt";
                };
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
index a9f7e6e9a35342060aac25ab301b04bf9689a875..48dcf1230577d1706af971b7cc5d3ec5e10a5c28 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
@@ -39,7 +39,7 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
-               power: power {
+               led_power: power {
                        label = "mynet-n750:blue:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
                };
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
 
 &mdio0 {
        status = "okay";
+
        phy-mask = <0>;
 
        switch0@1f {
index 49c6784151824c36ac4b61903d65bc241508d637..3df601a73abd7bd640b607c635c3d3103a056d26 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "mynet-wifi-rangeextender:blue:power";
                        gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
                        /* LED has no off state. It's either on or it blinks */
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = /* "s25fl064k", */ "jedec,spi-nor";
                reg = <0>;
index b29dc173dee0d4705df4d9d253acbec8ec96e284..433a7e9c5f3057309f6d225d270395a0e0f683cf 100644 (file)
@@ -12,9 +12,9 @@
 
        aliases {
                serial0 = &uart;
-               led-boot = &rssihigh;
-               led-failsafe = &rssihigh;
-               led-upgrade = &rssihigh;
+               led-boot = &led_rssihigh;
+               led-failsafe = &led_rssihigh;
+               led-upgrade = &led_rssihigh;
                label-mac-device = &eth1;
        };
 
@@ -53,7 +53,7 @@
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               rssihigh: rssihigh {
+               led_rssihigh: rssihigh {
                        label = "cf-e313ac:green:rssihigh";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
index fa98f752387446dc004c63c6ce14964f26a10d7b..192b7112a9b43460f3660f25f0a3a7663a69c083 100644 (file)
@@ -12,9 +12,9 @@
 
        aliases {
                serial0 = &uart;
-               led-boot = &system;
-               led-failsafe = &system;
-               led-upgrade = &system;
+               led-boot = &led_rssihigh;
+               led-failsafe = &led_rssihigh;
+               led-upgrade = &led_rssihigh;
        };
 
        leds {
@@ -48,7 +48,7 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               system: rssihigh {
+               led_rssihigh: rssihigh {
                        label = "cf-e314n-v2:green:signal4";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
index 2ece81e0c99b89ff4411b30b740139d2f862775e..242dccdcf912dc3c287f49090bea9e4d3307330d 100644 (file)
        compatible = "engenius,ews511ap", "qca,qca9531";
        model = "EnGenius EWS511AP";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        keys {
                compatible = "gpio-keys";
 
                };
        };
 
-       aliases {
-               led-boot = &power_led;
-               led-failsafe = &power_led;
-               led-running = &power_led;
-               led-upgrade = &power_led;
-       };
-
        leds {
                compatible = "gpio-leds";
 
-               power_led: power {
+               led_power: power {
                        label = "ews511ap:amber:power";
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -91,6 +91,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <0>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy4>;
 };
 
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
index e6b5be924436adb0035efc2ab1473189ba633fde..130944f4f5ca33ef9e84616b54ffdbf83379eb5d 100644 (file)
        model = "TP-Link Archer D50 v1";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &wmac;
        };
 
@@ -64,7 +64,7 @@
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               system: system {
+               led_system: system {
                        label = "tp-link:white:system";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy4>;
 
        mtd-mac-address = <&romfile 0xf100>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&romfile 0xf100>;
 };
index 7d77352f84626b831d7f6d652569bc1c5108e873..eccfc4860d35203a8796ab3f46e6de41fb3edcc1 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca953x_tplink_tl-wr810n.dtsi"
 
 / {
index da5b6dc7db2b286f9b80082dbec1543b6d6a22b1..1caae75f1d4f5f6a6051ac16d8b688798f3eb13f 100644 (file)
        compatible = "yuncore,a770", "qca,qca9531";
 
        aliases {
-               led-boot = &status;
-               led-failsafe = &status;
-               led-running = &status;
-               led-upgrade = &status;
+               led-boot = &led_status;
+               led-failsafe = &led_status;
+               led-running = &led_status;
+               led-upgrade = &led_status;
        };
 
        chosen {
@@ -40,7 +40,7 @@
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
-               status: status {
+               led_status: status {
                        label = "a770:green:status";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
index d6eef42f3f5e3eb59efd7c27aabeba09329c1815..0d01342685f8895ad3a8100da512ad5593653651 100644 (file)
@@ -12,9 +12,9 @@
 
        aliases {
                serial0 = &uart;
-               led-boot = &wan;
-               led-failsafe = &wan;
-               led-upgrade = &wan;
+               led-boot = &led_wan;
+               led-failsafe = &led_wan;
+               led-upgrade = &led_wan;
        };
 
        leds {
@@ -23,7 +23,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&jtag_disable_pins &led_rssilow_pin &led_rssimediumhigh_pin &led_rssihigh_pin>;
 
-               wan: wan {
+               led_wan: wan {
                        label = "cf-e110n-v2:green:wan";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
@@ -92,6 +92,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        mtd-mac-address = <&art 0x0>;
        phy-handle = <&swphy4>;
 };
 
 &eth1 {
        status = "okay";
+
        mtd-mac-address = <&art 0x1002>;
 
        gmac-config {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&art 0x6>;
 };
index dc8d92e0b92813e80289dc07016d7e2e55ac6a84..5b273d4737ee1c323a6403d09de4361416b1ec08 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -42,7 +42,7 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
-               system: link4 {
+               led_system: link4 {
                        label = "tp-link:green:link4";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
index a98228d358550a52abbb6d3fcbc75d3f860ee2b8..497fdd6bab1adb49db9555df63efcd076f7ed66d 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca953x_tplink_tl-wr810n.dtsi"
 
 / {
index 2a4d0a1921f25115ad60caa7a5ef407a0532d876..9d6a32352d9950f2771110432333d402e5f31223 100644 (file)
@@ -8,9 +8,9 @@
        model = "TP-Link TL-WR841N/ND v10";
 
        aliases {
-               led-boot = &qss_led;
-               led-failsafe = &qss_led;
-               led-running = &qss_led;
-               led-upgrade = &qss_led;
+               led-boot = &led_qss;
+               led-failsafe = &led_qss;
+               led-running = &led_qss;
+               led-upgrade = &led_qss;
        };
 };
index 8ee7d149b9ef7a0297daa370cf96baedbad492e1..ca9598100840cd13691000a892cd70f1a50b3657 100644 (file)
@@ -5,15 +5,15 @@
 
 / {
        aliases {
-               led-boot = &system_led;
-               led-failsafe = &system_led;
-               led-running = &system_led;
-               led-upgrade = &system_led;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 };
 
-&gpio_leds {
-       system_led: system {
+&leds {
+       led_system: system {
                label = "tp-link:green:system";
                gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
        };
index d8c4546f494665e994dd008003e5805fda3bd81f..6de3ab36be1477e19000b5a0a5698aa2355f0f33 100644 (file)
@@ -8,9 +8,9 @@
        model = "TP-Link TL-WR841N/ND v9";
 
        aliases {
-               led-boot = &qss_led;
-               led-failsafe = &qss_led;
-               led-running = &qss_led;
-               led-upgrade = &qss_led;
+               led-boot = &led_qss;
+               led-failsafe = &led_qss;
+               led-running = &led_qss;
+               led-upgrade = &led_qss;
        };
 };
index 61777027ede72d8428a695a90bb143833b0f5eb6..e3d244ee7b1d17bea5ebc436a3688eab6322def3 100644 (file)
@@ -15,7 +15,7 @@
                label-mac-device = &wmac;
        };
 
-       gpio_leds: leds {
+       leds: leds {
                compatible = "gpio-leds";
 
                wifi {
@@ -24,7 +24,7 @@
                        linux,default-trigger = "phy0tpt";
                };
 
-               qss_led: qss {
+               led_qss: qss {
                        label = "tp-link:green:qss";
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
@@ -80,6 +80,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy4>;
 
        mtd-mac-address = <&uboot 0x1fc00>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index 7f2fd4103ac7cfd9fb70261753b8565fcca4b5fb..497b0cd26cf3375083415de026d40b769762bf67 100644 (file)
        model = "TP-Link TL-WR842N v3";
 
        aliases {
-               led-boot = &power_led;
-               led-failsafe = &power_led;
-               led-running = &power_led;
-               led-upgrade = &power_led;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth1;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
-               power_led: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy4>;
 
        mtd-mac-address = <&uboot 0x1fc00>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index 649e538fc03523d59d136e7c918c3dcbac62cadf..c5fd7166a075e202f2b2e03a86f798ea5b22f3e5 100644 (file)
@@ -19,7 +19,7 @@
                label-mac-device = &eth1;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
                led_system: system {
@@ -62,6 +62,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &eth0 {
        status = "okay";
+
        phy-handle = <&swphy4>;
 
        mtd-mac-address = <&uboot 0x1fc00>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index fc5df53fa974dd71c24a33d1791f887733ff14b5..be1ebac41d4df52b3290827639afa260b44f86c5 100644 (file)
        model = "Buffalo BHR-4GRV2";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        chosen {
@@ -24,7 +24,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "bhr-4grv2:green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -68,6 +68,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 0f7838fd56dd651f8084bb6609d5b0665556cb4c..970a144dbc6087242c6cac6e0f8689c4c7c1281c 100644 (file)
@@ -8,10 +8,10 @@
 
 / {
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        chosen {
@@ -21,7 +21,7 @@
        leds: leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "iodata:green:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -94,6 +94,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
index 3bca23cc57a2592f411d1a7e7a33e2632b565b3c..4828a5e0f531462d3ee6b2faeff22932ac7ffebc 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1200e";
 
        aliases {
-               led-boot = &status_blue;
-               led-failsafe = &status_red;
-               led-running = &status_blue;
-               led-upgrade = &status_red;
+               led-boot = &led_status_blue;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_red;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status_blue: status_blue {
+               led_status_blue: status_blue {
                        label = "dvl1200e:blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               status_red: status_red {
+               led_status_red: status_red {
                        label = "dvl1200e:red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index a844ce777ce170a433b7ff42c10dfb6f17a77050..61e6a665b92012b773e500daffc4370875c0d5c2 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1200i";
 
        aliases {
-               led-boot = &status_blue;
-               led-failsafe = &status_red;
-               led-running = &status_blue;
-               led-upgrade = &status_red;
+               led-boot = &led_status_blue;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_red;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status_blue: status_blue {
+               led_status_blue: status_blue {
                        label = "dvl1200i:blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               status_red: status_red {
+               led_status_red: status_red {
                        label = "dvl1200i:red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index 567f3c9ee48333138faf52d9b5fdb6d4bbf3b16e..bd57f34e530e5982fbde536f25e86593eea3713b 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1750c";
 
        aliases {
-               led-boot = &status_blue;
-               led-failsafe = &status_red;
-               led-running = &status_blue;
-               led-upgrade = &status_red;
+               led-boot = &led_status_blue;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_red;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status_blue: status_blue {
+               led_status_blue: status_blue {
                        label = "dvl1750c:blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               status_red: status_red {
+               led_status_red: status_red {
                        label = "dvl1750c:red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index 3d25004c401b604b8e929d776fd3f1efb4e2be40..9e50d9ffe8e040f0115ffe130775fb43f21c2abf 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1750e";
 
        aliases {
-               led-boot = &status_blue;
-               led-failsafe = &status_red;
-               led-running = &status_blue;
-               led-upgrade = &status_red;
+               led-boot = &led_status_blue;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_red;
        };
 
        keys {
        leds {
                compatible = "gpio-leds";
 
-               status_blue: status_blue {
+               led_status_blue: status_blue {
                        label = "dvl1750e:blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               status_red: status_red {
+               led_status_red: status_red {
                        label = "dvl1750e:red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index e0bdd209374a6a20a869c91c5c63c0fde3a56fd3..c088a0b6f580b96dd799692c0ea43c119e9679ec 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1750i";
 
        aliases {
-               led-boot = &status_blue;
-               led-failsafe = &status_red;
-               led-running = &status_blue;
-               led-upgrade = &status_red;
+               led-boot = &led_status_blue;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_blue;
+               led-upgrade = &led_status_red;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status_blue: status_blue {
+               led_status_blue: status_blue {
                        label = "dvl1750i:blue:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               status_red: status_red {
+               led_status_red: status_red {
                        label = "dvl1750i:red:status";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index d0d678d0bf0df6646fe15f6f092cdee267eb9ba8..2263292e44265bf36044d743b794aecf25180464 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_devolo_dvl1xxx.dtsi"
 
 / {
        model = "devolo WiFi pro 1750x";
 
        aliases {
-               led-boot = &status_red;
-               led-failsafe = &status_red;
-               led-running = &status_red;
-               led-upgrade = &status_red;
+               led-boot = &led_status_red;
+               led-failsafe = &led_status_red;
+               led-running = &led_status_red;
+               led-upgrade = &led_status_red;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               status_red: status_red {
+               led_status_red: status_red {
                        /* This LED is not visible on the external casing. */
                        label = "dvl1750x:red:status";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
index cfd43c8e8a2328c841bb893bdae9b5bab18b18bb..ea752661bae9584783558044813be4f9fd358f97 100644 (file)
@@ -56,6 +56,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 &eth1 {
        mtd-mac-address = <&art 0x00>;
        mtd-mac-address-increment = <1>;
+
        phy-handle = <&phy1>;
        pll-data = <0x03000101 0x00000101 0x00001313>;
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&art 0x00>;
        mtd-mac-address-increment = <(-2)>;
index 65be14ffd7ff164107a6b3b3fd1c5101e914d45a..7953ed132539fbb989a320b6705caf02e3bb3512 100644 (file)
        };
 
        aliases {
-               led-boot = &power_orange;
-               led-failsafe = &power_orange;
-               led-running = &power_orange;
-               led-upgrade = &power_orange;
+               led-boot = &led_power_orange;
+               led-failsafe = &led_power_orange;
+               led-running = &led_power_orange;
+               led-upgrade = &led_power_orange;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power_orange: power_orange {
+               led_power_orange: power_orange {
                        label = "ecb1750:orange:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -69,6 +69,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 9545a85d62f474ddb873651120b59113b449dd26..72179f1da0cc4d70e3e68f841e0251663e812f71 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "epg5000:amber:power";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index 4862083f706ecae4f5cac1abadb9c4f01f4228c3..8d3d5c58a6b51e659a2702cf81b15d7566246c78 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "librerouter-v1:green:system";
                        gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 6a7154f78cc13bf129557d690d47491513b1de1b..170563b6a7563dc088941fcd9f970b8c593442dd 100644 (file)
        };
 
        aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_amber;
-               led-running = &power_green;
-               led-upgrade = &power_amber;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_amber;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_amber;
                label-mac-device = &eth0;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "netgear:green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
-               power_amber: power_amber {
+               led_power_amber: power_amber {
                        label = "netgear:amber:power";
                        gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index b110929eacc4988fdbca391d06ec5c52934954ba..5e3abdbbb8ec2688b2570fd36f2009a923908f96 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -43,7 +43,7 @@
                        linux,default-trigger = "phy0tpt";
                };
 
-               system: system {
+               led_system: system {
                        label = "koala:blue:sys";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
index 05368bd7df842be313bfe7c33104e2de5d1ccb4d..960d80eee27a0952d659e5b1945bcda96f6ad28c 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_tplink_archer-c7.dtsi"
 
 / {
@@ -11,7 +8,7 @@
        model = "TP-Link Archer C5 v1";
 };
 
-&gpio_keys {
+&keys {
        rfkill {
                gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_RFKILL>;
@@ -20,7 +17,7 @@
        };
 };
 
-&gpio_leds {
+&leds {
        wlan5g {
                label = "tp-link:green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 };
 
 &mtdparts {
-       uboot: u-boot@0 {
+       uboot: partition@0 {
+               label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       firmware@20000 {
+       partition@20000 {
+               label = "firmware";
                reg = <0x020000 0xfd0000>;
                compatible = "tplink,firmware";
        };
 
-       art: art@ff0000 {
+       art: partition@ff0000 {
+               label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
        };
index c26695d24817f429f54c6ae61917c3b8ea2de5a7..fda519439ab7064fada283336a393088434273c0 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_tplink_archer-c7.dtsi"
 
 / {
@@ -11,7 +8,7 @@
        model = "TP-Link Archer C7 v1";
 };
 
-&gpio_keys {
+&keys {
        rfkill {
                gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_RFKILL>;
@@ -20,7 +17,7 @@
        };
 };
 
-&gpio_leds {
+&leds {
        wlan5g {
                label = "tp-link:green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 };
 
 &mtdparts {
-       uboot: u-boot@0 {
+       uboot: partition@0 {
+               label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       firmware@20000 {
+       partition@20000 {
+               label = "firmware";
                compatible = "tplink,firmware";
                reg = <0x020000 0x7d0000>;
        };
 
-       art: art@7f0000 {
+       art: partition@7f0000 {
+               label = "art";
                reg = <0x7f0000 0x010000>;
                read-only;
        };
index afc1b14b8a4d35963e19929f35af22218017485a..7cdfa56dfd3bfc1609cd9a460a9ced725ea7eaaa 100644 (file)
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 #include "qca9558_tplink_archer-c7.dtsi"
 
 / {
@@ -11,7 +8,7 @@
        model = "TP-Link Archer C7 v2";
 };
 
-&gpio_keys {
+&keys {
        rfkill {
                gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                linux,code = <KEY_RFKILL>;
@@ -20,7 +17,7 @@
        };
 };
 
-&gpio_leds {
+&leds {
        wlan5g {
                label = "tp-link:green:wlan5g";
                gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 };
 
 &mtdparts {
-       uboot: u-boot@0 {
+       uboot: partition@0 {
+               label = "u-boot";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       firmware@20000 {
+       partition@20000 {
+               label = "firmware";
                reg = <0x020000 0xfd0000>;
                compatible = "tplink,firmware";
        };
 
-       art: art@ff0000 {
+       art: partition@ff0000 {
+               label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
        };
index c77613dad610f526555ab147cf171078f6359691..3defa554de1520a97fbd12051c714199cd7a2a39 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth1;
        };
 
-       gpio_leds: leds {
+       leds: leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -42,7 +42,7 @@
                        linux,default-trigger = "usbport";
                };
 
-               led_wlan2g: wlan2g {
+               wlan2g {
                        label = "tp-link:green:wlan2g";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
@@ -54,7 +54,7 @@
                };
        };
 
-       gpio_keys: keys {
+       keys: keys {
                compatible = "gpio-keys";
 
                reset {
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
 };
index 056b513d7e0451ba72626ea4b94b77feb0f9e8ac..a78a9d5be137f0191939c5ed05b23b9e4030fdc5 100644 (file)
        compatible = "tplink,re350k-v1", "qca,qca9558";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                mdio-gpio0 = &mdio2;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               wlan2g-green {
+               wlan2g_green {
                        label = "tp-link:green:wlan2g";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
-               wlan2g-red {
+               wlan2g_red {
                        label = "tp-link:red:wlan2g";
                        gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
                };
 
-               wlan5g-green {
+               wlan5g_green {
                        label = "tp-link:green:wlan5g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               wlan5g-red {
+               wlan5g_red {
                        label = "tp-link:red:wlan5g";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
                };
index 77166b8bfeb18b76a2f716d299538a79af8dacdc..f32e9ff12543efe67d767ed9bc28972112e25485 100644 (file)
@@ -22,7 +22,7 @@
                label-mac-device = &eth1;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
                led_system: system {
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&uboot 0x1fc00>;
        mtd-mac-address-increment = <(-1)>;
index 1092250f02ab3504053eb062c4092b004f2d9b38..4c3a3230fe0c7a1e92903657d97b27ee05a9c93d 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &wmac;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
index 89887465dcc70873f3ddb8fad1df4d65bfd0fbff..4bacf4723fdd0afe3803d689df5dd55f58c3f23b 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_green;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
        };
 
        leds {
@@ -29,7 +29,7 @@
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               system: power_green {
+               led_power_green: power_green {
                        label = "trendnet:green:power";
                        gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       uboot:  partition@0 {
+                       partition@0 {
                                label = "u-boot";
                                reg = <0x000000 0x030000>;
                                read-only;
                                read-only;
                        };
 
-                       mac: partition@fe0000 {
+                       partition@fe0000 {
                                label = "mac";
                                reg = <0xfe0000 0x010000>;
                                read-only;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
index 3e373928da74d650d222755b36615f20256d0563..d81d9c54f59caf9cc9a2a6578c5c02921eba8709 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "nbg6716:white:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 5a850c7064066fd7c82f03a4ebc99c6ce4fbe07f..2bb135eaff8daedc1a135edbea99194ea00bfdcd 100644 (file)
        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 {
@@ -50,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";
@@ -77,7 +77,7 @@
                        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>;
                };
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
index 794ac24ed8fca5b4754837e4e6983a3420d9e229..351e37519d13235cd4a8eda0664e8fc9b41a63bb 100644 (file)
                bootargs = "console=ttyS0,115200n8";
        };
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+               label-mac-device = &eth0;
+       };
+
        led_spi {
                compatible = "spi-gpio";
                #address-cells = <1>;
                };
        };
 
-       aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
-               label-mac-device = &eth0;
-       };
-
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 };
 
 &eth0 {
+       status = "okay";
+
        phy-mode = "mii";
        phy-handle = <&swphy4>;
 
-       status = "okay";
        mtd-mac-address = <&info 0x8>;
 };
 
 &eth1 {
        status = "okay";
+
        mtd-mac-address = <&info 0x8>;
        mtd-mac-address-increment = <1>;
 };
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };
index ddf92108b56c793d11287db8a1f57f903e004ece..26cc9ec2e8b5d0b56ac42feae895fbb5e2a5e40b 100644 (file)
@@ -9,10 +9,10 @@
        compatible = "tplink,archer-c5x", "qca,qca9560";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth1;
        };
 
@@ -43,7 +43,7 @@
        leds: leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&led_gpio 0 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index 3c974e01095a8e83672a97273d09313a9a6e9dae..21a470961f65a47b303414d446d2830d37fd1d07 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth0;
        };
 
@@ -38,7 +38,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index 971c56792442c7d0133e1c10d66cb46b48e8e6d0..4df4e8a96903edf293fcf61765a9dc6c4b580cff 100644 (file)
@@ -8,10 +8,10 @@
        model = "D-Link DIR-842 C1";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
@@ -22,7 +22,7 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               power: power {
+               led_power: power {
                        label = "dir-842-c1:green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index 9d70dd9be7883e3b71fda4a728d128b1400a4bbc..b86ea29a993c5ebb00e5f9c875dfa84ec6fa25a9 100644 (file)
@@ -8,10 +8,10 @@
        model = "D-Link DIR-842 C2";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
@@ -22,7 +22,7 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               power: power {
+               led_power: power {
                        label = "dir-842-c2:green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index 2a15176a8a595ba53cff24d6137b90eb0f335ae5..205fd8f60e745164ed499989ff4c1e42affc97b4 100644 (file)
@@ -8,10 +8,10 @@
        model = "D-Link DIR-842 C3";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds {
@@ -22,7 +22,7 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               power: power {
+               led_power: power {
                        label = "dir-842-c3:green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
index a17d9f263a11a8215512758cca498c71148005c7..9fe5cb0af9b434d3f250ea3e2dc308f3f60802e3 100644 (file)
        compatible = "dlink,dir-859-a1", "qca,qca9563";
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        chosen {
@@ -29,7 +29,7 @@
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               power: power {
+               led_power: power {
                        label = "dir-859-a1:green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                };
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
index 978fa6af57c955545600b34e6f10404236577d43..0152f62cd8a244d51303b21017e1389cdbd6d53b 100644 (file)
@@ -12,7 +12,7 @@
 };
 
 &leds {
-       power: power {
+       led_power: power {
                label = "elecom:blue:power";
                gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                default-state = "on";
index 778e0fd52ec19b9bf690b38696d0b4ad45d1a933..7ebd15342cf6c725e9669b4a90f4f45ff5443ba0 100644 (file)
@@ -12,7 +12,7 @@
 };
 
 &leds {
-       power: power {
+       led_power: power {
                label = "elecom:white:power";
                gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
                default-state = "on";
index 2f5c2c4aac8a6a36102bd3d5781993ca831e415d..028c1747d28e200dd64575c1eb629f0c7e4dee6c 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        leds: leds {
index dc3ea24ae644c048f848d366e69d6a143f949aa7..3f9a091824879271768acee15d2e9561292eaf83 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
        };
 
        keys {
@@ -44,7 +44,7 @@
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "gl-ar750s:green:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
@@ -86,6 +86,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <0>;
 
        flash@0 {
 
 &mdio0 {
        status = "okay";
+
        phy-mask = <0>;
 
        phy0: ethernet-phy@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
index 8c356bd7542ca5bf38ae4fc9bf51df066e878c5f..68b10647b9789ae6d4909a2cf4818a7cc78491e8 100644 (file)
        };
 
        aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_red;
-               led-running = &power_green;
-               led-upgrade = &power_green;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_red;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
        };
 
        leds {
                compatible = "gpio-leds";
                /* other LEDs are connected to ath10k (QCA9888) gpiochip */
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "wg1200cr:green:power";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        default-state = "on";
                };
 
-               power_red: power_red {
+               led_power_red: power_red {
                        label = "wg1200cr:red:power";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                };
@@ -74,6 +74,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        qca,no-eeprom;
 };
index 9cba99b6a6eb1523be81c6065c1cdb2d8e41c96b..2efedcffec66012b0b8bd3efc9712d76cb6a25c5 100644 (file)
        };
 
        aliases {
-               led-boot = &power_green;
-               led-failsafe = &power_red;
-               led-running = &power_green;
-               led-upgrade = &power_green;
+               led-boot = &led_power_green;
+               led-failsafe = &led_power_red;
+               led-running = &led_power_green;
+               led-upgrade = &led_power_green;
        };
 
        leds {
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
-               power_red: power_red {
+               led_power_red: power_red {
                        label = "wg800hp:red:power";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
 
-               power_green: power_green {
+               led_power_green: power_green {
                        label = "wg800hp:green:power";
                        gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index faa8105e8c1847e259119f76252f280145e192be..028324410fbe5cb840e00a2b9e565504e4653499 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "wr818:red:system";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 };
 
 &spi {
-       num-cs = <1>;
-
        status = "okay";
 
+       num-cs = <1>;
+
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
 };
 
index 42db1d7a24923687badb3976ad0822a709a81210..db6e5fb7f3100ecdecfd25e80c42bd3b9598efbe 100644 (file)
@@ -8,7 +8,7 @@
        model = "TP-Link Archer A7 v5";
 };
 
-&gpio_keys {
+&keys {
        reset {
                label = "Reset button";
                linux,code = <KEY_RESTART>;
 };
 
 &mtdparts {
-       factory-uboot@0 {
+       partition@0 {
                label = "factory-uboot";
                reg = <0x000000 0x020000>;
                read-only;
        };
 
-       uboot: u-boot@20000 {
+       uboot: partition@20000 {
                label = "u-boot";
                reg = <0x020000 0x020000>;
                read-only;
        };
 
-       firmware@40000 {
+       partition@40000 {
                label = "firmware";
                reg = <0x040000 0xec0000>;
                compatible = "denx,uimage";
        };
 
-       info: info@f40000 {
+       info: partition@f40000 {
                label = "info";
                reg = <0xf40000 0x020000>;
                read-only;
        };
 
-       config: config@f60000 {
+       config: partition@f60000 {
                label = "config";
                reg = <0xf60000 0x050000>;
                read-only;
@@ -54,7 +54,7 @@
                read-only;
        };
 
-       art: art@ff0000 {
+       art: partition@ff0000 {
                label = "art";
                reg = <0xff0000 0x010000>;
                read-only;
index 782a581acaf69a65861feef8ec7b1d34ecddbb39..7852bed1f3994a7e5dcca397cc308b531bb075c8 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };
index 470a8e6bf9ae2e2e30db4df2d98c8c808df5d802..dcdd7bcf3c26e014f11801b772c6fc9a55842308 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
@@ -61,7 +61,7 @@
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };
index efe83cd5ee5d343a7b27085987d3930d88cc91a8..7e735adbd382522a71e7560a64574cd71f234b5d 100644 (file)
@@ -8,7 +8,7 @@
        model = "TP-Link Archer C7 v5";
 };
 
-&gpio_keys {
+&keys {
        reset {
                label = "Reset button";
                linux,code = <KEY_RESTART>;
index 2ed5e0ceb408ffc07a229ca564a74c4f49dea1d3..f1a1f5673d43985249047a58a766e42e4cce36a9 100644 (file)
        };
 
        aliases {
-               led-boot = &power;
-               led-failsafe = &power;
-               led-running = &power;
-               led-upgrade = &power;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                label-mac-device = &eth0;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               power: power {
+               led_power: power {
                        label = "tp-link:green:power";
                        gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -94,6 +94,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
index 2e66e0f03e6270ad0c4cebb020d0fa72710a85fe..3049c8bc2080358bed02ac7765107d8f6718bd75 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &eth0;
        };
 
-       gpio_leds: leds {
+       leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        default-state = "on";
@@ -41,7 +41,7 @@
                        linux,default-trigger = "phy0tpt";
                };
 
-               led_wlan2g: wlan2g {
+               wlan2g {
                        label = "tp-link:green:wlan2g";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
@@ -83,7 +83,7 @@
                };
        };
 
-       gpio_keys: keys {
+       keys: keys {
                compatible = "gpio-keys";
 
                wps {
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };
index 36e5ef81db7da8bc8b0733faf7d6e3887548b2be..464be7344981469450b96302614dfe6e05d14d80 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
                mdio-gpio0 = &mdio2;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: power {
+               led_power: power {
                        label = "tp-link:blue:power";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
index d21bee6970108f062becd0eadb656436e834a60d..ba56cf23b8001caf9e129882599234f16adccc00 100644 (file)
        };
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
                label-mac-device = &wmac;
        };
 
-       gpio_leds: leds {
+       leds: leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:green:system";
                        gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "heartbeat";
 
 &wmac {
        status = "okay";
+
        mtd-cal-data = <&art 0x1000>;
        mtd-mac-address = <&info 0x8>;
 };
index 07a7409886d4c69356bf59bf1ffc4d00cdee6973..9e220539dbc73b8aff387595b0fef594771097c2 100644 (file)
@@ -21,6 +21,7 @@
 
 &spi {
        status = "okay";
+
        num-cs = <1>;
 
        flash@0 {
@@ -78,7 +79,7 @@
        };
 };
 
-&gpio_leds {
+&leds {
        usb {
                label = "tp-link:green:usb";
                gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
index 5027dc3c47522be8626a105fcf30044f4700ab2f..f5543e4f89d811f5d37f71bf584de665f2ab7c24 100644 (file)
@@ -5,16 +5,16 @@
 
 / {
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:blue:system";
                        gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
                        default-state = "on";
index a8dff14b8fab97a4477f5863375ce9c479f96324..54e3555306108f470f68ce2b1d345ed0416d93f7 100644 (file)
@@ -8,16 +8,16 @@
        model = "TP-Link TL-WR940N v4";
 
        aliases {
-               led-boot = &system;
-               led-failsafe = &system;
-               led-running = &system;
-               led-upgrade = &system;
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        leds {
                compatible = "gpio-leds";
 
-               system: system {
+               led_system: system {
                        label = "tp-link:blue:system";
                        gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                        default-state = "on";