2022-09-26 08:12:47

by Krzysztof Kozlowski

Subject: [PATCH v2 02/33] arm64: dts: qcom: ipq6018: align TLMM pin configuration with DT schema

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 <[email protected]>
---
arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 4 ++--
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
index afc2dc79767d..e1fe7d598580 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
@@ -51,13 +51,13 @@ flash@0 {
};

&tlmm {
- i2c_1_pins: i2c-1-pins {
+ i2c_1_pins: i2c-1-state {
pins = "gpio42", "gpio43";
function = "blsp2_i2c";
drive-strength = <8>;
};

- spi_0_pins: spi-0-pins {
+ spi_0_pins: spi-0-state {
pins = "gpio38", "gpio39", "gpio40", "gpio41";
function = "blsp1_spi";
drive-strength = <8>;
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index a7c7ca980a71..9b9f778090e1 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -218,14 +218,14 @@ tlmm: pinctrl@1000000 {
interrupt-controller;
#interrupt-cells = <2>;

- serial_3_pins: serial3-pinmux {
+ serial_3_pins: serial3-state {
pins = "gpio44", "gpio45";
function = "blsp2_uart";
drive-strength = <8>;
bias-pull-down;
};

- qpic_pins: qpic-pins {
+ qpic_pins: qpic-state {
pins = "gpio1", "gpio3", "gpio4",
"gpio5", "gpio6", "gpio7",
"gpio8", "gpio10", "gpio11",
--
2.34.1

2022-09-27 14:17:13

by Konrad Dybcio

Subject: Re: [PATCH v2 02/33] arm64: dts: qcom: ipq6018: align TLMM pin configuration with DT schema

On 26.09.2022 09:43, 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 <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 4 ++--
> arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
> index afc2dc79767d..e1fe7d598580 100644
> --- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
> +++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
> @@ -51,13 +51,13 @@ flash@0 {
> };
>
> &tlmm {
> - i2c_1_pins: i2c-1-pins {
> + i2c_1_pins: i2c-1-state {
> pins = "gpio42", "gpio43";
> function = "blsp2_i2c";
> drive-strength = <8>;
> };
>
> - spi_0_pins: spi-0-pins {
> + spi_0_pins: spi-0-state {
> pins = "gpio38", "gpio39", "gpio40", "gpio41";
> function = "blsp1_spi";
> drive-strength = <8>;
> diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> index a7c7ca980a71..9b9f778090e1 100644
> --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> @@ -218,14 +218,14 @@ tlmm: pinctrl@1000000 {
> interrupt-controller;
> #interrupt-cells = <2>;
>
> - serial_3_pins: serial3-pinmux {
> + serial_3_pins: serial3-state {
> pins = "gpio44", "gpio45";
> function = "blsp2_uart";
> drive-strength = <8>;
> bias-pull-down;
> };
>
> - qpic_pins: qpic-pins {
> + qpic_pins: qpic-state {
> pins = "gpio1", "gpio3", "gpio4",
> "gpio5", "gpio6", "gpio7",
> "gpio8", "gpio10", "gpio11",