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 <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 1c19545443f81bbc7b11a52bda602cb4da230a56..7636f9d8000a55bd453de0dab1db685ef292fabf 100644 (file)
--- 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 fd4395985cec740f7beb51aff8e20d9bd286df01..627188873d08a6126a427ce7d2ee79e6fcc0df30 100644 (file)
--- 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 4ebe0cf11f13da6fbe9280ccd4b30bc6871ac0f4..c5e0c2e02b2251bbe71aa09c4039415ed8da63d8 100644 (file)
--- 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 95d7750be0af7576b8e6f9003f1014bd8fa64de3..6962651e1b1ae6506082cf634c32bce25a4981a2 100644 (file)
--- 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 111f70a8d52789f9f85841430be6cd9c71cabfc7..6e1cb396b8942c1ad7ac7106fbcaf5178d525293 100644 (file)
--- 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 26e5ab00a5e7c44dc4d48cdc7bfdaf8abb65723c..2be5f3fc88928fcfd57b502c067697687cdcdecf 100644 (file)
--- 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";
-};
-
 &ethernet {
        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 a45019e2d0a810995aa79b6e1dfa2ddb4ad7dbd0..5bc12758d4ef2158c1847d305858f66adb807758 100644 (file)
--- 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 47e4b429a918bc6896dc3c305febd8c377148cf6..5e92cd2126133d6a7bf4e47fbd7f9c9578ed06d8 100644 (file)
--- 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";
-};
-
 &ethernet {
        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 335a85dc0029846c095b9281e28475b898ba7fdc..96dde0fbf1cb40d295e077cbf9df27f388287429 100644 (file)
--- 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 07e088652c7cd8a7ae91fe260679b9864ad6b0be..80965a48b83478e761265976ef5d98058abcdc24 100644 (file)
--- 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 fcff5678855ac54535d2b9d6ba102f458e6785fd..58a84073015592acd971102fb02ccf53ebc9f342 100644 (file)
--- 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 bc3e431982a8bf59acdaa95795bec8ca733c2db2..7d9bb0e359e715094dbba851bca6ea13665ff1fa 100644 (file)
--- 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 336073f155104c6e660d8a3e000559cd5b2f7621..43769eeb6244060d48436c7a8e9eb6496cd17df5 100644 (file)
--- 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 2635134348f164adf6c2bc014ed04c77eda2d2d2..5054a8c2116c5135b7a922cffcaa2878e5b7e779 100644 (file)
--- 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 500f6ebd01893a2df64b8b380a7e5cf755535464..f9365d5700d36c8a34216a60b6382df3e8f14899 100644 (file)
--- 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 432110b875428c6e69995cd0068b7c76c36878d3..83b1fb2a6d0e4953dd45fb389ca8a96cc55c9cb2 100644 (file)
--- 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 9d4de243aa723b9854addacf1b8c78a5afe3abfa..543fda74b72d44d41dd9365774cb94560c69c930 100644 (file)
--- 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 769aec6a50812418d81d2dac1dcb01afec20112f..8ab2a87304d4fedd0fa20e28e90058227c79c711 100644 (file)
--- 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 dbe925508abb84ba9c7ed72ff78d52571d3d58c0..540fd253ebe9810447b80216b6a7b2f66a0b2044 100644 (file)
--- 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 b837d5c67c861f1c73ee8e8b21bc0e7132cf3359..2459c6b65bc43de7172520ba471b2e86813781ad 100644 (file)
--- 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 3d1968a03cbbb2f2898bd0992a4d63cbf9ca2250..902cc6e52264972f06012b51fdf75da5552b378a 100644 (file)
--- 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 b5583eb89271cdd6f95a469559d955672baa79d3..499b555da41b4c675769e51360420625b7cfd274 100644 (file)
--- 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 1fc4959639e20120a13d6dc7c7ad7425ea55f7d1..b6bad0ab77823c5142f364f44484986a408f1ee1 100644 (file)
--- 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 c4ca6ab6cd73b7b5182f778010645e17d396c18a..9b36961ffb06699c8cbfafed8a644ac450fc66fe 100644 (file)
--- 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 bbc1c14e65bbe0475b23f921bde28350183d4c4c..9c00da82ed1639febeb8d011f3004382610a08c2 100644 (file)
--- 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 b36dd46f578e3aa3b3a736df46063d1d724a1f99..b60bb99ee91181a87ca5bf8dcbdc97822a299563 100644 (file)
--- 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 9bfa79364654d61d275461d6309b40f1cae97347..a20cd04a26be7c35f74423a5abfcb67550d8f968 100644 (file)
--- 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 11765f10c6dde9ae719b06d9ba540e4e287f8cfc..13d1a16741c260532ead20fbcf1ce03df1ddc205 100644 (file)
--- 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 42e6dcfb4efdc9e01be4059d1a45c6188c93d617..2173ec4fbac0e0fbf63ade9f7a2f9d28eb47f2b6 100644 (file)
--- 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 a905e023cb8f56f25225873a035910a34eac774e..0c829196691705a3e1ada4c098536eff4f073677 100644 (file)
--- 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 c6eced34ba1fe1246b306bad0de9bb8ecc4d6800..adb4034e8a5847e6041e397c4b0916f277d65472 100644 (file)
--- 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 9a2c0a606ce5c9f0d6342b1d380174b29f411041..314c4091a45f3cc746635f5a05eb123c908f1707 100644 (file)
--- 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";
-};