| Message ID | 20220912061746.6311-35-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | be24fd19b1b42e0b38e77e0d6a379282bafb6aa6 |
| Headers | show |
| Series | pinctrl/arm64: qcom: fix some of Qualcomm pinctrl schema warnings | expand |
On 2022-09-12 08:17:40, 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> > --- > .../boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 ++-- > arch/arm64/boot/dts/qcom/sm6125.dtsi | 10 +++++----- > 2 files changed, 7 insertions(+), 7 deletions(-) > > 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 0aad2e94e757..6a8b88cc4385 100644 > --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts > +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts > @@ -87,7 +87,7 @@ &hsusb_phy1 { > }; > > &sdc2_off_state { > - sd-cd { > + sd-cd-pins { > pins = "gpio98"; > drive-strength = <2>; > bias-disable; > @@ -95,7 +95,7 @@ sd-cd { > }; > > &sdc2_on_state { > - sd-cd { > + sd-cd-pins { > pins = "gpio98"; > drive-strength = <2>; > bias-pull-up; > diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi > index 8c582a9e4ada..1fe3fa3ad877 100644 > --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi > @@ -387,19 +387,19 @@ tlmm: pinctrl@500000 { > #interrupt-cells = <2>; > > sdc2_off_state: sdc2-off-state { > - clk { > + clk-pins { > pins = "sdc2_clk"; > drive-strength = <2>; > bias-disable; > }; > > - cmd { > + cmd-pins { > pins = "sdc2_cmd"; > drive-strength = <2>; > bias-pull-up; > }; > > - data { > + data-pins { > pins = "sdc2_data"; > drive-strength = <2>; > bias-pull-up; > @@ -413,13 +413,13 @@ clk { > bias-disable; > }; > > - cmd { > + cmd-pins-pins { Is this double -pins-pins suffix intended? - Marijn > pins = "sdc2_cmd"; > drive-strength = <10>; > bias-pull-up; > }; > > - data { > + data-pins { > pins = "sdc2_data"; > drive-strength = <10>; > bias-pull-up; > -- > 2.34.1 >
On 09/10/2022 13:46, Marijn Suijten wrote: >> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi >> index 8c582a9e4ada..1fe3fa3ad877 100644 >> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi >> @@ -387,19 +387,19 @@ tlmm: pinctrl@500000 { >> #interrupt-cells = <2>; >> >> sdc2_off_state: sdc2-off-state { >> - clk { >> + clk-pins { >> pins = "sdc2_clk"; >> drive-strength = <2>; >> bias-disable; >> }; >> >> - cmd { >> + cmd-pins { >> pins = "sdc2_cmd"; >> drive-strength = <2>; >> bias-pull-up; >> }; >> >> - data { >> + data-pins { >> pins = "sdc2_data"; >> drive-strength = <2>; >> bias-pull-up; >> @@ -413,13 +413,13 @@ clk { >> bias-disable; >> }; >> >> - cmd { >> + cmd-pins-pins { > > Is this double -pins-pins suffix intended? > No, thanks for noticing it. Best regards, Krzysztof
On 10/10/2022 06:26, Krzysztof Kozlowski wrote: > On 09/10/2022 13:46, Marijn Suijten wrote: >>> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi >>> index 8c582a9e4ada..1fe3fa3ad877 100644 >>> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi >>> @@ -387,19 +387,19 @@ tlmm: pinctrl@500000 { >>> #interrupt-cells = <2>; >>> >>> sdc2_off_state: sdc2-off-state { >>> - clk { >>> + clk-pins { >>> pins = "sdc2_clk"; >>> drive-strength = <2>; >>> bias-disable; >>> }; >>> >>> - cmd { >>> + cmd-pins { >>> pins = "sdc2_cmd"; >>> drive-strength = <2>; >>> bias-pull-up; >>> }; >>> >>> - data { >>> + data-pins { >>> pins = "sdc2_data"; >>> drive-strength = <2>; >>> bias-pull-up; >>> @@ -413,13 +413,13 @@ clk { >>> bias-disable; >>> }; >>> >>> - cmd { >>> + cmd-pins-pins { >> >> Is this double -pins-pins suffix intended? >> > > No, thanks for noticing it. Wait, you commented on patch which was already merged. Fix is here already: https://lore.kernel.org/linux-devicetree/20220930192954.242546-11-krzysztof.kozlowski@linaro.org/ Best regards, Krzysztof
On 2022-10-10 07:31:31, Krzysztof Kozlowski wrote: > On 10/10/2022 06:26, Krzysztof Kozlowski wrote: > > On 09/10/2022 13:46, Marijn Suijten wrote: > >>> [..] > >>> - cmd { > >>> + cmd-pins-pins { > >> > >> Is this double -pins-pins suffix intended? > >> > > > > No, thanks for noticing it. > > Wait, you commented on patch which was already merged. Fix is here already: > https://lore.kernel.org/linux-devicetree/20220930192954.242546-11-krzysztof.kozlowski@linaro.org/ Correct, I came across this while working on another SoC on -next and wasn't sure if this patch was pulled in through some staging branch, or if you or I should send up a followup patch. Seems you've already done so, thanks! - Marijn
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 0aad2e94e757..6a8b88cc4385 100644 --- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts +++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts @@ -87,7 +87,7 @@ &hsusb_phy1 { }; &sdc2_off_state { - sd-cd { + sd-cd-pins { pins = "gpio98"; drive-strength = <2>; bias-disable; @@ -95,7 +95,7 @@ sd-cd { }; &sdc2_on_state { - sd-cd { + sd-cd-pins { pins = "gpio98"; drive-strength = <2>; bias-pull-up; diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi index 8c582a9e4ada..1fe3fa3ad877 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -387,19 +387,19 @@ tlmm: pinctrl@500000 { #interrupt-cells = <2>; sdc2_off_state: sdc2-off-state { - clk { + clk-pins { pins = "sdc2_clk"; drive-strength = <2>; bias-disable; }; - cmd { + cmd-pins { pins = "sdc2_cmd"; drive-strength = <2>; bias-pull-up; }; - data { + data-pins { pins = "sdc2_data"; drive-strength = <2>; bias-pull-up; @@ -413,13 +413,13 @@ clk { bias-disable; }; - cmd { + cmd-pins-pins { pins = "sdc2_cmd"; drive-strength = <10>; bias-pull-up; }; - data { + data-pins { pins = "sdc2_data"; drive-strength = <10>; bias-pull-up;
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> --- .../boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm6125.dtsi | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)