diff mbox series

[v2,3/3] ARM: dts: qcom-msm8960-cdp: align TLMM pin configuration with DT schema

Message ID 20221109105140.48196-3-krzysztof.kozlowski@linaro.org
State New
Headers
Series [v2,1/3] dt-bindings: pinctrl: qcom,msm8960: convert to dtschema |

Commit Message

Krzysztof Kozlowski Nov. 9, 2022, 10:51 a.m. UTC 
  DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

---

Changes since v1:
1. Add Rb tag
---
 arch/arm/boot/dts/qcom-msm8960-cdp.dts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Comments

Bjorn Andersson Nov. 10, 2022, 3:37 a.m. UTC | #1 
On Wed, Nov 09, 2022 at 11:51:40AM +0100, Krzysztof Kozlowski wrote:
> DT schema expects TLMM pin configuration nodes to be named with
> '-state' suffix and their optional children with '-pins' suffix.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> 
> ---
> 
> Changes since v1:
> 1. Add Rb tag
> ---
>  arch/arm/boot/dts/qcom-msm8960-cdp.dts | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> index 3a484ac53917..9a3a510f88ca 100644
> --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
> @@ -60,33 +60,32 @@ &gsbi5_serial {
>  };
>  
>  &msmgpio {
> -	spi1_default: spi1_default {
> -		 mux {
> -			pins = "gpio6", "gpio7", "gpio9";
> -			function = "gsbi1";
> -		 };
> -
> -		 mosi {
> +	spi1_default: spi1-default-state {
> +		 mosi-pins {
>  			pins = "gpio6";
> +			function = "gsbi1";
>  			drive-strength = <12>;
>  			bias-disable;
>  		 };
>  
> -		 miso {
> +		 miso-pins {
>  			pins = "gpio7";
> +			function = "gsbi1";
>  			drive-strength = <12>;
>  			bias-disable;
>  		 };
>  
> -		 cs {
> +		 cs-pins {
>  			pins = "gpio8";
> +			function = "gpio";

I'm changing this to "gsbi1" while applying this patch.

Regards,
Bjorn

>  			drive-strength = <12>;
>  			bias-disable;
>  			output-low;
>  		 };
>  
> -		 clk {
> +		 clk-pins {
>  			pins = "gpio9";
> +			function = "gsbi1";
>  			drive-strength = <12>;
>  			bias-disable;
>  		 };
> -- 
> 2.34.1
>
Krzysztof Kozlowski Nov. 10, 2022, 8:36 a.m. UTC | #2 
On 10/11/2022 04:37, Bjorn Andersson wrote:
> On Wed, Nov 09, 2022 at 11:51:40AM +0100, Krzysztof Kozlowski wrote:
>> DT schema expects TLMM pin configuration nodes to be named with
>> '-state' suffix and their optional children with '-pins' suffix.
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>>
>> ---
>>
>> Changes since v1:
>> 1. Add Rb tag
>> ---
>>  arch/arm/boot/dts/qcom-msm8960-cdp.dts | 19 +++++++++----------
>>  1 file changed, 9 insertions(+), 10 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
>> index 3a484ac53917..9a3a510f88ca 100644
>> --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
>> +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
>> @@ -60,33 +60,32 @@ &gsbi5_serial {
>>  };
>>  
>>  &msmgpio {
>> -	spi1_default: spi1_default {
>> -		 mux {
>> -			pins = "gpio6", "gpio7", "gpio9";
>> -			function = "gsbi1";
>> -		 };
>> -
>> -		 mosi {
>> +	spi1_default: spi1-default-state {
>> +		 mosi-pins {
>>  			pins = "gpio6";
>> +			function = "gsbi1";
>>  			drive-strength = <12>;
>>  			bias-disable;
>>  		 };
>>  
>> -		 miso {
>> +		 miso-pins {
>>  			pins = "gpio7";
>> +			function = "gsbi1";
>>  			drive-strength = <12>;
>>  			bias-disable;
>>  		 };
>>  
>> -		 cs {
>> +		 cs-pins {
>>  			pins = "gpio8";
>> +			function = "gpio";
> 
> I'm changing this to "gsbi1" while applying this patch.

Thanks Bjorn. This was missing in original DTS, so I assumed intention
was a GPIO-based CS. I guess SPI-based also makes sense...

Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index 3a484ac53917..9a3a510f88ca 100644
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -60,33 +60,32 @@  &gsbi5_serial {
 };
 
 &msmgpio {
-	spi1_default: spi1_default {
-		 mux {
-			pins = "gpio6", "gpio7", "gpio9";
-			function = "gsbi1";
-		 };
-
-		 mosi {
+	spi1_default: spi1-default-state {
+		 mosi-pins {
 			pins = "gpio6";
+			function = "gsbi1";
 			drive-strength = <12>;
 			bias-disable;
 		 };
 
-		 miso {
+		 miso-pins {
 			pins = "gpio7";
+			function = "gsbi1";
 			drive-strength = <12>;
 			bias-disable;
 		 };
 
-		 cs {
+		 cs-pins {
 			pins = "gpio8";
+			function = "gpio";
 			drive-strength = <12>;
 			bias-disable;
 			output-low;
 		 };
 
-		 clk {
+		 clk-pins {
 			pins = "gpio9";
+			function = "gsbi1";
 			drive-strength = <12>;
 			bias-disable;
 		 };