ramips: simplify status for ehci/ohci on mt7628 TP-Link devices

At the moment, ehci/ohci is enabled in mt7628an SoC DTSI, then
disabled in the TP-Link-specific DTSI files, and finally enabled
again in the DTS files of the devices needing it.

This on-off-on scheme is hard to grasp on a quick look. Thus, this
patch drops the status in the TP-Link-specific DTSI files, having
the TP-Link devices treated like the rest of mt7628an DTSes, i.e.
ehci/ohci is enabled by default and needs to be disabled explicitly
where needed.

Signed-off-by: Adrian Schmutzler <[email protected]>

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index 7f7e5ac8b44b1245976416146595e3a4fd17dd49..b6ce7b1f562dd2a54932f393c889b1bec7ef5a76 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -72,14 +72,6 @@
        };
 };
 
-&ehci {
-       status = "disabled";
-};
-
-&ohci {
-       status = "disabled";
-};
-
 &wmac {
        status = "okay";
        mtd-mac-address = <&rom 0xf100>;

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index b134badb158721a669c0081eef5dd04c08f96a1f..2faf8a87fe0cee81af5b33989e5f0f3e2876acf4 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -53,14 +53,6 @@
        };
 };
 
-&ehci {
-       status = "disabled";
-};
-
-&ohci {
-       status = "disabled";
-};
-
 &wmac {
        status = "okay";
        mtd-mac-address = <&factory 0xf100>;

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index f6321bb15f976647f0748c5993cfc3698f30fcae..58743db6b4d4c88c9162b4efd3164e0c36deb828 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -69,6 +69,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &wmac {
        mtd-mac-address-increment = <(-2)>;
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 7969bfc73382b271c10659ecfd74942cf8f5f274..d76ce34ca9a39b7ef3f203997783369c3413c7fe 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -71,6 +71,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "i2s", "gpio", "refclk", "p0led_an", "p1led_an",

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index ea53870eebfef8c0327425e3d3a66d2dfa2d8669..4966d56a68fe58f74dbb07e8814dacb3daa51dba 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -67,6 +67,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "i2c", "gpio", "p0led_an", "p1led_an", "p2led_an",

diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 4ca0cd61a5b320a1deb11bf9f347d585b89d25c1..11bf903531b0b6b9ef993325a2206a725c686156 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -69,6 +69,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "i2c", "p0led_an", "p1led_an", "p2led_an",

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index 8e602331f356d237e73e5515bb2923b3b55f942f..173b4cddcad1752dcad09b6cc52d368c9b62a074 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -69,14 +69,6 @@
        };
 };
 
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
 &state_default {
        gpio {
                groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
index 787abfad55af2cf67d483dfd789d0dbacc26f3a9..a142be78703e03f82ec31223e3e390220b873ba6 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
@@ -70,14 +70,6 @@
        };
 };
 
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
 &state_default {
        gpio {
                groups = "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "refclk", "uart1", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
index 71e9694dde3c20da1977e011412e651c7886c5c0..7ab19632e8c576bc23774179038e59d20fd0aeaa 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
@@ -70,14 +70,6 @@
        };
 };
 
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
 &state_default {
        gpio {
                groups = "i2c", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "uart1", "wdt";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index 21c09ec5d9f76c9f23d829290bc66ee9d197632f..de9a48445adc00663a5df6557db9ef621cbfd8e7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -58,6 +58,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "p0led_an", "p1led_an", "perst", "refclk",

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index d6077b4c0ed7ecf2515636818e2cbddac155a11d..bce34045c6e0cbec6c8ea943e02e46fdf647c7bb 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -33,6 +33,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "refclk", "wdt";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index f960a0ae8f4854b7066ab19a1110ee49694b5181..8a8ba81ec309c3e0192a44a18dfbcde6cc4dfe21 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -51,6 +51,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index c4c83b854940bd23131be14ee6910b285b9ed0fb..5c7f9836b6a9ae0808658d9d2416a94069fb138c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -77,6 +77,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "gpio", "p0led_an", "p1led_an", "p2led_an", "p3led_an", "p4led_an", "perst", "refclk", "uart1", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index e843672600e1f0173943bd6340456d7eb0ad4ac4..9077ec00cecfba40b35ee73c148dd96d888f47c1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -69,14 +69,6 @@
        };
 };
 
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
 &state_default {
        gpio {
                groups = "i2c", "i2s", "p2led_an", "refclk", "uart1", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
index 1fec73d4dc653a2ebb8d5f19756372bf82933f1e..7abeae9c07b69492b0b04c5ed4ff87af6369b2b6 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts
@@ -54,6 +54,14 @@
        };
 };
 
+&ehci {
+       status = "disabled";
+};
+
+&ohci {
+       status = "disabled";
+};
+
 &state_default {
        gpio {
                groups = "p0led_an", "p2led_an", "perst", "refclk", "wdt", "wled_an";

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index bce394747bb2ca13e2b6792868d22ccaf2c432ca..77a68acf340af5e1c56fffcb115f018295e4dc6b 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -83,14 +83,6 @@
        };
 };
 
-&ehci {
-       status = "okay";
-};
-
-&ohci {
-       status = "okay";
-};
-
 &pcie {
        status = "okay";
 };