2022-06-06 16:26:26

by Luca Weiss

Subject: [PATCH 1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl

As part of a recent cleanup commit, the pinctrl for a few uart and i2c
nodes was removed. Adjust the names and/or add it back and assign it to
the uart and i2c nodes.

Fixes: 1dfe967ec7cf ("ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI")
Signed-off-by: Luca Weiss <[email protected]>
---
Bjorn, could you please pick this up for -fixes so it lands in an
upcoming 5.19-rc?

arch/arm/boot/dts/qcom-msm8974.dtsi | 30 +++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 814ad0b46232..c3b8a6d63027 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -506,6 +506,8 @@ blsp1_uart2: serial@f991e000 {
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
+ pinctrl-names = "default";
+ pinctrl-0 = <&blsp1_uart2_default>;
status = "disabled";
};

@@ -581,6 +583,9 @@ blsp2_uart1: serial@f995d000 {
interrupts = <GIC_SPI 113 IRQ_TYPE_NONE>;
clocks = <&gcc GCC_BLSP2_UART1_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
clock-names = "core", "iface";
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&blsp2_uart1_default>;
+ pinctrl-1 = <&blsp2_uart1_sleep>;
status = "disabled";
};

@@ -599,6 +604,8 @@ blsp2_uart4: serial@f9960000 {
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP2_UART4_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
clock-names = "core", "iface";
+ pinctrl-names = "default";
+ pinctrl-0 = <&blsp2_uart4_default>;
status = "disabled";
};

@@ -639,6 +646,9 @@ blsp2_i2c6: i2c@f9968000 {
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
clock-names = "core", "iface";
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&blsp2_i2c6_default>;
+ pinctrl-1 = <&blsp2_i2c6_sleep>;
#address-cells = <1>;
#size-cells = <0>;
};
@@ -1256,7 +1266,7 @@ cd {
};
};

- blsp1_uart2_active: blsp1-uart2-active {
+ blsp1_uart2_default: blsp1-uart2-default {
rx {
pins = "gpio5";
function = "blsp_uart2";
@@ -1272,7 +1282,7 @@ tx {
};
};

- blsp2_uart1_active: blsp2-uart1-active {
+ blsp2_uart1_default: blsp2-uart1-default {
tx-rts {
pins = "gpio41", "gpio44";
function = "blsp_uart7";
@@ -1295,7 +1305,7 @@ blsp2_uart1_sleep: blsp2-uart1-sleep {
bias-pull-down;
};

- blsp2_uart4_active: blsp2-uart4-active {
+ blsp2_uart4_default: blsp2-uart4-default {
tx-rts {
pins = "gpio53", "gpio56";
function = "blsp_uart10";
@@ -1406,7 +1416,19 @@ blsp2_i2c5_sleep: blsp2-i2c5-sleep {
bias-pull-up;
};

- /* BLSP2_I2C6 info is missing - nobody uses it though? */
+ blsp2_i2c6_default: blsp2-i2c6-default {
+ pins = "gpio87", "gpio88";
+ function = "blsp_i2c12";
+ drive-strength = <2>;
+ bias-disable;
+ };
+
+ blsp2_i2c6_sleep: blsp2-i2c6-sleep {
+ pins = "gpio87", "gpio88";
+ function = "blsp_i2c12";
+ drive-strength = <2>;
+ bias-pull-up;
+ };

spi8_default: spi8_default {
mosi {
--
2.36.1

2022-06-06 22:14:21

by Konrad Dybcio

Subject: Re: [PATCH 1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl

On 06/06/2022 18:04, Luca Weiss wrote:
> As part of a recent cleanup commit, the pinctrl for a few uart and i2c
> nodes was removed. Adjust the names and/or add it back and assign it to
> the uart and i2c nodes.
>
> Fixes: 1dfe967ec7cf ("ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI")
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> Bjorn, could you please pick this up for -fixes so it lands in an
> upcoming 5.19-rc?

No idea how I did this. Thanks for spotting it though.


Reviewed-by: Konrad Dybcio <[email protected]>


Konrad

> arch/arm/boot/dts/qcom-msm8974.dtsi | 30 +++++++++++++++++++++++++----
> 1 file changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 814ad0b46232..c3b8a6d63027 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -506,6 +506,8 @@ blsp1_uart2: serial@f991e000 {
> interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
> clock-names = "core", "iface";
> + pinctrl-names = "default";
> + pinctrl-0 = <&blsp1_uart2_default>;
> status = "disabled";
> };
>
> @@ -581,6 +583,9 @@ blsp2_uart1: serial@f995d000 {
> interrupts = <GIC_SPI 113 IRQ_TYPE_NONE>;
> clocks = <&gcc GCC_BLSP2_UART1_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
> clock-names = "core", "iface";
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&blsp2_uart1_default>;
> + pinctrl-1 = <&blsp2_uart1_sleep>;
> status = "disabled";
> };
>
> @@ -599,6 +604,8 @@ blsp2_uart4: serial@f9960000 {
> interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&gcc GCC_BLSP2_UART4_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
> clock-names = "core", "iface";
> + pinctrl-names = "default";
> + pinctrl-0 = <&blsp2_uart4_default>;
> status = "disabled";
> };
>
> @@ -639,6 +646,9 @@ blsp2_i2c6: i2c@f9968000 {
> interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
> clock-names = "core", "iface";
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&blsp2_i2c6_default>;
> + pinctrl-1 = <&blsp2_i2c6_sleep>;
> #address-cells = <1>;
> #size-cells = <0>;
> };
> @@ -1256,7 +1266,7 @@ cd {
> };
> };
>
> - blsp1_uart2_active: blsp1-uart2-active {
> + blsp1_uart2_default: blsp1-uart2-default {
> rx {
> pins = "gpio5";
> function = "blsp_uart2";
> @@ -1272,7 +1282,7 @@ tx {
> };
> };
>
> - blsp2_uart1_active: blsp2-uart1-active {
> + blsp2_uart1_default: blsp2-uart1-default {
> tx-rts {
> pins = "gpio41", "gpio44";
> function = "blsp_uart7";
> @@ -1295,7 +1305,7 @@ blsp2_uart1_sleep: blsp2-uart1-sleep {
> bias-pull-down;
> };
>
> - blsp2_uart4_active: blsp2-uart4-active {
> + blsp2_uart4_default: blsp2-uart4-default {
> tx-rts {
> pins = "gpio53", "gpio56";
> function = "blsp_uart10";
> @@ -1406,7 +1416,19 @@ blsp2_i2c5_sleep: blsp2-i2c5-sleep {
> bias-pull-up;
> };
>
> - /* BLSP2_I2C6 info is missing - nobody uses it though? */
> + blsp2_i2c6_default: blsp2-i2c6-default {
> + pins = "gpio87", "gpio88";
> + function = "blsp_i2c12";
> + drive-strength = <2>;
> + bias-disable;
> + };
> +
> + blsp2_i2c6_sleep: blsp2-i2c6-sleep {
> + pins = "gpio87", "gpio88";
> + function = "blsp_i2c12";
> + drive-strength = <2>;
> + bias-pull-up;
> + };
>
> spi8_default: spi8_default {
> mosi {

2022-07-03 04:45:04

by Bjorn Andersson

Subject: Re: [PATCH 1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl

On Mon, 6 Jun 2022 18:04:21 +0200, Luca Weiss wrote:
> As part of a recent cleanup commit, the pinctrl for a few uart and i2c
> nodes was removed. Adjust the names and/or add it back and assign it to
> the uart and i2c nodes.
>
>

Applied, thanks!

[1/2] ARM: dts: qcom: msm8974: re-add missing pinctrl
commit: 03110b46c99bb0c712f46bec660b1c3f674ce100
[2/2] ARM: dts: qcom: msm8974-*: re-add remoteproc supplies
(no commit info)

Best regards,
--
Bjorn Andersson <[email protected]>