ramips: dts: mt7621: reuse the default USB dummy regulators

To simplify the device specific dts, reuse the mt7621 default
XHCI voltage regulators by adding the corresponding GPIO pin
and polarity properties.

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_d-team_newifi-d2.dts b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
index cba4ceae72810a0ae541f4976d5594e12ab0334d..22e8ca4807b469a18cb8373f42272807932fbcb0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_newifi-d2.dts
@@ -79,16 +79,6 @@
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
-
-       reg_power_usb3: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "power_usb3";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-boot-on;
-       };
 };
 
 &spi0 {
@@ -154,10 +144,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_power_usb3>;
-};
-
 &pcie {
        status = "okay";
 };
@@ -184,6 +170,13 @@
        nvmem-cell-names = "mac-address";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+       regulator-boot-on;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
index a0f8a62106317c0edf6a0d3b7d3321102e20cb3f..1037a648dc4d6d283e91f8976ed41ce1e9e8d7bc 100644 (file)
--- a/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
+++ b/target/linux/ramips/dts/mt7621_d-team_pbr-m1.dts
@@ -60,24 +60,6 @@
                };
        };
 
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 25 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>;
-               gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
        gpio_export {
                compatible = "gpio-export";
 
@@ -108,11 +90,6 @@
        status = "okay";
 };
 
-&xhci {
-       vusb33-supply = <&reg_3p3v>;
-       vbus-supply = <&reg_usb_vbus>;
-};
-
 &spi0 {
        status = "okay";
 
@@ -219,6 +196,18 @@
        nvmem-cell-names = "mac-address";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
+&reg_vusb33 {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_dual-q_h721.dts b/target/linux/ramips/dts/mt7621_dual-q_h721.dts
index 3499e14f950ed5e0904e9b1752d4805a2faf4fbd..4f8249228ac238f219d3e84a92f8544a96702a90 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dual-q_h721.dts
+++ b/target/linux/ramips/dts/mt7621_dual-q_h721.dts
@@ -75,27 +75,6 @@
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
        };
-
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-       };
-
-       reg_3p3v: regulator-3p3v {
-               compatible = "regulator-fixed";
-               regulator-name = "fixed-3.3V";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-       };
-};
-
-&xhci {
-       vusb33-supply = <&reg_3p3v>;
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &spi0 {
@@ -158,6 +137,16 @@
        status = "okay";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+};
+
+&reg_vusb33 {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_humax_e10.dts b/target/linux/ramips/dts/mt7621_humax_e10.dts
index fd66578eaf0953193a5f7008abdb45b1c619ed5b..57d934519e5ed6b0e56dd4f5152c581a36278b59 100644 (file)
--- a/target/linux/ramips/dts/mt7621_humax_e10.dts
+++ b/target/linux/ramips/dts/mt7621_humax_e10.dts
@@ -55,16 +55,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       reg_power_usb: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "power:usb";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-boot-on;
-       };
 };
 
 &spi0 {
@@ -131,10 +121,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_power_usb>;
-};
-
 &pcie {
        status = "okay";
 };
@@ -177,6 +163,13 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+       regulator-boot-on;
+};
+
 &switch0 {
        ports {
                port@1 {

diff --git a/target/linux/ramips/dts/mt7621_keenetic_kn-1910.dts b/target/linux/ramips/dts/mt7621_keenetic_kn-1910.dts
index ee09b8895cabbf26f2460f0649f3af6decdbbf8a..a6ce11b2f710393dab04b0a6d008dd14b911b3b3 100644 (file)
--- a/target/linux/ramips/dts/mt7621_keenetic_kn-1910.dts
+++ b/target/linux/ramips/dts/mt7621_keenetic_kn-1910.dts
@@ -17,24 +17,6 @@
                label-mac-device = &gmac0;
        };
 
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 5 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>;
-               gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
        keys {
                compatible = "gpio-keys";
 
@@ -115,11 +97,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
-       vusb33-supply = <&reg_3p3v>;
-};
-
 &nand {
        status = "okay";
 
@@ -259,6 +236,18 @@
        nvmem-cell-names = "mac-address";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
+&reg_vusb33 {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@1 {

diff --git a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
index c43ed152f653a4bd34d8e7674a3350254a5b4389..8b05b122b94029a04c983b43a314b9b3dbfc681d 100644 (file)
--- a/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
+++ b/target/linux/ramips/dts/mt7621_lenovo_newifi-d1.dts
@@ -58,35 +58,12 @@
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
-
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 11 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>;
-               gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
 };
 
 &sdhci {
        status = "okay";
 };
 
-&xhci {
-       vusb33-supply = <&reg_3p3v>;
-       vbus-supply = <&reg_usb_vbus>;
-};
-
 &spi0 {
        status = "okay";
 
@@ -189,6 +166,18 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
+&reg_vusb33 {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@1 {

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-7xx.dtsi b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-7xx.dtsi
index 2f96f7316fe184a543fbc12b75f4122e5332e059..44155eb9ee50e8a932d6f9dfc732f70dc6c4c194 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-7xx.dtsi
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-7xx.dtsi
@@ -13,20 +13,6 @@
                        gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
                };
        };
-
-       reg_usb_power: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_power";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-boot-on;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_power>;
 };
 
 &keys {
@@ -45,6 +31,13 @@
        };
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+       regulator-boot-on;
+};
+
 &switch0 {
        ports {
                port0: port@0 {

diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
index 40d853d48ef8aa54696d981525f47dd8e96a1f1e..b192352037d3eb43511adc458753b2cffbfb08c0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
@@ -73,19 +73,6 @@
                        gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &pcie {
@@ -122,6 +109,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
index 16f20d9408a1f0630c64640f25a6903d807a7aee..6d70b3b557e78b8813145365c9934004ad606ec0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@@ -62,19 +62,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &pcie {
@@ -119,6 +106,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

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 4cbdc3ab974a34da491067c3fc624d4a42d4785a..1b9e6caeceafe9a050973ea453bd9400141f860c 100644 (file)
--- a/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
+++ b/target/linux/ramips/dts/mt7621_snr_snr-cpe-me1.dts
@@ -56,15 +56,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
 };
 
 &gmac0 {
@@ -109,6 +100,12 @@
        };
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &spi0 {
        status = "okay";
 
@@ -206,7 +203,3 @@
                };
        };
 };
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
-};

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 93d17766e9f600d3811898e4b20a1de30094014d..9c36add8cb819a3a320a438ed60b5a0f42ee0324 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
@@ -58,15 +58,12 @@
                tx-disable-gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
                maximum-power-milliwatt = <1000>;
        };
+};
 
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
 };
 
 &state_default {
@@ -193,10 +190,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
-};
-
 &pcie {
        status = "okay";
 };

diff --git a/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts b/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
index 4917ffc81e5cef3571ca79db1687973b95ae10bd..ab20c13966ca6be791b07afbe0d3e2ac665f3daf 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_archer-c6u-v1.dts
@@ -85,15 +85,6 @@
                        gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
 };
 
 &spi0 {
@@ -210,6 +201,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@1 {
@@ -240,7 +237,3 @@
                function = "gpio";
        };
 };
-
-&xhci {
-       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 be9efbf0e97ad4509021e5bc8895e3a7aee709a1..1c5a32613fd5a892a3f1b7d3674eab16ffb48cf5 100644 (file)
--- a/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_er605-v2.dts
@@ -58,15 +58,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
 };
 
 &gmac0 {
@@ -150,6 +141,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &state_default {
        gpio {
                groups = "uart2", "uart3", "pcie", "jtag";
@@ -160,8 +157,3 @@
 &spi0 {
        status = "disabled";
 };
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
-};
-

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
index 2ed4b2c311726027098e3f011b78d91301bbf7c1..6838bb9bc4980c99310812a71a606484517b9fa4 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
@@ -84,19 +84,6 @@
                        linux,code = <KEY_RESTART>;
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &nand {
@@ -228,6 +215,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@1 {

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
index 7af316de6a4722442e8dee82a98afbc9975b94b3..539bfadc5acbe062e4bc9086e10a5fda81076e0a 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
@@ -57,19 +57,6 @@
                        linux,default-trigger = "mt7530-0:02:1Gbps";
                };
        };
-
-       reg_usb_vbus: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &pcie {
@@ -101,6 +88,12 @@
        nvmem-cell-names = "mac-address";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@1 {

diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
index 8830320954bc162bc76aaafe7e4b5b1003f059ca..89a1635b28129ea6beeb1986a67702fac943afc0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
+++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
@@ -73,29 +73,6 @@
                        gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
                };
        };
-
-       reg_usb_vbus: regulator-usb {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_vbus";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 25 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>;
-               gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-};
-
-&xhci {
-       vusb33-supply = <&reg_3p3v>;
-       vbus-supply = <&reg_usb_vbus>;
 };
 
 &spi0 {
@@ -195,6 +172,18 @@
        nvmem-cell-names = "mac-address";
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
+&reg_vusb33 {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi
index fcfe97c12636a6b4f837e8805035779c782ba745..2e76d21ae1dace41cf4c8a66796cbd70f97c1884 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602-v04.dtsi
@@ -48,15 +48,6 @@
                };
        };
 
-       reg_power_usb: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "power_usb";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
        watchdog {
                compatible = "linux,wdt-gpio";
                gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
@@ -83,10 +74,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_power_usb>;
-};
-
 &sdhci {
        status = "okay";
 };
@@ -197,6 +184,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
index d3990eeede96239dc2b1d235c29d5d00adc4c1e1..d77fd2f14f86f51e6176bf887d036e1b8ccf23de 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg1602.dtsi
@@ -47,15 +47,6 @@
                };
        };
 
-       reg_power_usb: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "power_usb";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-       };
-
        watchdog {
                compatible = "linux,wdt-gpio";
                gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
@@ -82,10 +73,6 @@
        };
 };
 
-&xhci {
-       vbus-supply = <&reg_power_usb>;
-};
-
 &sdhci {
        status = "okay";
 };
@@ -196,6 +183,12 @@
        /delete-property/ interrupts;
 };
 
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+};
+
 &switch0 {
        ports {
                port@0 {

diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts
index 0657eb6992f51f48fc411be3804db7d2840c505a..4b4e142b58c6a576c8747883bc91b37eab6472b8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts
+++ b/target/linux/ramips/dts/mt7621_zyxel_lte3301-plus.dts
@@ -89,20 +89,6 @@
                };
 
        };
-
-       reg_power_usb: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "power_usb";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-boot-on;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_power_usb>;
 };
 
 &nand {
@@ -214,3 +200,10 @@
        };
 
 };
+
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+       regulator-boot-on;
+};

diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts b/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts
index 9787181ba19d50b204c3af2bf408b5386eae7982..fd0dd5cbb41b0d96d1a978e79b780ad1aace5e4b 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts
+++ b/target/linux/ramips/dts/mt7621_zyxel_lte5398-m904.dts
@@ -92,20 +92,6 @@
                        gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
                };
        };
-
-       reg_usb_power: regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "usb_power";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-               regulator-boot-on;
-       };
-};
-
-&xhci {
-       vbus-supply = <&reg_usb_power>;
 };
 
 &nand {
@@ -239,3 +225,10 @@
                nvmem-cell-names = "eeprom";
        };
 };
+
+&reg_vbus {
+       /delete-property/ regulator-always-on;
+       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+       enable-active-high;
+       regulator-boot-on;
+};