* [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9
@ 2019-12-17 21:04 Douglas Anderson
2019-12-17 22:36 ` Matthias Kaehlcke
2019-12-18 10:11 ` Rajendra Nayak
0 siblings, 2 replies; 3+ messages in thread
From: Douglas Anderson @ 2019-12-17 21:04 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: linus.walleij, mka, Rajendra Nayak, Stephen Boyd,
Douglas Anderson, linux-arm-msm, Roja Rani Yarubandi,
linux-kernel, devicetree, Rob Herring, Mark Rutland
Commit f4a73f5e2633 ("pinctrl: qcom: sc7180: Add new qup functions")
has landed which means that we absolutely need to use the proper names
for the pinmuxing for I2C/UART numbers 2, 4, 7, and 9. Let's do it.
For reference:
- If you get only one of this commit and the pinctrl commit then none
of I2C/UART 2, 4, 7, and 9 will work.
- If you get neither of these commits then I2C 2, 4, 7, and 9 will
work but not UART.
...but despite the above it should be fine for this commit to land in
the Qualcomm tree because sc7180.dtsi only exists there (it hasn't
made it to mainline).
Fixes: ba3fc6496366 ("arm64: dts: sc7180: Add qupv3_0 and qupv3_1")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 52a58615ec06..faa9ef733204 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -717,7 +717,7 @@ pinmux {
qup_i2c2_default: qup-i2c2-default {
pinmux {
pins = "gpio15", "gpio16";
- function = "qup02";
+ function = "qup02_i2c";
};
};
@@ -731,7 +731,7 @@ pinmux {
qup_i2c4_default: qup-i2c4-default {
pinmux {
pins = "gpio115", "gpio116";
- function = "qup04";
+ function = "qup04_i2c";
};
};
@@ -752,7 +752,7 @@ pinmux {
qup_i2c7_default: qup-i2c7-default {
pinmux {
pins = "gpio6", "gpio7";
- function = "qup11";
+ function = "qup11_i2c";
};
};
@@ -766,7 +766,7 @@ pinmux {
qup_i2c9_default: qup-i2c9-default {
pinmux {
pins = "gpio46", "gpio47";
- function = "qup13";
+ function = "qup13_i2c";
};
};
@@ -867,7 +867,7 @@ pinmux {
qup_uart2_default: qup-uart2-default {
pinmux {
pins = "gpio15", "gpio16";
- function = "qup02";
+ function = "qup02_uart";
};
};
@@ -882,7 +882,7 @@ pinmux {
qup_uart4_default: qup-uart4-default {
pinmux {
pins = "gpio115", "gpio116";
- function = "qup04";
+ function = "qup04_uart";
};
};
@@ -905,7 +905,7 @@ pinmux {
qup_uart7_default: qup-uart7-default {
pinmux {
pins = "gpio6", "gpio7";
- function = "qup11";
+ function = "qup11_uart";
};
};
@@ -919,7 +919,7 @@ pinmux {
qup_uart9_default: qup-uart9-default {
pinmux {
pins = "gpio46", "gpio47";
- function = "qup13";
+ function = "qup13_uart";
};
};
--
2.24.1.735.g03f4e72817-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9
2019-12-17 21:04 [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9 Douglas Anderson
@ 2019-12-17 22:36 ` Matthias Kaehlcke
2019-12-18 10:11 ` Rajendra Nayak
1 sibling, 0 replies; 3+ messages in thread
From: Matthias Kaehlcke @ 2019-12-17 22:36 UTC (permalink / raw)
To: Douglas Anderson
Cc: Andy Gross, Bjorn Andersson, linus.walleij, Rajendra Nayak,
Stephen Boyd, linux-arm-msm, Roja Rani Yarubandi, linux-kernel,
devicetree, Rob Herring, Mark Rutland
On Tue, Dec 17, 2019 at 01:04:07PM -0800, Douglas Anderson wrote:
> Commit f4a73f5e2633 ("pinctrl: qcom: sc7180: Add new qup functions")
> has landed which means that we absolutely need to use the proper names
> for the pinmuxing for I2C/UART numbers 2, 4, 7, and 9. Let's do it.
>
> For reference:
> - If you get only one of this commit and the pinctrl commit then none
> of I2C/UART 2, 4, 7, and 9 will work.
> - If you get neither of these commits then I2C 2, 4, 7, and 9 will
> work but not UART.
>
> ...but despite the above it should be fine for this commit to land in
> the Qualcomm tree because sc7180.dtsi only exists there (it hasn't
> made it to mainline).
>
> Fixes: ba3fc6496366 ("arm64: dts: sc7180: Add qupv3_0 and qupv3_1")
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9
2019-12-17 21:04 [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9 Douglas Anderson
2019-12-17 22:36 ` Matthias Kaehlcke
@ 2019-12-18 10:11 ` Rajendra Nayak
1 sibling, 0 replies; 3+ messages in thread
From: Rajendra Nayak @ 2019-12-18 10:11 UTC (permalink / raw)
To: Douglas Anderson, Andy Gross, Bjorn Andersson
Cc: linus.walleij, mka, Stephen Boyd, linux-arm-msm,
Roja Rani Yarubandi, linux-kernel, devicetree, Rob Herring,
Mark Rutland
On 12/18/2019 2:34 AM, Douglas Anderson wrote:
> Commit f4a73f5e2633 ("pinctrl: qcom: sc7180: Add new qup functions")
> has landed which means that we absolutely need to use the proper names
> for the pinmuxing for I2C/UART numbers 2, 4, 7, and 9. Let's do it.
>
> For reference:
> - If you get only one of this commit and the pinctrl commit then none
> of I2C/UART 2, 4, 7, and 9 will work.
> - If you get neither of these commits then I2C 2, 4, 7, and 9 will
> work but not UART.
>
> ...but despite the above it should be fine for this commit to land in
> the Qualcomm tree because sc7180.dtsi only exists there (it hasn't
> made it to mainline).
>
> Fixes: ba3fc6496366 ("arm64: dts: sc7180: Add qupv3_0 and qupv3_1")
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org>
>
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 52a58615ec06..faa9ef733204 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -717,7 +717,7 @@ pinmux {
> qup_i2c2_default: qup-i2c2-default {
> pinmux {
> pins = "gpio15", "gpio16";
> - function = "qup02";
> + function = "qup02_i2c";
> };
> };
>
> @@ -731,7 +731,7 @@ pinmux {
> qup_i2c4_default: qup-i2c4-default {
> pinmux {
> pins = "gpio115", "gpio116";
> - function = "qup04";
> + function = "qup04_i2c";
> };
> };
>
> @@ -752,7 +752,7 @@ pinmux {
> qup_i2c7_default: qup-i2c7-default {
> pinmux {
> pins = "gpio6", "gpio7";
> - function = "qup11";
> + function = "qup11_i2c";
> };
> };
>
> @@ -766,7 +766,7 @@ pinmux {
> qup_i2c9_default: qup-i2c9-default {
> pinmux {
> pins = "gpio46", "gpio47";
> - function = "qup13";
> + function = "qup13_i2c";
> };
> };
>
> @@ -867,7 +867,7 @@ pinmux {
> qup_uart2_default: qup-uart2-default {
> pinmux {
> pins = "gpio15", "gpio16";
> - function = "qup02";
> + function = "qup02_uart";
> };
> };
>
> @@ -882,7 +882,7 @@ pinmux {
> qup_uart4_default: qup-uart4-default {
> pinmux {
> pins = "gpio115", "gpio116";
> - function = "qup04";
> + function = "qup04_uart";
> };
> };
>
> @@ -905,7 +905,7 @@ pinmux {
> qup_uart7_default: qup-uart7-default {
> pinmux {
> pins = "gpio6", "gpio7";
> - function = "qup11";
> + function = "qup11_uart";
> };
> };
>
> @@ -919,7 +919,7 @@ pinmux {
> qup_uart9_default: qup-uart9-default {
> pinmux {
> pins = "gpio46", "gpio47";
> - function = "qup13";
> + function = "qup13_uart";
> };
> };
>
>
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-18 10:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-17 21:04 [PATCH] arm64: dts: qcom: sc7180: Fix I2C/UART numbers 2, 4, 7, and 9 Douglas Anderson
2019-12-17 22:36 ` Matthias Kaehlcke
2019-12-18 10:11 ` Rajendra Nayak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).