From 55ff2951eac8fd86c91b9673395325e393e357ac Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 6 Aug 2018 07:11:13 +0200 Subject: [PATCH] ath79: fix dts warnings Fix all issues found by the devicetree compiler like wrong address/size cells as well as wrong/missing/superfluous unit addresses. Signed-off-by: Mathias Kresin --- .../ath79/dts/ar7161_netgear_wndr3800.dts | 10 ++++--- target/linux/ath79/dts/ar7240.dtsi | 5 ++-- .../ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 6 +---- .../ath79/dts/ar7240_tplink_tl-wr740n-v2.dts | 6 +---- target/linux/ath79/dts/ar7241.dtsi | 5 ++-- target/linux/ath79/dts/ar7241_tplink.dtsi | 6 +---- .../ath79/dts/ar7241_tplink_tl-mr3x20.dtsi | 2 ++ target/linux/ath79/dts/ar7241_ubnt_unifi.dts | 7 +---- target/linux/ath79/dts/ar7241_ubnt_xm.dtsi | 7 +---- .../linux/ath79/dts/ar7242_avm_fritz300e.dts | 6 +---- .../ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts | 6 ++--- .../ath79/dts/ar7242_tplink_tl-wr2543-v1.dts | 10 +++---- .../dts/ar9132_tplink_tl-wr1043nd-v1.dts | 6 ++--- target/linux/ath79/dts/ar9330.dtsi | 6 ++--- .../linux/ath79/dts/ar9330_glinet_ar150.dts | 4 --- .../dts/ar9331_dptechnics_dpt-module.dts | 6 +---- .../linux/ath79/dts/ar9331_dragino_ms14.dts | 8 ++---- .../dts/ar9331_embeddedwireless_dorin.dts | 4 --- .../linux/ath79/dts/ar9331_etactica_eg200.dts | 4 --- target/linux/ath79/dts/ar9331_onion_omega.dts | 6 +---- .../ath79/dts/ar9331_tplink_tl-mr3020-v1.dts | 6 ++--- .../dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi | 4 --- .../dts/ar9331_tplink_tl-wr741nd-v4.dtsi | 4 --- target/linux/ath79/dts/ar9341_pcs_cr3000.dts | 5 +--- target/linux/ath79/dts/ar9344.dtsi | 2 +- .../linux/ath79/dts/ar9344_ocedo_raccoon.dts | 6 +---- target/linux/ath79/dts/ar9344_pcs_cap324.dts | 7 ++--- target/linux/ath79/dts/ar9344_pcs_cr5000.dts | 26 +++++++++---------- .../ath79/dts/ar9344_tplink_tl-wdr4300.dtsi | 11 ++++---- target/linux/ath79/dts/ar934x.dtsi | 5 ++-- target/linux/ath79/dts/qca9533.dtsi | 7 ++--- .../ath79/dts/qca9533_glinet_ar300m.dtsi | 10 +++---- .../ath79/dts/qca9533_glinet_ar300m_nand.dts | 4 --- .../ath79/dts/qca9533_glinet_ar300m_nor.dts | 2 -- .../ath79/dts/qca9533_tplink_tl-wr841.dtsi | 4 --- target/linux/ath79/dts/qca9557.dtsi | 8 +++--- .../ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 6 +---- .../ath79/dts/qca9558_tplink_archer-c7.dtsi | 9 +++---- .../ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 6 ++--- .../linux/ath79/dts/qca9563_phicomm_k2t.dts | 4 --- .../ath79/dts/qca9563_tplink_tl-re450-v2.dts | 4 --- .../ath79/dts/qca9563_tplink_tl-wr1043n.dtsi | 4 --- .../dts/qca9563_tplink_tl-wr1043nd-v4.dts | 2 ++ .../linux/ath79/dts/qca9563_ubnt_unifiac.dtsi | 4 --- target/linux/ath79/dts/qca956x.dtsi | 8 +++--- 45 files changed, 90 insertions(+), 188 deletions(-) diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts index 7529c68be48..8e28c4d90f9 100644 --- a/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts +++ b/target/linux/ath79/dts/ar7161_netgear_wndr3800.dts @@ -72,8 +72,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; wps { @@ -101,6 +99,8 @@ gpio-sck = <&gpio 7 GPIO_ACTIVE_HIGH>; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; phy-mask = <0x10>; @@ -118,6 +118,8 @@ }; &usb1 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; usb_ochi_port: port@1 { @@ -127,6 +129,8 @@ }; &usb2 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; usb_echi_port: port@1 { @@ -148,8 +152,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi index 13112e44a5e..d32960a4986 100644 --- a/target/linux/ath79/dts/ar7240.dtsi +++ b/target/linux/ath79/dts/ar7240.dtsi @@ -40,14 +40,15 @@ builtin_switch: switch0@1f { compatible = "qca,ar8216-builtin"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x1f>; resets = <&rst 8>; reset-names = "switch"; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy4: ethernet-phy@4 { reg = <4>; phy-mode = "mii"; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index edf209053e4..8ee4148ff93 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -16,8 +16,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -64,8 +62,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -117,7 +113,7 @@ &pcie { status = "okay"; - ath9k: wifi@168c,002b { + ath9k: wifi@0,0 { compatible = "pci168c,002b"; reg = <0x0000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts index 8754537754d..90f554df20a 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v2.dts @@ -16,8 +16,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -89,8 +87,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -137,7 +133,7 @@ &pcie { status = "okay"; - ath9k: wifi@168c,002b { + ath9k: wifi@0,0 { compatible = "pci168c,002b"; reg = <0x0000 0 0 0 0>; qca,no-eeprom; diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi index c490476bbd6..2e7c26b8e7a 100644 --- a/target/linux/ath79/dts/ar7241.dtsi +++ b/target/linux/ath79/dts/ar7241.dtsi @@ -59,14 +59,15 @@ builtin_switch: switch0@1f { compatible = "qca,ar8216-builtin"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x1f>; resets = <&rst 8>; reset-names = "switch"; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy4: ethernet-phy@4 { reg = <4>; phy-mode = "mii"; diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi index 6cc515b7cce..ef248793d90 100644 --- a/target/linux/ath79/dts/ar7241_tplink.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink.dtsi @@ -12,8 +12,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -51,8 +49,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -85,7 +81,7 @@ &pcie { status = "okay"; - ath9k: wifi@0 { + ath9k: wifi@0,0 { reg = <0x0000 0 0 0 0>; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi index ad18945af41..4b3b46d8c95 100644 --- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi +++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi @@ -26,6 +26,8 @@ }; &usb { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port: port@1 { diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts index ed6142ef43b..ddddba23e4e 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts @@ -22,9 +22,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; reset { linux,code = ; @@ -60,8 +57,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -111,7 +106,7 @@ &pcie { status = "okay"; - wifi@0 { + wifi@0,0 { reg = <0x0000 0 0 0 0>; qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi index 615e230f929..fddcbe2b163 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi @@ -17,9 +17,6 @@ */ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; reset { linux,code = ; @@ -65,8 +62,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -116,7 +111,7 @@ &pcie { status = "okay"; - wifi@0 { + wifi@0,0 { reg = <0x0000 0 0 0 0>; qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts index 15f1e321c8b..db4bcc6edc0 100644 --- a/target/linux/ath79/dts/ar7242_avm_fritz300e.dts +++ b/target/linux/ath79/dts/ar7242_avm_fritz300e.dts @@ -16,8 +16,6 @@ gpio-keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; wps { @@ -98,8 +96,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -142,7 +138,7 @@ &pcie { status = "okay"; - ath9k: wifi@0 { + ath9k: wifi@0,0 { reg = <0x0000 0 0 0 0>; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts index 27933d5701f..a0a439b0b55 100644 --- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts +++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g450h.dts @@ -12,10 +12,8 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <20>; + usb { linux,code = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; @@ -110,7 +108,7 @@ &pcie { status = "okay"; - wifi@0 { + wifi@0,0 { reg = <0x0000 0 0 0 0>; qca,no-eeprom; }; diff --git a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts index d7bb406ab09..0cd90262b32 100644 --- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts +++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts @@ -26,8 +26,6 @@ gpio-keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -89,6 +87,8 @@ realtek,extif0 = <1 0 1 1 1 1 1 1 2>; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; phy0: ethernet-phy@0 { @@ -107,8 +107,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -143,6 +141,8 @@ }; &usb { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port: port@1 { @@ -158,7 +158,7 @@ &pcie { status = "okay"; - ath9k: wifi@0 { + ath9k: wifi@0,0 { reg = <0x0000 0 0 0 0>; #gpio-cells = <2>; gpio-controller; diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts index d01d2cc716e..58fc8a58329 100644 --- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts +++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts @@ -22,8 +22,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button0 { label = "reset"; @@ -88,6 +86,8 @@ }; &usb { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port: port@1 { @@ -105,8 +105,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi index d50666d2700..01116ff45a5 100644 --- a/target/linux/ath79/dts/ar9330.dtsi +++ b/target/linux/ath79/dts/ar9330.dtsi @@ -174,14 +174,14 @@ builtin_switch: switch0@1f { compatible = "qca,ar8216-builtin"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x1f>; resets = <&rst 8>; reset-names = "switch"; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy4: ethernet-phy@4 { reg = <4>; phy-mode = "mii"; diff --git a/target/linux/ath79/dts/ar9330_glinet_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts index dfaa1b97efa..3b8f7a2324c 100644 --- a/target/linux/ath79/dts/ar9330_glinet_ar150.dts +++ b/target/linux/ath79/dts/ar9330_glinet_ar150.dts @@ -40,8 +40,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; manual { @@ -87,8 +85,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts index 02c15fec17e..4159cb2fb06 100644 --- a/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts +++ b/target/linux/ath79/dts/ar9331_dptechnics_dpt-module.dts @@ -26,11 +26,9 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + button0 { label = "reset"; linux,code = ; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; @@ -65,8 +63,6 @@ /* Winbond 25Q128FVSG SPI flash */ flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "winbond,w25q128", "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_dragino_ms14.dts b/target/linux/ath79/dts/ar9331_dragino_ms14.dts index e266a6cb4fd..963e9f6e192 100644 --- a/target/linux/ath79/dts/ar9331_dragino_ms14.dts +++ b/target/linux/ath79/dts/ar9331_dragino_ms14.dts @@ -44,17 +44,15 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + button0 { label = "jumpstart"; linux,code = ; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; }; - button@1 { + button1 { label = "reset"; linux,code = ; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; @@ -89,8 +87,6 @@ /* Winbond 25Q128BVFG SPI flash */ flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "winbond,w25q128", "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts index a623f0ebb2c..0332ec26560 100644 --- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts +++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts @@ -27,8 +27,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; wps { @@ -67,8 +65,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts index 2dca1bf4269..569ab11e6de 100644 --- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts +++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts @@ -16,8 +16,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <50>; restore { @@ -94,8 +92,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_onion_omega.dts b/target/linux/ath79/dts/ar9331_onion_omega.dts index 834f065fd6d..a93c7d74857 100644 --- a/target/linux/ath79/dts/ar9331_onion_omega.dts +++ b/target/linux/ath79/dts/ar9331_onion_omega.dts @@ -26,11 +26,9 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + button0 { label = "reset"; linux,code = ; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; @@ -65,8 +63,6 @@ /* Winbond 25Q128FVSG SPI flash */ flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "winbond,w25q128", "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts index 684f092b3d1..3045d221968 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts @@ -48,8 +48,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; button0 { label = "reset"; @@ -98,6 +96,8 @@ }; &usb { + #address-cells = <1>; + #size-cells = <0>; dr_mode = "host"; vbus-supply = <®_usb_vbus>; status = "okay"; @@ -118,8 +118,6 @@ /* Spansion S25FL032PIF SPI flash */ flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; reg = <0>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi index 7ab9439d5bd..e061cbe5929 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr703n_tl-mr10u.dtsi @@ -14,8 +14,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -50,8 +48,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi index 9d8c1a022e8..770ab56821c 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi @@ -17,8 +17,6 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -90,8 +88,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts index 33d7e4ff874..dace6c338f1 100644 --- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts +++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts @@ -18,8 +18,7 @@ keys { compatible = "gpio-keys-polled"; poll-interval = <20>; - #address-cells = <1>; - #size-cells = <0>; + pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; @@ -104,8 +103,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/ar9344.dtsi b/target/linux/ath79/dts/ar9344.dtsi index ce73ef58308..117c0b07a72 100644 --- a/target/linux/ath79/dts/ar9344.dtsi +++ b/target/linux/ath79/dts/ar9344.dtsi @@ -13,7 +13,7 @@ }; &rst { - intc2: interrupt-controller@2 { + intc2: interrupt-controller { compatible = "qca,ar9340-intc"; interrupt-parent = <&cpuintc>; diff --git a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts index 01d5dae3073..903044e000a 100644 --- a/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts +++ b/target/linux/ath79/dts/ar9344_ocedo_raccoon.dts @@ -53,8 +53,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -83,8 +81,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -140,7 +136,7 @@ &pcie { status = "okay"; - ath9k: wifi@168c,0030 { + ath9k: wifi@0,0 { compatible = "pci168c,0030"; reg = <0x0000 0 0 0 0>; mtd-mac-address = <&art 0xc>; diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts index 57515981bf9..ada28d634a6 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts @@ -18,8 +18,7 @@ keys { compatible = "gpio-keys-polled"; poll-interval = <20>; - #address-cells = <1>; - #size-cells = <0>; + pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; @@ -93,8 +92,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -133,7 +130,7 @@ &pcie { status = "okay"; - ath9k: wifi@168c,0030 { + ath9k: wifi@0,0 { compatible = "168c,0030"; reg = <0x0000 0 0 0 0>; mtd-mac-address = <&art 0x0>; diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts index cbdcb6da470..7c9103ced3c 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts @@ -15,12 +15,10 @@ led-status = &status; }; - keys { compatible = "gpio-keys-polled"; poll-interval = <20>; - #address-cells = <1>; - #size-cells = <0>; + pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; @@ -83,8 +81,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -122,17 +118,13 @@ &usb { status = "okay"; + #address-cells = <1>; + #size-cells = <0>; - port@1 { + hub_port1: port@1 { reg = <1>; #trigger-source-cells = <0>; - - hub_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; }; - }; &usb_phy { @@ -142,8 +134,9 @@ &pcie { status = "okay"; - ath9k: wifi@168c,0030 { + ath9k: wifi@0,0 { compatible = "pci168c,0030"; + reg = <0x0000 0 0 0 0>; mtd-mac-address = <&art 0x5002>; #gpio-cells = <2>; gpio-controller; @@ -171,6 +164,8 @@ }; ð0 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; /* default for ar934x, except for 1000M */ @@ -188,30 +183,35 @@ port@0 { compatible = "swconfig,port"; + reg = <0>; swconfig,segment = "lan"; swconfig,portmap = <1 1>; }; port@1 { compatible = "swconfig,port"; + reg = <1>; swconfig,segment = "lan"; swconfig,portmap = <2 2>; }; port@2 { compatible = "swconfig,port"; + reg = <2>; swconfig,segment = "lan"; swconfig,portmap = <3 3>; }; port@3 { compatible = "swconfig,port"; + reg = <3>; swconfig,segment = "lan"; swconfig,portmap = <4 4>; }; port@4 { compatible = "swconfig,port"; + reg = <4>; swconfig,segment = "wan"; swconfig,portmap = <5 5>; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi index 558a763747f..d2c88fc935c 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi @@ -65,8 +65,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -85,7 +83,6 @@ gpio-export { compatible = "gpio-export"; - #size-cells = <0>; gpio_usb1_power { gpio-export,name = "tp-link:power:usb1"; @@ -131,8 +128,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -163,9 +158,13 @@ }; &usb { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; port@1 { + #address-cells = <1>; + #size-cells = <0>; reg = <1>; #trigger-source-cells = <0>; @@ -188,7 +187,7 @@ &pcie { status = "okay"; - ath9k: wifi@168c,0033 { + ath9k: wifi@0,0 { compatible = "pci168c,0033"; reg = <0x0000 0 0 0 0>; mtd-mac-address = <&uboot 0x1fc00>; diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi index e05b2957486..3eed4de7993 100644 --- a/target/linux/ath79/dts/ar934x.dtsi +++ b/target/linux/ath79/dts/ar934x.dtsi @@ -217,8 +217,6 @@ builtin_switch: switch0@1f { compatible = "qca,ar8229-builtin"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x1f>; resets = <&rst 8>; @@ -227,6 +225,9 @@ phy4-mii-enable; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy0: ethernet-phy@0 { reg = <0>; phy-mode = "mii"; diff --git a/target/linux/ath79/dts/qca9533.dtsi b/target/linux/ath79/dts/qca9533.dtsi index 1681b31aafa..97179a391e1 100644 --- a/target/linux/ath79/dts/qca9533.dtsi +++ b/target/linux/ath79/dts/qca9533.dtsi @@ -126,7 +126,7 @@ #reset-cells = <1>; - intc2: interrupt-controller@2 { + intc2: interrupt-controller { compatible = "qca,ar9340-intc"; interrupt-parent = <&cpuintc>; @@ -246,8 +246,6 @@ builtin_switch: switch0@1f { compatible = "qca,ar8229-builtin"; - #address-cells = <1>; - #size-cells = <0>; reg = <0x1f>; resets = <&rst 8>; @@ -256,6 +254,9 @@ phy4-mii-enable; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy0: ethernet-phy@0 { reg = <0>; phy-mode = "mii"; diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi b/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi index 9d8dc7829eb..afbb006d6be 100644 --- a/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi +++ b/target/linux/ath79/dts/qca9533_glinet_ar300m.dtsi @@ -11,25 +11,23 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; pinctrl-names = "default"; pinctrl-0 = <&jtag_disable_pins>; - button@0 { + button0 { label = "reset"; linux,code = ; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; - button@1 { + button1 { label = "button right"; linux,code = ; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; - button@3 { + button3 { label = "button left"; linux,code = ; gpios = <&gpio 1 GPIO_ACTIVE_HIGH>; @@ -73,6 +71,8 @@ }; &usb0 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port: port@1 { diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts b/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts index c1c4493a22f..33226b98891 100644 --- a/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts +++ b/target/linux/ath79/dts/qca9533_glinet_ar300m_nand.dts @@ -7,8 +7,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "winbond,w25q128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; @@ -42,8 +40,6 @@ }; flash@1 { - #address-cells = <1>; - #size-cells = <1>; compatible = "spinand,mt29f"; reg = <1>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts b/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts index 59793dc90bc..9357ea66d49 100644 --- a/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts +++ b/target/linux/ath79/dts/qca9533_glinet_ar300m_nor.dts @@ -10,8 +10,6 @@ num-cs = <0>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "winbond,w25q128", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi index 42191253003..7fe17166d34 100644 --- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi +++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi @@ -64,8 +64,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -92,8 +90,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca9557.dtsi index 4f797a55430..c3874bc41e7 100644 --- a/target/linux/ath79/dts/qca9557.dtsi +++ b/target/linux/ath79/dts/qca9557.dtsi @@ -53,7 +53,7 @@ status = "disabled"; }; - usb_phy0: usb-phy@18030000 { + usb_phy0: usb-phy0 { compatible ="qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; reset-names = "usb-phy", "usb-suspend-override"; @@ -64,7 +64,7 @@ status = "disabled"; }; - usb_phy1: usb-phy { + usb_phy1: usb-phy1 { compatible = "qca,qca9550-usb-phy", "qca,ar7200-usb-phy"; reset-names = "usb-phy", "usb-suspend-override"; @@ -137,7 +137,7 @@ #reset-cells = <1>; interrupt-parent = <&cpuintc>; - intc2: interrupt-controller@2 { + intc2: interrupt-controller2 { compatible = "qca,ar9340-intc"; interrupt-parent = <&cpuintc>; @@ -151,7 +151,7 @@ <0x1f0>; /* pcie rc 0 */ }; - intc3: interrupt-controller@3 { + intc3: interrupt-controller3 { compatible = "qca,ar9340-intc"; interrupt-parent = <&cpuintc>; diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts index 5bbbc439b8a..097e44b310a 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts @@ -47,11 +47,9 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + button0 { label = "reset"; linux,code = ; gpios = <&gpio 1 GPIO_ACTIVE_LOW>; @@ -102,8 +100,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi index 6fb25a9d2e4..70c8f63fbbb 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c7.dtsi @@ -56,8 +56,6 @@ gpio_keys: keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -69,7 +67,6 @@ gpio-export { compatible = "gpio-export"; - #size-cells = <0>; gpio_usb1_power { gpio-export,name = "tp-link:power:usb1"; @@ -103,6 +100,8 @@ }; &usb0 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port0: port@1 { @@ -116,6 +115,8 @@ }; &usb1 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port1: port@1 { @@ -129,8 +130,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index a7dd8feb0b7..52041b8d01c 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -48,8 +48,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -91,6 +89,8 @@ }; &usb0 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port0: port@1 { @@ -104,8 +104,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts index 4ff9320d5ca..ca6d4ec883e 100644 --- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts +++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts @@ -42,8 +42,6 @@ keys { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <20>; reset { @@ -72,8 +70,6 @@ status = "okay"; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts b/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts index 646cdf29754..852f1c9784d 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-re450-v2.dts @@ -68,8 +68,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -133,8 +131,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi index fd0c974a54c..056fe4eccc5 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043n.dtsi @@ -76,8 +76,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -119,8 +117,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts index 5f48e6a5d1f..ec10f085dd4 100644 --- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts @@ -26,6 +26,8 @@ }; &usb0 { + #address-cells = <1>; + #size-cells = <0>; status = "okay"; hub_port0: port@1 { diff --git a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi index 381575c9478..0b7acde4579 100644 --- a/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi +++ b/target/linux/ath79/dts/qca9563_ubnt_unifiac.dtsi @@ -31,8 +31,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; reset { label = "Reset button"; @@ -60,8 +58,6 @@ num-cs = <1>; flash@0 { - #address-cells = <1>; - #size-cells = <1>; compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi index d3a6df9ea91..10c88eedc24 100644 --- a/target/linux/ath79/dts/qca956x.dtsi +++ b/target/linux/ath79/dts/qca956x.dtsi @@ -114,7 +114,7 @@ #reset-cells = <1>; interrupt-parent = <&cpuintc>; - intc3: interrupt-controller@3 { + intc3: interrupt-controller { compatible = "qca,ar9340-intc"; interrupt-parent = <&cpuintc>; @@ -271,9 +271,6 @@ builtin_switch: switch0@1f { compatible = "qca,ar8229-builtin"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x1f>; resets = <&rst 8>; reset-names = "switch"; @@ -281,6 +278,9 @@ phy4-mii-enable; mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + swphy0: ethernet-phy@0 { reg = <0>; phy-mode = "mii"; -- 2.30.2