ath79: move usb led trigger node to SoC dtsi

These frequently used usb led triggers are universal. They should be
moved to SoC dtsi.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index d91ef91ebd2c2ce7f118ed52baad72d12e2a4763..a03f282a0f10bd9b6c24739d6c83cb64ba00a518 100644 (file)
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -156,6 +156,11 @@
 
                #address-cells = <1>;
                #size-cells = <0>;
+
+               usb_ehci_port: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        usb1: usb@1c000000 {
@@ -172,6 +177,11 @@
 
                #address-cells = <1>;
                #size-cells = <0>;
+
+               usb_ohci_port: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        spi: spi@1f000000 {

diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index 4fe8d51a00f8d9449c54f82f1290ef4496452be9..6e1ba2d47e4c5ddc9e893e2e4a01fc61d33bef65 100644 (file)
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -170,25 +170,11 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
index fb5ab1adcb784a72ffed1ba5b67b85b5717083c7..6934a8f952bec892801ce7c0ee6f58a7d9f478ce 100644 (file)
--- a/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
+++ b/target/linux/ath79/dts/ar7161_dlink_dir-825-b1.dts
@@ -122,25 +122,11 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
index d3d22b5d2dfa99c99d0e52ce2112b55464e1ed20..296ecc8c4e08fc41013076a031668ffb6381bf7f 100644 (file)
--- a/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr.dtsi
@@ -116,25 +116,11 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &pcie0 {

diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
index b12723beb2fe9695b11e2eccc831f42ecb93d189..ef4b0323778310c10efb18893daa62a6d029477e 100644 (file)
--- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
+++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
@@ -99,22 +99,8 @@
 
 &usb1 {
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       usb_ohci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb2 {
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       usb_ehci_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 425d75f0d7c763aaf5542ef8f806de79711f1cb3..afbae33a803dade7cd6564c5788fa9cbc1f70773 100644 (file)
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -32,6 +32,11 @@
 
                #address-cells = <1>;
                #size-cells = <0>;
+
+               hub_port: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index ff7a61f92142038e81923c9321df81b323802b26..8d0e60da4024e38c771b74fb9b1dc32904c55d13 100644 (file)
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -39,6 +39,11 @@
 
                #address-cells = <1>;
                #size-cells = <0>;
+
+               hub_port: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
index 6119af4a03c1b7445068e2475c28e6d5ca4e07a1..e17a485396ff2c7bc6537a406699e9491bc8a1ce 100644 (file)
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -183,12 +183,5 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
index 218ea5e4296c3f8adc63418abf4ea0978cf64047..a4bda13bced327cfb1df64859cf18d147e0509d2 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3x20.dtsi
@@ -25,14 +25,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
index df77ca0fdc0bf3c0e64bbfac176a1448d75e0d8f..6ee7d9ec4f9959e6f64d1aead1768e1875f19e3d 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -78,14 +78,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi
index eda1b16309ed3bc1b1e89ead4c667e36e5cbb8c1..96b04426145e0b46e486f9192f4f6d2f3cd54072 100644 (file)
--- a/target/linux/ath79/dts/ar7242.dtsi
+++ b/target/linux/ath79/dts/ar7242.dtsi
@@ -39,6 +39,11 @@
 
                #address-cells = <1>;
                #size-cells = <0>;
+
+               hub_port: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
 

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
index e9d1eafe24bcf9d84d3ec241560d9d02897c17a6..15a808ad2ac96617b26c94c9df7ab5260362a0e9 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-bhr.dtsi
@@ -135,12 +135,5 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
index b8aa2aa2102576a0c2e3158a10ec87a1403be6c0..c6fd220ed14aa92cee6e707222a0bcc8c033c76f 100644 (file)
--- a/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
+++ b/target/linux/ath79/dts/ar7242_buffalo_wzr-hp-g302h-a1a0.dts
@@ -210,14 +210,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &art {

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 b524ea19961b99ae3f3a3779d9d0eb140a081557..3acdc9247d86424728e115c857f0a5ecd69e436a 100644 (file)
--- a/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
+++ b/target/linux/ath79/dts/ar7242_tplink_tl-wr2543-v1.dts
@@ -125,14 +125,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index c776c8ef6e783992f4e70ae3b71ff00a5f3fc71c..0268146b061503d1d3b4b2ffebe0816717bfd671 100644 (file)
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -114,14 +114,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &pcie {

diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi
index 29891ccebbafcadd33cb1d3af600ab1761f13793..71181c46de68dd1426a1aa37fc42582ac7e39241 100644 (file)
--- a/target/linux/ath79/dts/ar9132.dtsi
+++ b/target/linux/ath79/dts/ar9132.dtsi
@@ -152,6 +152,14 @@
                        phys = <&usb_phy>;
 
                        status = "disabled";
+
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       hub_port: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                spi: spi@1f000000 {

diff --git a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
index f3b13b5d0cfa3aed518056539c093413fcec9e56..4443ba583e0cbeb4157be0a25f7fe2e8d52d37b7 100644 (file)
--- a/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
+++ b/target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi
@@ -246,14 +246,6 @@
 
 &usb {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

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 7ff2e4f29b9d480668c1d0591b851e16690b4873..6eb2a0acb5f87200db54446b6bfb71a919fc91ff 100644 (file)
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts
@@ -74,14 +74,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 9df80e1d5ee87a1dc492abff61ce9045521a1534..466e0fb25dc5a1e42fa31831313b3cb9f785c190 100644 (file)
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -129,6 +129,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                spi: spi@1f000000 {

diff --git a/target/linux/ath79/dts/ar9331_arduino_yun.dts b/target/linux/ath79/dts/ar9331_arduino_yun.dts
index 389a83dd2282e057a99ea42f4e2099947ba5a74d..bf3a46f96261caa9cdaed270cb16a195f6028b06 100644 (file)
--- a/target/linux/ath79/dts/ar9331_arduino_yun.dts
+++ b/target/linux/ath79/dts/ar9331_arduino_yun.dts
@@ -57,7 +57,7 @@
                usb {
                        label = "white:usb";
                        gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-                       trigger-sources = <&hub_port1>;
+                       trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
        };
@@ -125,22 +125,8 @@
 &usb {
        status = "okay";
 
-       #address-cells = <1>;
-       #size-cells = <0>;
        dr_mode = "host";
        vbus-supply = <&reg_usb_vbus>;
-
-       port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               #trigger-source-cells = <0>;
-
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
-       };
 };
 
 &usb_phy {

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 c420c1a4cd5195dd633ff5846fd548ae52191d5c..c23e5dac5165d1de4da7300e01228ee19f4891fa 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3020-v1.dts
@@ -86,16 +86,9 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        dr_mode = "host";
        vbus-supply = <&reg_usb_vbus>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
index 619fd09ee99443ae9e18338ff52a5a3a4b4be917..b0f24bbfa705d462b3db72aaea9eb55339fd119a 100644 (file)
--- a/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-mr3040-v2.dts
@@ -82,16 +82,9 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        dr_mode = "host";
        vbus-supply = <&reg_usb_vbus>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index f86c4423bf98d7c75908122640dc888f2c61844c..2ccd50d7836a03a70e9788429be8500daa389677 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -82,14 +82,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index 5d20df9261edc6891f155e19e3d16940b6b8b988..0fc34884453fe4dd0d5f925a6c03fd84ea1537fd 100644 (file)
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -83,14 +83,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_atheros_db120.dts b/target/linux/ath79/dts/ar9344_atheros_db120.dts
index 906335ed6fcf9b516124760f0c440c80fabbd288..f0173ebdc798521a8bd2aa6a70f5aa96b72f3936 100644 (file)
--- a/target/linux/ath79/dts/ar9344_atheros_db120.dts
+++ b/target/linux/ath79/dts/ar9344_atheros_db120.dts
@@ -41,7 +41,7 @@
                usb {
                        label = "green:usb";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&hub_port1>;
+                       trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
        };
@@ -219,14 +219,6 @@
 
 &usb {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
index e6f18cea69580e7a4a6b1c2d1560e140f7d89c0f..35d0e26d8530d952b0d90a4149aa3565c977f072 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-825-c1.dts
@@ -28,7 +28,7 @@
                        label = "blue:usb";
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
-                       trigger-sources = <&hub_port1>;
+                       trigger-sources = <&hub_port>;
                };
 
                wan_blue {

diff --git a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
index dded9d665597bbdc55f413e6b21877db956b4c11..33c75f49675eb4ea4b598afa7c6c3bc7d6fa3734 100644 (file)
--- a/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
+++ b/target/linux/ath79/dts/ar9344_dlink_dir-8x5.dtsi
@@ -119,13 +119,6 @@
 
 &usb {
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_netgear_r6100.dts b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
index 80951d62490c7d449bc11ed640358933f5ba30c6..a73ea52de9875d03f09034647bd477bcfdbfcf16 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_r6100.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_r6100.dts
@@ -192,14 +192,6 @@
 
 &usb {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
index 0ca3b761bf1dd37d54b4918edfbbb0ee21cc7e82..bd1eb59f4faba33b68437de92ee23211daa878b9 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
@@ -24,11 +24,4 @@
 
 &usb {
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index d4b198b3f5d1453451dccad638a440ee8ebd5314..b5fef91eacc5f2c88a1e1acb16ac0bd3dba4a8f3 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -106,13 +106,6 @@
 
 &usb {
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
index c989a30b108500a5b91d0512d3ed9aaba4d4c7f4..937095959c9e0a89a365ea70c7f94ff8a6b90ad2 100644 (file)
--- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
@@ -113,29 +113,26 @@
 };
 
 &usb {
+       status = "okay";
+};
+
+&hub_port {
        #address-cells = <1>;
        #size-cells = <0>;
-       status = "okay";
 
        port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
+               compatible = "usb-a-connector";
                reg = <1>;
+       };
 
-               port@1 {
-                       compatible = "usb-a-connector";
-                       reg = <1>;
-               };
-
-               port@3 {
-                       label = "RS-232 serial adapter";
-                       reg = <3>;
-               };
+       port@3 {
+               label = "RS-232 serial adapter";
+               reg = <3>;
+       };
 
-               port@4 {
-                       label = "internal wwan modem";
-                       reg = <4>;
-               };
+       port@4 {
+               label = "internal wwan modem";
+               reg = <4>;
        };
 };
 

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
index 6c5d013ccd61026ea9761d86ab1d96ce442d9535..77f6637188eb9e771881d168395f74992a746b80 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -42,14 +42,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index 546cf49f34ef2a34ffa7f7cd49cce726b6c4a3f8..55ddb741847b77109fd20af9fcf16a4167dff8c5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -53,25 +53,21 @@
 };
 
 &usb {
+       status = "okay";
+};
+
+&hub_port {
        #address-cells = <1>;
        #size-cells = <0>;
-       status = "okay";
 
-       port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
+       hub_port1: port@1 {
                reg = <1>;
                #trigger-source-cells = <0>;
+       };
 
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
-
-               hub_port2: port@2 {
-                       reg = <2>;
-                       #trigger-source-cells = <0>;
-               };
+       hub_port2: port@2 {
+               reg = <2>;
+               #trigger-source-cells = <0>;
        };
 };
 

diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
index f4a18b051f33047c5a549d97cf016fe5993d65af..d18ffff34d03e1a31402dfd263187be8408e2ec4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
+++ b/target/linux/ath79/dts/ar9344_wd_mynet-n750.dts
@@ -69,26 +69,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               #trigger-source-cells = <0>;
-
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
-
-               hub_port2: port@2 {
-                       reg = <2>;
-                       #trigger-source-cells = <0>;
-               };
-       };
 };
 
 &mdio0 {

diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index f27a58b8d7c15a0c6ed8360bfe1165ddcc21aac3..cb595594264a032f0d53d56b6d1cdf174a4b02df 100644 (file)
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -46,7 +46,7 @@
                usb {
                        label = "green:usb";
                        gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
-                       trigger-sources = <&hub_port1>, <&hub_port2>;
+                       trigger-sources = <&hub_port>;
                        linux,default-trigger = "usbport";
                };
 
@@ -150,26 +150,7 @@
 };
 
 &usb {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@1 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               #trigger-source-cells = <0>;
-
-               hub_port1: port@1 {
-                       reg = <1>;
-                       #trigger-source-cells = <0>;
-               };
-
-               hub_port2: port@2 {
-                       reg = <2>;
-                       #trigger-source-cells = <0>;
-               };
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index d88c7bfabc17ced1c211b2a8f9bfa4ae8cb0bd78..94dfde4125a2477344b8e24910b79a5a0a0a98b2 100644 (file)
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -178,6 +178,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                nand: nand@1b000200 {

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index 9704e69211b46a78a0039d6d492b50f9f6f397b9..406985d576f58dc3e61765fe5acd38ea839b9a69 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -111,14 +111,6 @@
 
 &usb0 {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
index d83972525855de2859d50a0da035726a041438d4..17cbe1df142b4b39e25ca62f63e184abdaa9643a 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e5.dts
@@ -62,14 +62,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 477a2bddc6b475f1b2c36c7fa331923a61dc7bcd..75e30ff1b7bb03c60175c2e35095a7f48505b922 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -135,14 +135,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index d64ffa7115d2616e508d6d16e6d1273ce0fd213e..6c89db1b8cc171c908458f483eab3a690d006fe9 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -142,8 +142,6 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        vbus-supply = <&reg_usb_vbus>;
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index 7fd622a8c5f15e6119d30c1ec28cee22a4c3bfa8..0b2030bb49cecf6e335ec1024505279d74694e2d 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -60,14 +60,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
index a4f5fb543b5118a222de031b0aea19f56326a491..f79be8dca54be42ea88842aaa7b17fdd0ed7e770 100644 (file)
--- a/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
+++ b/target/linux/ath79/dts/qca9531_teltonika_rut300.dts
@@ -107,14 +107,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 27b70e082af4a28c315a8af8308689189cd1e4d3..0fc2bd3df82756b2974ba9f54a72a520ff5bbf99 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -178,14 +178,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &romfile {

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index 818ec7769527970feaf38f6660c9b875c7eded5e..e6fb85259612bf73d507ef5979c1bbc4895729b2 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -102,7 +102,7 @@
                usb {
                        label = "green:usb";
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
-                       trigger-sources = <&hub_port>;
+                       trigger-sources = <&hub_port0>;
                        linux,default-trigger = "usbport";
                };
 
@@ -190,14 +190,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index ca7832ebd49a54491f6a85186b6ad063a3a0cbb4..5a990fff0230095d6256f8eb03eb123b1bebfeb0 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -148,14 +148,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 7ce8cd30cdf947c9b720ee25a218560edaffb2d9..09f086b90ddda4c4ff4e60036e4b3188a2da46ed 100644 (file)
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -178,14 +178,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &info {

diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index e171984511dffda9f3fbc5012aeefe70a933c4cf..2d00159909b3007e8733362f671e8b8fd009bb51 100644 (file)
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -71,7 +71,7 @@
                        label = "green:usb";
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "usbport";
-                       trigger-sources = <&hub_port>;
+                       trigger-sources = <&hub_port0>;
                };
        };
 
@@ -95,14 +95,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy {

diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index c155e3419f328cea64a19fafeb0b20fcf68f2ffe..4300c741adbf41cff1e1c137f53d20797d16fc0c 100644 (file)
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -206,6 +206,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port0: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                spi: spi@1f000000 {

diff --git a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
index 2724c3a1b67dd451ebfe5a5e3cb1ac14f3da03ca..a81687469285ec51f3599411d77dcb9a807579f3 100644 (file)
--- a/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
+++ b/target/linux/ath79/dts/qca9557_8dev_rambutan.dts
@@ -110,9 +110,6 @@
 
 &usb0 {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
 };
 
 &usb_phy1 {
@@ -121,9 +118,6 @@
 
 &usb1 {
        status = "okay";
-
-       #address-cells = <1>;
-       #size-cells = <0>;
 };
 
 &art {

diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index 23fe321efbf9c2dad27af9110a82640ebb938526..72e52129a4cf08bf200fc193439276fc181de7bb 100644 (file)
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -104,14 +104,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
index 5b3318b8b280e00d5da851598888c154c017d646..976ac551f72ff0b9fa2bcaa7427e2afb0d69ea99 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -76,14 +76,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -91,14 +84,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index a9c03b7edae0fcc591273f3c80e924a710905b18..b3447f8be368b144ba56da4c4de9b2ff421bef31 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -84,8 +84,6 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
 };
 
@@ -94,8 +92,6 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
 };
 

diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
index eee3e39bc3c471447e06a33c69bdec0203a24b8a..01a69fce15de0a84bc306a28f2914c3d68b34a86 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
+++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts
@@ -136,8 +136,6 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
 };
 

diff --git a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
index c9f3aefbbfb9b6324b58e4376512bec730ba588a..3d38ca79fe4e3d4b8ff1a83fa67badfa651d3ef8 100644 (file)
--- a/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
+++ b/target/linux/ath79/dts/qca9558_sophos_ap.dtsi
@@ -169,9 +169,4 @@
 
 &usb0 {
        vbus-supply = <&reg_usb_vbus>;
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
index f629838f1ae2a0bdf2e436ae9706af0350d63bff..221582e66db2e37ab26ab5d1b9b714549112b345 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
@@ -85,14 +85,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -100,14 +93,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
index f9e8adcc9eb6c9da6ba1749704ab8dc338b3d88a..c4d910bf1e0f914e8783970465f3c74f9653e138 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi
@@ -141,16 +141,9 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        dr_mode = "host";
        vbus-supply = <&reg_usb0_vbus>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -158,14 +151,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        dr_mode = "host";
        vbus-supply = <&reg_usb1_vbus>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index 49c0e394929ea48cb66cac96981dc89ac41becde..c6b9b077da29cf85966a4bd0c29af9f8c040f29a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -109,14 +109,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -124,14 +117,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index ff7ea7da039ba0a5c601af23c665a33fed7bb0f0..52996bba34767de00457e99d8c3d6000e6933700 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -77,14 +77,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
index 22569bfc1d0503bbca78da53a6e577f73badc9f9..176fe97cc0a96e0054063af93d3cfdff79e14370 100644 (file)
--- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
+++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts
@@ -72,14 +72,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -87,14 +80,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index 0541c4e373197d4c0b9ee86eb3968e6f5b8b75ed..e7daa9d827b5d2da0339b14a173d6ba9fbb2572c 100644 (file)
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -268,6 +268,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port0: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                usb1: usb@1b400000 {
@@ -289,6 +294,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port1: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                nand: nand@1b800200 {

diff --git a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
index 9e1ce89c464b5e0179159f0e7efb7a75cda48b23..7de1c4fa69602cde06d5c7d20a93469231f34409 100644 (file)
--- a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
+++ b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi
@@ -116,19 +116,8 @@
 
 &usb0 {
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
-
 };
 
 &usb1 {
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
index c385eb1592564934180cc2b35362252591534c98..f05a290d2f8945f33af817e7f58a714c3d0ad6d6 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v1.dts
@@ -16,19 +16,12 @@
                label = "green:usb";
                gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "usbport";
-               trigger-sources = <&hub_port>;
+               trigger-sources = <&hub_port0>;
        };
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy0 {

diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
index 5a277723e3ad051d08225cd26c1704e95fed51e5..4be23ffbc02f7b6f4c434a51fe773961111c2935 100644 (file)
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c59-v2.dts
@@ -16,19 +16,12 @@
                label = "green:usb";
                gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
                linux,default-trigger = "usbport";
-               trigger-sources = <&hub_port>;
+               trigger-sources = <&hub_port0>;
        };
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy0 {

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
index 0fdabb6f19c2904664a53df45d24ba0ea0eaa1ab..726eae5b29c00abdce3ec6b8a9fb16d389ee9b2b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr.dtsi
@@ -235,14 +235,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &caldata {

diff --git a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
index 6e25215501c5996e2fa775b932c0605d46d13c05..4c33c0197ffd56350360cc70fb5f0fbf83f5419e 100644 (file)
--- a/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
+++ b/target/linux/ath79/dts/qca9563_netgear_wndr4500-v3.dts
@@ -28,12 +28,5 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };

diff --git a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
index 8902e1726ccc864828c3849be380206310eade1f..c6c610dbee2749a7171985895977be600449941f 100644 (file)
--- a/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
+++ b/target/linux/ath79/dts/qca9563_qxwlan_e1700ac.dtsi
@@ -125,14 +125,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {

diff --git a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
index c80e1c9d7ad4349b30dc1a6196f20be2cdc5166a..c73d5a6e58305a3f08d4357b99c949bcd3d282bc 100644 (file)
--- a/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
+++ b/target/linux/ath79/dts/qca9563_rosinson_wr818.dts
@@ -123,14 +123,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -138,14 +131,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       port@2 {
-               reg = <2>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &info {

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
index 2fdce55d0e7539d61ad5cc8d71682b0a27928532..3c6b8c4fb9468a601a1d677b4c9d6dae61fb13fc 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-c7-v4.dts
@@ -152,14 +152,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &usb_phy1 {
@@ -167,14 +160,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port1: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

diff --git a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
index fd0f10ff27e0bda54529acb3d75b407a7a95c4ab..f6a959903fb91635f558f97d1c379a8d2e69927e 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_archer-x7-v5.dtsi
@@ -108,14 +108,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &spi {

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 bf01f06de695727a653ad8ca5085c8c21069e9f6..80a63f6efc0c6a3547392c44a379d75412a46350 100644 (file)
--- a/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_tl-wr1043nd-v4.dts
@@ -94,14 +94,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index 0ebd5ff5be5d2beb286c26577f2472f00d295253..e46f0676e282fbf365555636e0e9d830e87cffcd 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -204,6 +204,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port0: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                usb1: usb@1b400000 {
@@ -226,6 +231,11 @@
 
                        #address-cells = <1>;
                        #size-cells = <0>;
+
+                       hub_port1: port@1 {
+                               reg = <1>;
+                               #trigger-source-cells = <0>;
+                       };
                };
 
                spi: spi@1f000000 {

diff --git a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
index 9af119b560536e19d6d691443ed029c94011fb76..ef0ea321e07ed4fc97ddc4f5973396a0f363d362 100644 (file)
--- a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
+++ b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
@@ -227,14 +227,7 @@
 };
 
 &usb0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       hub_port0: port@1 {
-               reg = <1>;
-               #trigger-source-cells = <0>;
-       };
 };
 
 &wmac {