From: Mathias Kresin Date: Sun, 22 Apr 2018 15:03:31 +0000 (+0200) Subject: lantiq: kernel 4.14: use vbus-supply devicetree property X-Git-Tag: v19.07.0-rc1~3734 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8b475212bbf9e5f80c1c923a9701dca5ceb23e2;p=oweals%2Fopenwrt.git 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 --- 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 5e1f271606..5a2d867196 100644 --- 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 458a387536..e95c403682 100644 --- 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 5733d2ce19..690c12f422 100644 --- 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 aa4269305b..68d6dc3e7e 100644 --- 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 1e1183d1ba..3854ac2dbe 100644 --- 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 337f969b34..2c52ec62b7 100644 --- 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 1d6f404ee9..a033b0de7d 100644 --- 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 40607aebdd..2d557f4734 100644 --- 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 7b337b4f5f..911e71a2cd 100644 --- 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 feb92d4d9d..88d9d7fdc3 100644 --- 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 1e39380f60..7b201ff8d3 100644 --- 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 6bba7e4201..d3e2bf761c 100644 --- 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 a3be0a5c9c..90228667fd 100644 --- 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 464ab5bd4e..b7cfc03a1e 100644 --- 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 f6180c474f..815c01f89c 100644 --- 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 fc028bb5f1..36b82515dc 100644 --- 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 43a4b42d82..90f74bb384 100644 --- 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 267a4f3a71..444dc563b3 100644 --- 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 03858afef4..579e562c38 100644 --- 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 e176bca30f..233b7e3334 100644 --- 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 8f22380cc9..ab558372ee 100644 --- 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 297f5f7f4f..b9276025bd 100644 --- 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 d0fcd6fcd0..331f08ed50 100644 --- 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 6bee3308a2..02c1182305 100644 --- 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 4092b6b6eb..df7bc9fce1 100644 --- 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>; };