arm64: dts: qcom: Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties

Use id-gpios and vbus-gpios instead.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Heiko Stuebner <heiko@sntech.de> #rockchip
Link: https://lore.kernel.org/r/20230724103914.1779027-7-alexander.stein@ew.tq-group.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index e0993e32ee38b200d396a695968aed7814c2c5f2..f6eeb259884650adc437b9cb7e6b83a1ab3e16c6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -77,7 +77,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 121 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 16353e3b7fab70cbec6f5b6fee0debe47cb9dfc9..385b178314db9573eed3b6ea1f30838c853ebe3c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -99,14 +99,14 @@
 
        usb2_id: usb2-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&pmi8994_gpios 6 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb2_vbus_det_gpio>;
        };
 
        usb3_id: usb3-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&pm8994_gpios 22 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb3_vbus_det_gpio>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 5ad49fe999dba5f103a467e08afe6871504895d2..84723c9b73b4ae7f8a6392d52b4af85f59917c33 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -48,7 +48,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 1c43f3d6a0b4b63160690ce2711a7baf32ebeaff..47da738661bf8650a51131dbb569dfacd58aa910 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -52,7 +52,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 69 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index f4dbc515c47adba3cb52a092915831d87ffdacea..4aeeee24cedca13af3dee3b4aaa4dfa38bd164ce 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -75,7 +75,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&usb_id_default>;
                pinctrl-names = "default";
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 4239c8fda11b4834364ddb37a83ae054ab79dc9b..484e488a5eca30b12a736cdd0b1526d32a3eafc1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -80,7 +80,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 117 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 9757182fba3e64b970d5e35592dd3ab20c6a4e1a..d73294af1a068b70886dcb3988317767f83de3d1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -68,7 +68,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index c94d36b3865179de1f1b8da343893f520376840a..8e238976ab1cefc9d5929ed31a05e41cffb723fa 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -56,7 +56,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_id_default>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index 0633e3006f1788f966cdd0137397eeadb8230dc5..89b6aebba40455719a5274073acfcea438647994 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -33,7 +33,7 @@
 
        usb_id: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
                pinctrl-0 = <&usb_id_default>;
                pinctrl-names = "default";
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts
index 4a0645db0ae14d82d63dd0ba01a1bf06d534062b..6374c5f53d9a1bd1b7235d6fa70f55f45b449f4e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone-dora.dts
@@ -24,5 +24,5 @@
 };
 
 &usb3_id {
-       id-gpio = <&tlmm 24 GPIO_ACTIVE_LOW>;
+       id-gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
index b4b770a9277dc511e18850b2c7cf63d7faf8f70c..d55e4075040ffc8223a03f0691c37985b7c7e858 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi
@@ -71,7 +71,7 @@
 
        usb3_id: usb3-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 25 GPIO_ACTIVE_LOW>;
+               id-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb_detect>;
        };

diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
index b35e2d9f428c1e976a82b318aff4a68e19958722..b6a214bea70f5f23132da93a3a4f1ccec4aabf25 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts
@@ -31,7 +31,7 @@
         */
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 38 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-hall-sensors {

diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
index 687e96068cb2b2c72a03a2e223cfb1ac72e06ed5..876c6921ddf0713542fe69d41b1fce9449e3d786 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi
@@ -89,8 +89,8 @@
 
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 38 GPIO_ACTIVE_HIGH>;
-               vbus-gpio = <&tlmm 128 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
+               vbus-gpios = <&tlmm 128 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&cc_dir_default &usb_detect_en>;
        };

diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
index 0b23d5bb3f26c0a50d4ee8099aac22ec69d0cb7d..2ed39d402d3f6aeef2529ec997ccea7d373066ca 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
@@ -43,7 +43,7 @@
         */
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
        };
 
        hdmi-out {

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 3033723fc6ff3d68fa37f0a4a003acf267314a9f..87d0293c728d8dcddaac55011e0ec497a21466a5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -150,7 +150,7 @@
         */
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
index 8fb2d17887424670a729f3393009119ad4ed3b96..3c47410ba94c0b4df66d77f1e646270e8ba7b44f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
+++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
@@ -85,7 +85,7 @@
         */
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index de85086c65adc765e7c33c2777114c6c26f077aa..e42a4e710cd2c36520c973989053ec3ffe36c250 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -42,7 +42,7 @@
 
        extcon_usb: extcon-usb {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 102 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-keys {

diff --git a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts
index 7c58d1299a60945aa7878391ddaa32026d726931..272bc85f1719dd812f10e5f77e55991486f6409e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts
@@ -63,7 +63,7 @@
 
        extcon_usb: usb-id {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&tlmm 102 GPIO_ACTIVE_HIGH>;
        };
 
        gpio-keys {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index aa3e21bd6c8f44ff5f9b249dd43b56316dbc2a60..20e3f41efe97fa873aa3727aaf3e7597dffa0cef 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -27,7 +27,7 @@
 
        extcon_usb3: extcon-usb3 {
                compatible = "linux,extcon-usb-gpio";
-               id-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
+               id-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&usb3_id>;
        };