From 66d12ce667ce9cac249736eebfa95786a9ae2a54 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 1 Dec 2020 14:48:42 +0100 Subject: [PATCH] ramips: remove redundant status for USB controllers mt7621, mt7628an and rt5350 have USB controllers (ehci/ohci or xhci) enabled by default. Thus, this patch drops redundant status=okay statements in derived device DTS files. While at it, also drop an explicit status=okay in mt7621.dtsi, as this is default. Note: For rt5350, about 50 % of the devices enabled ehci/ohci in the DTS files, and there is actually no device actively disabling it. It looks like only a few people are aware that the controllers are enabled by default here. Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7621.dtsi | 1 - target/linux/ramips/dts/mt7621_youku_yk-l2.dts | 4 ---- target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts | 8 -------- target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts | 8 -------- target/linux/ramips/dts/mt7628an_skylab_skw92a.dts | 8 -------- target/linux/ramips/dts/mt7628an_tama_w06.dts | 8 -------- target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts | 8 -------- .../linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts | 8 -------- target/linux/ramips/dts/rt5350_allnet_all5003.dts | 8 -------- target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi | 8 -------- target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts | 8 -------- target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts | 8 -------- target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts | 8 -------- target/linux/ramips/dts/rt5350_hame_mpr-a1.dts | 8 -------- target/linux/ramips/dts/rt5350_hame_mpr-a2.dts | 8 -------- target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts | 8 -------- target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts | 8 -------- target/linux/ramips/dts/rt5350_intenso_memory2move.dts | 8 -------- target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi | 8 -------- target/linux/ramips/dts/rt5350_nixcore_x1.dtsi | 8 -------- .../linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi | 8 -------- target/linux/ramips/dts/rt5350_omnima_miniembplug.dts | 8 -------- target/linux/ramips/dts/rt5350_poray_m3.dts | 8 -------- target/linux/ramips/dts/rt5350_poray_m4.dtsi | 8 -------- target/linux/ramips/dts/rt5350_poray_x5.dts | 8 -------- target/linux/ramips/dts/rt5350_poray_x8.dts | 8 -------- target/linux/ramips/dts/rt5350_tenda_3g150b.dts | 8 -------- target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts | 8 -------- target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts | 8 -------- target/linux/ramips/dts/rt5350_vocore_vocore.dtsi | 8 -------- target/linux/ramips/dts/rt5350_wansview_ncs601w.dts | 8 -------- target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts | 8 -------- 32 files changed, 245 deletions(-) diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index 1c19545443..7636f9d800 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -371,7 +371,6 @@ xhci: xhci@1E1C0000 { #address-cells = <1>; #size-cells = <0>; - status = "okay"; compatible = "mediatek,mt8173-xhci"; reg = <0x1e1c0000 0x1000 diff --git a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts index fd4395985c..627188873d 100644 --- a/target/linux/ramips/dts/mt7621_youku_yk-l2.dts +++ b/target/linux/ramips/dts/mt7621_youku_yk-l2.dts @@ -63,10 +63,6 @@ status = "okay"; }; -&xhci { - status = "okay"; -}; - &spi0 { status = "okay"; diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts index 4ebe0cf11f..c5e0c2e02b 100644 --- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts +++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts @@ -131,11 +131,3 @@ &uart1 { status = "okay"; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts index 95d7750be0..6962651e1b 100644 --- a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts +++ b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts @@ -93,14 +93,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &sdhci { status = "okay"; }; diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts index 111f70a8d5..6e1cb396b8 100644 --- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts +++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts @@ -97,11 +97,3 @@ &uart1 { status = "okay"; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts index 26e5ab00a5..2be5f3fc88 100644 --- a/target/linux/ramips/dts/mt7628an_tama_w06.dts +++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts @@ -37,18 +37,10 @@ }; }; -&ehci { - status = "okay"; -}; - ðernet { mtd-mac-address = <&factory 0x28>; }; -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "uart1", "p0led_an", "wdt"; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts index a45019e2d0..5bc12758d4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts @@ -114,14 +114,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &state_default { gpio { groups = "i2s", "refclk", "wdt", "p2led_an", "p1led_an", "p0led_an", "wled_an"; diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts index 47e4b429a9..5e92cd2126 100644 --- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts +++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts @@ -167,14 +167,6 @@ }; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - ðernet { mtd-mac-address = <&factory 0x4>; }; diff --git a/target/linux/ramips/dts/rt5350_allnet_all5003.dts b/target/linux/ramips/dts/rt5350_allnet_all5003.dts index 335a85dc00..96dde0fbf1 100644 --- a/target/linux/ramips/dts/rt5350_allnet_all5003.dts +++ b/target/linux/ramips/dts/rt5350_allnet_all5003.dts @@ -101,11 +101,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi index 07e088652c..80965a48b8 100644 --- a/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi +++ b/target/linux/ramips/dts/rt5350_asiarf_awm002-evb.dtsi @@ -61,11 +61,3 @@ &esw { mediatek,portmap = <0x3f>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts index fcff567885..58a8407301 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dcs-930l-b1.dts @@ -104,11 +104,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts index bc3e431982..7d9bb0e359 100644 --- a/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts +++ b/target/linux/ramips/dts/rt5350_dlink_dir-320-b1.dts @@ -127,11 +127,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts index 336073f155..43769eeb62 100644 --- a/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts +++ b/target/linux/ramips/dts/rt5350_easyacc_wizard-8800.dts @@ -64,14 +64,6 @@ mediatek,portmap = <0x2f>; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts index 2635134348..5054a8c211 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a1.dts @@ -119,11 +119,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts index 500f6ebd01..f9365d5700 100644 --- a/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts +++ b/target/linux/ramips/dts/rt5350_hame_mpr-a2.dts @@ -116,11 +116,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts index 432110b875..83b1fb2a6d 100644 --- a/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts +++ b/target/linux/ramips/dts/rt5350_hilink_hlk-rm04.dts @@ -109,11 +109,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts index 9d4de243aa..543fda74b7 100644 --- a/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts +++ b/target/linux/ramips/dts/rt5350_hootoo_ht-tm02.dts @@ -106,11 +106,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts index 769aec6a50..8ab2a87304 100644 --- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts +++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts @@ -105,14 +105,6 @@ mediatek,portmap = <0x2f>; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; diff --git a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi index dbe925508a..540fd253eb 100644 --- a/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi +++ b/target/linux/ramips/dts/rt5350_nexx_wt1520.dtsi @@ -32,11 +32,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi index b837d5c67c..2459c6b65b 100644 --- a/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi +++ b/target/linux/ramips/dts/rt5350_nixcore_x1.dtsi @@ -139,11 +139,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi index 3d1968a03c..902cc6e522 100644 --- a/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi +++ b/target/linux/ramips/dts/rt5350_olimex_rt5350f-olinuxino.dtsi @@ -78,14 +78,6 @@ ralink,led-polarity = <1>; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &i2c { status = "okay"; }; diff --git a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts index b5583eb892..499b555da4 100644 --- a/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts +++ b/target/linux/ramips/dts/rt5350_omnima_miniembplug.dts @@ -111,11 +111,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_poray_m3.dts b/target/linux/ramips/dts/rt5350_poray_m3.dts index 1fc4959639..b6bad0ab77 100644 --- a/target/linux/ramips/dts/rt5350_poray_m3.dts +++ b/target/linux/ramips/dts/rt5350_poray_m3.dts @@ -102,11 +102,3 @@ ralink,mtd-eeprom = <&factory 0x0>; ralink,led-polarity = <1>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_poray_m4.dtsi b/target/linux/ramips/dts/rt5350_poray_m4.dtsi index c4ca6ab6cd..9b36961ffb 100644 --- a/target/linux/ramips/dts/rt5350_poray_m4.dtsi +++ b/target/linux/ramips/dts/rt5350_poray_m4.dtsi @@ -54,11 +54,3 @@ ralink,mtd-eeprom = <&factory 0x0>; ralink,led-polarity = <1>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_poray_x5.dts b/target/linux/ramips/dts/rt5350_poray_x5.dts index bbc1c14e65..9c00da82ed 100644 --- a/target/linux/ramips/dts/rt5350_poray_x5.dts +++ b/target/linux/ramips/dts/rt5350_poray_x5.dts @@ -134,11 +134,3 @@ ralink,mtd-eeprom = <&factory 0x0>; ralink,led-polarity = <1>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_poray_x8.dts b/target/linux/ramips/dts/rt5350_poray_x8.dts index b36dd46f57..b60bb99ee9 100644 --- a/target/linux/ramips/dts/rt5350_poray_x8.dts +++ b/target/linux/ramips/dts/rt5350_poray_x8.dts @@ -95,11 +95,3 @@ ralink,mtd-eeprom = <&factory 0x0>; ralink,led-polarity = <1>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts index 9bfa793646..a20cd04a26 100644 --- a/target/linux/ramips/dts/rt5350_tenda_3g150b.dts +++ b/target/linux/ramips/dts/rt5350_tenda_3g150b.dts @@ -116,11 +116,3 @@ ralink,mtd-eeprom = <&factory 0x0>; ralink,led-polarity = <1>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts index 11765f10c6..13d1a16741 100644 --- a/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts +++ b/target/linux/ramips/dts/rt5350_trendnet_tew-714tru.dts @@ -115,11 +115,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts index 42e6dcfb4e..2173ec4fba 100644 --- a/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts +++ b/target/linux/ramips/dts/rt5350_unbranded_a5-v11.dts @@ -121,11 +121,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi index a905e023cb..0c82919669 100644 --- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi +++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi @@ -184,14 +184,6 @@ ralink,mtd-eeprom = <&factory 0x0>; }; -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; - &spi1 { status = "okay"; diff --git a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts index c6eced34ba..adb4034e8a 100644 --- a/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts +++ b/target/linux/ramips/dts/rt5350_wansview_ncs601w.dts @@ -63,11 +63,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; diff --git a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts index 9a2c0a606c..314c4091a4 100644 --- a/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts +++ b/target/linux/ramips/dts/rt5350_wiznet_wizfi630a.dts @@ -144,11 +144,3 @@ &wmac { ralink,mtd-eeprom = <&factory 0x0>; }; - -&ehci { - status = "okay"; -}; - -&ohci { - status = "okay"; -}; -- 2.30.2