diff mbox series

[v4,2/6] ARM: dts: ti/omap: Replace deprecated extcon-usb-gpio id-gpio/vbus-gpio properties

Message ID 20230724103914.1779027-3-alexander.stein@ew.tq-group.com
State Accepted
Commit 3a40640ded577bd1e05c78508270f6e825463799
Headers show
Series extcon-usb-gpio YAML conversion | expand

Commit Message

Alexander Stein July 24, 2023, 10:39 a.m. UTC
Use id-gpios and vbus-gpios instead.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
 arch/arm/boot/dts/ti/omap/am571x-idk.dts          | 4 ++--
 arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +-
 arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi  | 4 ++--
 arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi    | 4 ++--
 arch/arm/boot/dts/ti/omap/dra71-evm.dts           | 4 ++--
 arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi   | 4 ++--
 arch/arm/boot/dts/ti/omap/dra76-evm.dts           | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

Comments

Alexander Stein Nov. 17, 2023, 12:08 p.m. UTC | #1
Hi everybody,

any feedback on this? Patch 3,4 and 6 have already been merged.

Thanks
Alexander

Am Montag, 24. Juli 2023, 12:39:09 CET schrieb Alexander Stein:
> Use id-gpios and vbus-gpios instead.
> 
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
> ---
>  arch/arm/boot/dts/ti/omap/am571x-idk.dts          | 4 ++--
>  arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +-
>  arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi  | 4 ++--
>  arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi    | 4 ++--
>  arch/arm/boot/dts/ti/omap/dra71-evm.dts           | 4 ++--
>  arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi   | 4 ++--
>  arch/arm/boot/dts/ti/omap/dra76-evm.dts           | 4 ++--
>  7 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/ti/omap/am571x-idk.dts
> b/arch/arm/boot/dts/ti/omap/am571x-idk.dts index 48425020281a..322cf79d22e9
> 100644
> --- a/arch/arm/boot/dts/ti/omap/am571x-idk.dts
> +++ b/arch/arm/boot/dts/ti/omap/am571x-idk.dts
> @@ -168,8 +168,8 @@ blue3-led {
>  };
> 
>  &extcon_usb2 {
> -	id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
> -	vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
> +	id-gpios = <&gpio5 7 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&gpio7 22 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &sn65hvs882 {
> diff --git a/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
> b/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts index
> 149cfafb90bf..c5272302eb11 100644
> --- a/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
> +++ b/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
> @@ -197,7 +197,7 @@ brcmf_pwrseq: brcmf_pwrseq {
>  	extcon_usb1: extcon_usb1 {
>  		compatible = "linux,extcon-usb-gpio";
>  		ti,enable-id-detection;
> -		id-gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>;
> +		id-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
>  	};
>  };
> 
> diff --git a/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
> b/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi index
> 1d66278c3a72..3fca84819dc0 100644
> --- a/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
> @@ -169,8 +169,8 @@ blue3-led {
>  };
> 
>  &extcon_usb2 {
> -	id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
> -	vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
> +	id-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &sn65hvs882 {
> diff --git a/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
> b/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi index
> 4cdffd6db740..ed5199d7acd8 100644
> --- a/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
> @@ -15,12 +15,12 @@ chosen {
> 
>  	extcon_usb1: extcon_usb1 {
>  		compatible = "linux,extcon-usb-gpio";
> -		id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
> +		id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
>  	};
> 
>  	extcon_usb2: extcon_usb2 {
>  		compatible = "linux,extcon-usb-gpio";
> -		id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
> +		id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
>  	};
> 
>  	sound0: sound0 {
> diff --git a/arch/arm/boot/dts/ti/omap/dra71-evm.dts
> b/arch/arm/boot/dts/ti/omap/dra71-evm.dts index a64364443031..f747ac56eb92
> 100644
> --- a/arch/arm/boot/dts/ti/omap/dra71-evm.dts
> +++ b/arch/arm/boot/dts/ti/omap/dra71-evm.dts
> @@ -293,11 +293,11 @@ &hdmi {
>  };
> 
>  &extcon_usb1 {
> -	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &extcon_usb2 {
> -	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &ipu2 {
> diff --git a/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
> b/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi index
> 31ab0c60ca75..f8151c61488e 100644
> --- a/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
> +++ b/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
> @@ -96,12 +96,12 @@ evm_3v3_sd: fixedregulator-sd {
> 
>  	extcon_usb1: extcon_usb1 {
>  		compatible = "linux,extcon-usb-gpio";
> -		id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
> +		id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
>  	};
> 
>  	extcon_usb2: extcon_usb2 {
>  		compatible = "linux,extcon-usb-gpio";
> -		id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
> +		id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
>  	};
> 
>  	hdmi0: connector {
> diff --git a/arch/arm/boot/dts/ti/omap/dra76-evm.dts
> b/arch/arm/boot/dts/ti/omap/dra76-evm.dts index 57868ac60d29..cf9c3d35b049
> 100644
> --- a/arch/arm/boot/dts/ti/omap/dra76-evm.dts
> +++ b/arch/arm/boot/dts/ti/omap/dra76-evm.dts
> @@ -533,11 +533,11 @@ &pcie1_ep {
>  };
> 
>  &extcon_usb1 {
> -	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &extcon_usb2 {
> -	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
> +	vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
>  };
> 
>  &m_can0 {
Tony Lindgren Nov. 28, 2023, 9:57 a.m. UTC | #2
* Alexander Stein <alexander.stein@ew.tq-group.com> [231117 12:08]:
> Hi everybody,
> 
> any feedback on this? Patch 3,4 and 6 have already been merged.

Sorry I did not know I'm supposed to pick it from the series.
Applying into omap-for-v6,8/dt thanks.

Tony
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/ti/omap/am571x-idk.dts b/arch/arm/boot/dts/ti/omap/am571x-idk.dts
index 48425020281a..322cf79d22e9 100644
--- a/arch/arm/boot/dts/ti/omap/am571x-idk.dts
+++ b/arch/arm/boot/dts/ti/omap/am571x-idk.dts
@@ -168,8 +168,8 @@  blue3-led {
 };
 
 &extcon_usb2 {
-	id-gpio = <&gpio5 7 GPIO_ACTIVE_HIGH>;
-	vbus-gpio = <&gpio7 22 GPIO_ACTIVE_HIGH>;
+	id-gpios = <&gpio5 7 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&gpio7 22 GPIO_ACTIVE_HIGH>;
 };
 
 &sn65hvs882 {
diff --git a/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts b/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
index 149cfafb90bf..c5272302eb11 100644
--- a/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
+++ b/arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts
@@ -197,7 +197,7 @@  brcmf_pwrseq: brcmf_pwrseq {
 	extcon_usb1: extcon_usb1 {
 		compatible = "linux,extcon-usb-gpio";
 		ti,enable-id-detection;
-		id-gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>;
+		id-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
 	};
 };
 
diff --git a/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi b/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
index 1d66278c3a72..3fca84819dc0 100644
--- a/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am572x-idk-common.dtsi
@@ -169,8 +169,8 @@  blue3-led {
 };
 
 &extcon_usb2 {
-	id-gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>;
-	vbus-gpio = <&gpio3 26 GPIO_ACTIVE_HIGH>;
+	id-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
 };
 
 &sn65hvs882 {
diff --git a/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi b/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
index 4cdffd6db740..ed5199d7acd8 100644
--- a/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/dra7-evm-common.dtsi
@@ -15,12 +15,12 @@  chosen {
 
 	extcon_usb1: extcon_usb1 {
 		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
+		id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
 	};
 
 	extcon_usb2: extcon_usb2 {
 		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+		id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
 	};
 
 	sound0: sound0 {
diff --git a/arch/arm/boot/dts/ti/omap/dra71-evm.dts b/arch/arm/boot/dts/ti/omap/dra71-evm.dts
index a64364443031..f747ac56eb92 100644
--- a/arch/arm/boot/dts/ti/omap/dra71-evm.dts
+++ b/arch/arm/boot/dts/ti/omap/dra71-evm.dts
@@ -293,11 +293,11 @@  &hdmi {
 };
 
 &extcon_usb1 {
-	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
 };
 
 &extcon_usb2 {
-	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
 };
 
 &ipu2 {
diff --git a/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi b/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
index 31ab0c60ca75..f8151c61488e 100644
--- a/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/dra72-evm-common.dtsi
@@ -96,12 +96,12 @@  evm_3v3_sd: fixedregulator-sd {
 
 	extcon_usb1: extcon_usb1 {
 		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
+		id-gpios = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
 	};
 
 	extcon_usb2: extcon_usb2 {
 		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
+		id-gpios = <&pcf_gpio_21 2 GPIO_ACTIVE_HIGH>;
 	};
 
 	hdmi0: connector {
diff --git a/arch/arm/boot/dts/ti/omap/dra76-evm.dts b/arch/arm/boot/dts/ti/omap/dra76-evm.dts
index 57868ac60d29..cf9c3d35b049 100644
--- a/arch/arm/boot/dts/ti/omap/dra76-evm.dts
+++ b/arch/arm/boot/dts/ti/omap/dra76-evm.dts
@@ -533,11 +533,11 @@  &pcie1_ep {
 };
 
 &extcon_usb1 {
-	vbus-gpio = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&pcf_lcd 14 GPIO_ACTIVE_HIGH>;
 };
 
 &extcon_usb2 {
-	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
+	vbus-gpios = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;
 };
 
 &m_can0 {