Commit f6485041 authored by Alexander Stein's avatar Alexander Stein Committed by Bjorn Andersson

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

Use id-gpios and vbus-gpios instead.
Signed-off-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Acked-by: default avatarKrzysztof 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.comSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 4af302a7
...@@ -77,7 +77,7 @@ usb2513 { ...@@ -77,7 +77,7 @@ usb2513 {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 121 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -99,14 +99,14 @@ button { ...@@ -99,14 +99,14 @@ button {
usb2_id: usb2-id { usb2_id: usb2-id {
compatible = "linux,extcon-usb-gpio"; 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-names = "default";
pinctrl-0 = <&usb2_vbus_det_gpio>; pinctrl-0 = <&usb2_vbus_det_gpio>;
}; };
usb3_id: usb3-id { usb3_id: usb3-id {
compatible = "linux,extcon-usb-gpio"; 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-names = "default";
pinctrl-0 = <&usb3_vbus_det_gpio>; pinctrl-0 = <&usb3_vbus_det_gpio>;
}; };
......
...@@ -48,7 +48,7 @@ button-volume-up { ...@@ -48,7 +48,7 @@ button-volume-up {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -52,7 +52,7 @@ led-0 { ...@@ -52,7 +52,7 @@ led-0 {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 69 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -75,7 +75,7 @@ led-green { ...@@ -75,7 +75,7 @@ led-green {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; 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-0 = <&usb_id_default>;
pinctrl-names = "default"; pinctrl-names = "default";
}; };
......
...@@ -80,7 +80,7 @@ led-2 { ...@@ -80,7 +80,7 @@ led-2 {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 117 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -68,7 +68,7 @@ led-0 { ...@@ -68,7 +68,7 @@ led-0 {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -56,7 +56,7 @@ button-volume-up { ...@@ -56,7 +56,7 @@ button-volume-up {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>; pinctrl-0 = <&usb_id_default>;
}; };
......
...@@ -33,7 +33,7 @@ chosen { ...@@ -33,7 +33,7 @@ chosen {
usb_id: usb-id { usb_id: usb-id {
compatible = "linux,extcon-usb-gpio"; 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-0 = <&usb_id_default>;
pinctrl-names = "default"; pinctrl-names = "default";
}; };
......
...@@ -24,5 +24,5 @@ &usb_detect { ...@@ -24,5 +24,5 @@ &usb_detect {
}; };
&usb3_id { &usb3_id {
id-gpio = <&tlmm 24 GPIO_ACTIVE_LOW>; id-gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
}; };
...@@ -71,7 +71,7 @@ panel_tvdd: tvdd-regulator { ...@@ -71,7 +71,7 @@ panel_tvdd: tvdd-regulator {
usb3_id: usb3-id { usb3_id: usb3-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 25 GPIO_ACTIVE_LOW>; id-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb_detect>; pinctrl-0 = <&usb_detect>;
}; };
......
...@@ -31,7 +31,7 @@ aliases { ...@@ -31,7 +31,7 @@ aliases {
*/ */
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 38 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
}; };
gpio-hall-sensors { gpio-hall-sensors {
......
...@@ -89,8 +89,8 @@ vph_pwr: vph-pwr-regulator { ...@@ -89,8 +89,8 @@ vph_pwr: vph-pwr-regulator {
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 38 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
vbus-gpio = <&tlmm 128 GPIO_ACTIVE_HIGH>; vbus-gpios = <&tlmm 128 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&cc_dir_default &usb_detect_en>; pinctrl-0 = <&cc_dir_default &usb_detect_en>;
}; };
......
...@@ -43,7 +43,7 @@ key-volup { ...@@ -43,7 +43,7 @@ key-volup {
*/ */
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
}; };
hdmi-out { hdmi-out {
......
...@@ -150,7 +150,7 @@ cont_splash_mem: splash@9d400000 { ...@@ -150,7 +150,7 @@ cont_splash_mem: splash@9d400000 {
*/ */
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -85,7 +85,7 @@ framebuffer_mem: memory@9d400000 { ...@@ -85,7 +85,7 @@ framebuffer_mem: memory@9d400000 {
*/ */
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -42,7 +42,7 @@ framebuffer0: framebuffer@5c000000 { ...@@ -42,7 +42,7 @@ framebuffer0: framebuffer@5c000000 {
extcon_usb: extcon-usb { extcon_usb: extcon-usb {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 102 GPIO_ACTIVE_HIGH>;
}; };
gpio-keys { gpio-keys {
......
...@@ -63,7 +63,7 @@ cmdline_mem: memory@ffd00000 { ...@@ -63,7 +63,7 @@ cmdline_mem: memory@ffd00000 {
extcon_usb: usb-id { extcon_usb: usb-id {
compatible = "linux,extcon-usb-gpio"; compatible = "linux,extcon-usb-gpio";
id-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>; id-gpios = <&tlmm 102 GPIO_ACTIVE_HIGH>;
}; };
gpio-keys { gpio-keys {
......
...@@ -27,7 +27,7 @@ module_led: led-0 { ...@@ -27,7 +27,7 @@ module_led: led-0 {
extcon_usb3: extcon-usb3 { extcon_usb3: extcon-usb3 {
compatible = "linux,extcon-usb-gpio"; 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-names = "default";
pinctrl-0 = <&usb3_id>; pinctrl-0 = <&usb3_id>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment