lantiq: kernel 4.14: use vbus-supply devicetree property

It isn't a phy supply, as the phy is still up if the GPIO is low. It
rather is the supply for the vbus. A correct setting/definition will be
relevant as soon as USB peripheral mode is supported.

Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from d8b475212bbf9e5f80c1c923a9701dca5ceb23e2)

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
index 5e1f271606e30899eec42076c25ecc40f1ebe971..5a2d8671962eeacaf8bcdd0f759495f8d66c4d27 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ACMP252.dts
@@ -101,11 +101,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
index 458a3875363f301b5626ad6c6c9aee34c4196530..e95c4036829545094c49257704062e19b1601c71 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4518PWR01.dtsi
@@ -192,11 +192,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
index 5733d2ce1982baa3539f752d43ec9c5d8fabcc99..690c12f4229831918209f524a5cea8c15347fc0d 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4519PW.dts
@@ -189,11 +189,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
index aa4269305bbd3a53e85f35719d33dc3e9cc59713..68d6dc3e7e6a9a9e5515d6a7bb70ffb1026b2b99 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV4520PW.dts
@@ -213,11 +213,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
index 1e1183d1babc168dbec03f9401d0eecc46b07a91..3854ac2dbeed77dd395a24673d0e295ad5785a0c 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV452CQW.dts
@@ -231,11 +231,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
index 337f969b34560619b6048d6b646c738a78dbdd7b..2c52ec62b739b23d2d88f5848ce59b36d27a1726 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7510PW22.dts
@@ -195,11 +195,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
index 1d6f404ee99575f44e7e672f1f443d99339355c9..a033b0de7d9a28fea9743ac6c4b92ca03d2000e6 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7518PW.dts
@@ -227,11 +227,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
index 40607aebdd11ef0ea190003f31c8004631854046..2d557f4734216fe27cfd65497ebfea31b25da968 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV7519RW22.dts
@@ -236,18 +236,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
index 7b337b4f5fd7edb924e82c7a12cc5f6cf5762854..911e71a2cdcd929631c4294718cfb4809c44347c 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW.dts
@@ -232,11 +232,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
index feb92d4d9d350b2a79df399fdc0a995a24d9ce98..88d9d7fdc3ad5413da3e723ead53ccb24b46076f 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV752DPW22.dts
@@ -254,11 +254,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
index 1e39380f603560c17d8e85c7c7b7284e15bc45b6..7b201ff8d3c240aca10b48db9a0f9ef5f853ee7b 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/ARV8539PW22.dts
@@ -178,11 +178,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
index 6bba7e42010a61b54f12341c86bd8f10d87014d3..d3e2bf761c52e3c0311a5ff4cf0421f39749e0b2 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV3A.dts
@@ -207,9 +207,9 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
index a3be0a5c9ca93c977a674c45ca4afd97abbb6dc9..90228667fd7833653b39676745383edc2a29bcef 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/BTHOMEHUBV5A.dts
@@ -291,9 +291,9 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
index 464ab5bd4e9fddb5cbb6c5cdefa352d43b6550f3..b7cfc03a1e8c6a02389f80ac34aa7779c748e88b 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/EASY80920.dtsi
@@ -304,9 +304,9 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
index f6180c474fcbb3d0a58d814c304b22f958635876..815c01f89cbb1f59422f13f76d3e6c684118b888 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/FRITZ3370-REV2.dtsi
@@ -288,18 +288,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb0_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb1_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb0_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb1_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
index fc028bb5f126e1c3b625e156285b8e686a8e850a..36b82515dcc36ee289011c394b4c1286d2acdc46 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/GIGASX76X.dts
@@ -117,11 +117,11 @@
 
 &usb_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
index 43a4b42d82c7dc2223f8c16cfd64a58c7b921292..90f74bb38490302da5fb8585dd637fb52749f64e 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/H201L.dts
@@ -165,10 +165,10 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
index 267a4f3a718cd5e6b0f66ec723642c6fa9011699..444dc563b31661082b82b1577949265e103f970c 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2601HNFX.dts
@@ -186,9 +186,9 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
index 03858afef41eab4d8bd0fdc35fe88d715988104e..579e562c385a31fa66a9105bcadebd6310d58741 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/P2812HNUFX.dtsi
@@ -280,18 +280,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
index e176bca30f85eafd7d21016a0bc7ddbd6a9e1c9f..233b7e33342c86f9d84c88de1ef4c37c77f09cc9 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/TDW89X0.dtsi
@@ -281,18 +281,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
index 8f22380cc9a8329074d5de66a27b26a76501a06b..ab558372ee03a11a206c7cbcac42cbb32f4f94a9 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7510KW22.dtsi
@@ -253,11 +253,11 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
index 297f5f7f4f62ebd3a0a382c37b50571923240567..b9276025bd2a6fb5d75eb0455820133ecac5d829 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VGV7519.dtsi
@@ -288,20 +288,20 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &vmmc {

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
index d0fcd6fcd0d3fbf8fd6d0b213111cf3fae480680..331f08ed501586582e2010d3c3c7ea7355dfe91c 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/VR200v.dts
@@ -288,18 +288,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
index 6bee3308a2186f3e8cd26b6d918e78fafc1a0fc3..02c11823050de99e90f669c406a660c9f37ed782 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR.dts
@@ -191,9 +191,9 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };

diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
index 4092b6b6eb52b3d3e8bb4800ce5066c34a786d64..df7bc9fce11fba4d057961e665752ba17eeda8c8 100644 (file)
--- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
+++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/WBMR300.dts
@@ -312,18 +312,18 @@
 
 &usb_phy0 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb_phy1 {
        status = "okay";
-       phy-supply = <&usb_vbus>;
 };
 
 &usb0 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };
 
 &usb1 {
        status = "okay";
+       vbus-supply = <&usb_vbus>;
 };