ramips: dts: mt7621: remove redundant USB regulators

We have added the default voltage regulators for the mt7621 SoC
dtsi. These redundant voltage regulators can be removed now.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18886
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ramips/dts/mt7621_gemtek_wvrtm-1xxacn.dtsi b/target/linux/ramips/dts/mt7621_gemtek_wvrtm-1xxacn.dtsi
index 8b64508215070705401d14635d5bca27684aa6cf..e6b7f8c204164ee2bee40e78adb6ac10700a8fa3 100644 (file)
--- a/target/linux/ramips/dts/mt7621_gemtek_wvrtm-1xxacn.dtsi
+++ b/target/linux/ramips/dts/mt7621_gemtek_wvrtm-1xxacn.dtsi
@@ -119,24 +119,6 @@
                reg = <0x0 0x8000000>;
        };
 
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
-       reg_3p3v: regulator-3p3v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
-
        ubi-concat {
                compatible = "mtd-concat";
                devices = <&ubiconcat0 &ubiconcat1 &ubiconcat2 &ubiconcat3>;
@@ -280,8 +262,3 @@
                };
        };
 };
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
-       vusb33-supply = <&reg_3p3v>;
-};

diff --git a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
index 427022692622daa8e7459cccce5734a2d8aee6c7..4cbdc3ab974a34da491067c3fc624d4a42d4785a 100644 (file)
--- a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
+++ b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
@@ -65,15 +65,6 @@
                gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };
-
-       reg_3p3v: regulator-3p3v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
 };
 
 &gmac0 {
@@ -218,5 +209,4 @@
 
 &xhci {
        vbus-supply = <&reg_usb_vbus>;
-       vusb33-supply = <&reg_3p3v>;
 };

diff --git a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
index b4324feccf5739a15d6d7cf29bd984c71c516689..93d17766e9f600d3811898e4b20a1de30094014d 100644 (file)
--- a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
+++ b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me2-sfp.dts
@@ -67,15 +67,6 @@
                gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };
-
-       reg_3p3v: regulator-3p3v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
 };
 
 &state_default {
@@ -203,7 +194,6 @@
 };
 
 &xhci {
-       vusb33-supply = <&reg_3p3v>;
        vbus-supply = <&reg_usb_vbus>;
 };
 

diff --git a/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts b/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
index 3d92e343f1f7089ee6cf272a7ef5f6f5cb56bbc0..be9efbf0e97ad4509021e5bc8895e3a7aee709a1 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
@@ -67,15 +67,6 @@
                gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };
-
-       reg_3p3v: regulator-3p3v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-boot-on;
-               regulator-always-on;
-       };
 };
 
 &gmac0 {
@@ -171,7 +162,6 @@
 };
 
 &xhci {
-       vusb33-supply = <&reg_3p3v>;
        vbus-supply = <&reg_usb_vbus>;
 };