From e6a181dceafbe2043931f6a048a40a4ed277537a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 1 Dec 2020 14:48:41 +0100 Subject: [PATCH] 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 --- .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 8 -------- target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 8 -------- target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-wr850n-v2.dts | 8 ++++++++ target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 8 -------- 16 files changed, 72 insertions(+), 56 deletions(-) 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 7f7e5ac8b44b..b6ce7b1f562d 100644 --- 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 b134badb1587..2faf8a87fe0c 100644 --- 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 f6321bb15f97..58743db6b4d4 100644 --- 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 7969bfc73382..d76ce34ca9a3 100644 --- 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 ea53870eebfe..4966d56a68fe 100644 --- 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 4ca0cd61a5b3..11bf903531b0 100644 --- 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 8e602331f356..173b4cddcad1 100644 --- 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 787abfad55af..a142be78703e 100644 --- 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 71e9694dde3c..7ab19632e8c5 100644 --- 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 21c09ec5d9f7..de9a48445adc 100644 --- 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 d6077b4c0ed7..bce34045c6e0 100644 --- 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 f960a0ae8f48..8a8ba81ec309 100644 --- 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 c4c83b854940..5c7f9836b6a9 100644 --- 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 e843672600e1..9077ec00cecf 100644 --- 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 1fec73d4dc65..7abeae9c07b6 100644 --- 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 bce394747bb2..77a68acf340a 100644 --- 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"; }; -- 2.30.2