diff mbox series

[v5,6/9] dts: qcom: adjust pmic gpio to use upstream bindings

Message ID 20231130-b4-qcom-dt-compat-v5-6-41500e237ad0@linaro.org
State Superseded
Headers show
Series Qualcomm PMIC fixes | expand

Commit Message

Caleb Connolly Nov. 30, 2023, 8:22 p.m. UTC
Use the upstream gpio-ranges property instead of gpio-count, and drop
the bank-name property for Qualcomm boards.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 arch/arm/dts/dragonboard410c.dts | 3 +--
 arch/arm/dts/dragonboard820c.dts | 3 +--
 arch/arm/dts/qcs404-evb.dts      | 2 +-
 arch/arm/dts/sdm845.dtsi         | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

Comments

Neil Armstrong Dec. 1, 2023, 9:34 a.m. UTC | #1
On 30/11/2023 21:22, Caleb Connolly wrote:
> Use the upstream gpio-ranges property instead of gpio-count, and drop
> the bank-name property for Qualcomm boards.
> 
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>   arch/arm/dts/dragonboard410c.dts | 3 +--
>   arch/arm/dts/dragonboard820c.dts | 3 +--
>   arch/arm/dts/qcs404-evb.dts      | 2 +-
>   arch/arm/dts/sdm845.dtsi         | 3 +--
>   4 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
> index c41fee977813..6a4e3ccf17b1 100644
> --- a/arch/arm/dts/dragonboard410c.dts
> +++ b/arch/arm/dts/dragonboard410c.dts
> @@ -170,9 +170,8 @@
>   					compatible = "qcom,pm8916-gpio";
>   					reg = <0xc000 0x400>;
>   					gpio-controller;
> -					gpio-count = <4>;
> +					gpio-ranges = <&pm8916_gpios 0 0 4>;
>   					#gpio-cells = <2>;
> -					gpio-bank-name="pmic";
>   				};
>   			};
>   
> diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts
> index 0d9c9f7a4922..146a0af8aafe 100644
> --- a/arch/arm/dts/dragonboard820c.dts
> +++ b/arch/arm/dts/dragonboard820c.dts
> @@ -132,9 +132,8 @@
>   					compatible = "qcom,pm8994-gpio";
>   					reg = <0xc000 0x400>;
>   					gpio-controller;
> -					gpio-count = <24>;
> +					gpio-ranges = <&pm8994_gpios 0 0 22>;
>   					#gpio-cells = <2>;
> -					gpio-bank-name="pm8994.";
>   				};
>   			};
>   
> diff --git a/arch/arm/dts/qcs404-evb.dts b/arch/arm/dts/qcs404-evb.dts
> index 84224a8a3d39..3bb580ba4e17 100644
> --- a/arch/arm/dts/qcs404-evb.dts
> +++ b/arch/arm/dts/qcs404-evb.dts
> @@ -378,7 +378,7 @@
>   					compatible = "qcom,pms405-gpio";
>   					reg = <0xc000 0x400>;
>   					gpio-controller;
> -					gpio-count = <12>;
> +					gpio-ranges = <&pms405_gpios 0 0 12>;
>   					#gpio-cells = <2>;
>   					gpio-bank-name="pmic";
>   				};
> diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
> index cd5d890e9a45..a26e9f411ee0 100644
> --- a/arch/arm/dts/sdm845.dtsi
> +++ b/arch/arm/dts/sdm845.dtsi
> @@ -103,9 +103,8 @@
>   					compatible = "qcom,pm8998-gpio";
>   					reg = <0xc000 0x1a00>;
>   					gpio-controller;
> -					gpio-count = <21>;
> +					gpio-ranges = <&pm8998_gpios 0 0 26>;
>   					#gpio-cells = <2>;
> -					gpio-bank-name = "pm8998.";
>   				};
>   			};
>   
> 

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Sumit Garg Dec. 1, 2023, 12:47 p.m. UTC | #2
On Fri, 1 Dec 2023 at 01:52, Caleb Connolly <caleb.connolly@linaro.org> wrote:
>
> Use the upstream gpio-ranges property instead of gpio-count, and drop
> the bank-name property for Qualcomm boards.
>
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
> ---
>  arch/arm/dts/dragonboard410c.dts | 3 +--
>  arch/arm/dts/dragonboard820c.dts | 3 +--
>  arch/arm/dts/qcs404-evb.dts      | 2 +-
>  arch/arm/dts/sdm845.dtsi         | 3 +--
>  4 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
> index c41fee977813..6a4e3ccf17b1 100644
> --- a/arch/arm/dts/dragonboard410c.dts
> +++ b/arch/arm/dts/dragonboard410c.dts
> @@ -170,9 +170,8 @@
>                                         compatible = "qcom,pm8916-gpio";
>                                         reg = <0xc000 0x400>;
>                                         gpio-controller;
> -                                       gpio-count = <4>;
> +                                       gpio-ranges = <&pm8916_gpios 0 0 4>;
>                                         #gpio-cells = <2>;
> -                                       gpio-bank-name="pmic";
>                                 };
>                         };
>
> diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts
> index 0d9c9f7a4922..146a0af8aafe 100644
> --- a/arch/arm/dts/dragonboard820c.dts
> +++ b/arch/arm/dts/dragonboard820c.dts
> @@ -132,9 +132,8 @@
>                                         compatible = "qcom,pm8994-gpio";
>                                         reg = <0xc000 0x400>;
>                                         gpio-controller;
> -                                       gpio-count = <24>;
> +                                       gpio-ranges = <&pm8994_gpios 0 0 22>;
>                                         #gpio-cells = <2>;
> -                                       gpio-bank-name="pm8994.";
>                                 };
>                         };
>
> diff --git a/arch/arm/dts/qcs404-evb.dts b/arch/arm/dts/qcs404-evb.dts
> index 84224a8a3d39..3bb580ba4e17 100644
> --- a/arch/arm/dts/qcs404-evb.dts
> +++ b/arch/arm/dts/qcs404-evb.dts
> @@ -378,7 +378,7 @@
>                                         compatible = "qcom,pms405-gpio";
>                                         reg = <0xc000 0x400>;
>                                         gpio-controller;
> -                                       gpio-count = <12>;
> +                                       gpio-ranges = <&pms405_gpios 0 0 12>;
>                                         #gpio-cells = <2>;
>                                         gpio-bank-name="pmic";

Looks like you forgot to drop this one.

-Sumit

>                                 };
> diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
> index cd5d890e9a45..a26e9f411ee0 100644
> --- a/arch/arm/dts/sdm845.dtsi
> +++ b/arch/arm/dts/sdm845.dtsi
> @@ -103,9 +103,8 @@
>                                         compatible = "qcom,pm8998-gpio";
>                                         reg = <0xc000 0x1a00>;
>                                         gpio-controller;
> -                                       gpio-count = <21>;
> +                                       gpio-ranges = <&pm8998_gpios 0 0 26>;
>                                         #gpio-cells = <2>;
> -                                       gpio-bank-name = "pm8998.";
>                                 };
>                         };
>
>
> --
> 2.42.1
>
diff mbox series

Patch

diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
index c41fee977813..6a4e3ccf17b1 100644
--- a/arch/arm/dts/dragonboard410c.dts
+++ b/arch/arm/dts/dragonboard410c.dts
@@ -170,9 +170,8 @@ 
 					compatible = "qcom,pm8916-gpio";
 					reg = <0xc000 0x400>;
 					gpio-controller;
-					gpio-count = <4>;
+					gpio-ranges = <&pm8916_gpios 0 0 4>;
 					#gpio-cells = <2>;
-					gpio-bank-name="pmic";
 				};
 			};
 
diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts
index 0d9c9f7a4922..146a0af8aafe 100644
--- a/arch/arm/dts/dragonboard820c.dts
+++ b/arch/arm/dts/dragonboard820c.dts
@@ -132,9 +132,8 @@ 
 					compatible = "qcom,pm8994-gpio";
 					reg = <0xc000 0x400>;
 					gpio-controller;
-					gpio-count = <24>;
+					gpio-ranges = <&pm8994_gpios 0 0 22>;
 					#gpio-cells = <2>;
-					gpio-bank-name="pm8994.";
 				};
 			};
 
diff --git a/arch/arm/dts/qcs404-evb.dts b/arch/arm/dts/qcs404-evb.dts
index 84224a8a3d39..3bb580ba4e17 100644
--- a/arch/arm/dts/qcs404-evb.dts
+++ b/arch/arm/dts/qcs404-evb.dts
@@ -378,7 +378,7 @@ 
 					compatible = "qcom,pms405-gpio";
 					reg = <0xc000 0x400>;
 					gpio-controller;
-					gpio-count = <12>;
+					gpio-ranges = <&pms405_gpios 0 0 12>;
 					#gpio-cells = <2>;
 					gpio-bank-name="pmic";
 				};
diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
index cd5d890e9a45..a26e9f411ee0 100644
--- a/arch/arm/dts/sdm845.dtsi
+++ b/arch/arm/dts/sdm845.dtsi
@@ -103,9 +103,8 @@ 
 					compatible = "qcom,pm8998-gpio";
 					reg = <0xc000 0x1a00>;
 					gpio-controller;
-					gpio-count = <21>;
+					gpio-ranges = <&pm8998_gpios 0 0 26>;
 					#gpio-cells = <2>;
-					gpio-bank-name = "pm8998.";
 				};
 			};