* [PATCH v2 1/3] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux
2022-10-16 17:29 [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Caleb Connolly
@ 2022-10-16 17:29 ` Caleb Connolly
2022-10-17 1:12 ` Krzysztof Kozlowski
2022-10-16 17:29 ` [PATCH v2 2/3] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth Caleb Connolly
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Caleb Connolly @ 2022-10-16 17:29 UTC (permalink / raw)
To: caleb
Cc: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, devicetree,
Konrad Dybcio, Krzysztof Kozlowski, linux-arm-msm, linux-kernel,
Rob Herring
From: Caleb Connolly <caleb@connolly.tech>
The 4-pin configuration for UART6 is used for all or almost all SDM845
devices with built in Bluetooth. Move the pinmux configuration to
sdm845.dtsi in preparation to be removed from individual devices in
future patches.
Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 37 +------------------
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 25 +------------
.../boot/dts/qcom/sdm845-oneplus-common.dtsi | 28 +-------------
.../boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 27 +-------------
.../boot/dts/qcom/sdm845-xiaomi-polaris.dts | 27 +-------------
arch/arm64/boot/dts/qcom/sdm845.dtsi | 22 +++++++++++
6 files changed, 32 insertions(+), 134 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index b5eb8f7eca1d..923d5d681daa 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -860,6 +860,8 @@ i2c_tunnel: i2c-tunnel {
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth: wcn3990-bt {
compatible = "qcom,wcn3990-bt";
vddio-supply = <&src_pp1800_s4a>;
@@ -1079,41 +1081,6 @@ pinconf {
};
};
-&qup_uart6_default {
- /* Change pinmux to all 4 pins since CTS and RTS are connected */
- pinmux {
- pins = "gpio45", "gpio46",
- "gpio47", "gpio48";
- };
-
- pinconf-cts {
- /*
- * Configure a pull-down on 45 (CTS) to match the pull of
- * the Bluetooth module.
- */
- pins = "gpio45";
- bias-pull-down;
- };
-
- pinconf-rts-tx {
- /* We'll drive 46 (RTS) and 47 (TX), so no pull */
- pins = "gpio46", "gpio47";
- drive-strength = <2>;
- bias-disable;
- };
-
- pinconf-rx {
- /*
- * Configure a pull-up on 48 (RX). This is needed to avoid
- * garbage data when the TX pin of the Bluetooth module is
- * in tri-state (module powered off or not driving the
- * signal yet).
- */
- pins = "gpio48";
- bias-pull-up;
- };
-};
-
&qup_uart9_default {
pinconf-tx {
pins = "gpio4";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index c6e2c571b452..f87b1e2025b6 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -986,6 +986,8 @@ &uart3 {
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
@@ -1141,29 +1143,6 @@ pinconf {
};
};
-&qup_uart6_default {
- pinmux {
- pins = "gpio45", "gpio46", "gpio47", "gpio48";
- function = "qup6";
- };
-
- cts {
- pins = "gpio45";
- bias-disable;
- };
-
- rts-tx {
- pins = "gpio46", "gpio47";
- drive-strength = <2>;
- bias-disable;
- };
-
- rx {
- pins = "gpio48";
- bias-pull-up;
- };
-};
-
&qup_uart9_default {
pinconf-tx {
pins = "gpio4";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 392461c29e76..02ec0fa4e5f0 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -500,35 +500,11 @@ pinconf-rx {
};
};
-/*
- * Prevent garbage data on bluetooth UART lines
- */
-&qup_uart6_default {
- pinmux {
- pins = "gpio45", "gpio46", "gpio47", "gpio48";
- function = "qup6";
- };
-
- cts {
- pins = "gpio45";
- bias-pull-down;
- };
-
- rts-tx {
- pins = "gpio46", "gpio47";
- drive-strength = <2>;
- bias-disable;
- };
-
- rx {
- pins = "gpio48";
- bias-pull-up;
- };
-};
-
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
index 82c27f90d300..5dde27b7daf2 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
@@ -481,6 +481,8 @@ wcd_intr_default: wcd_intr_default {
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
@@ -567,28 +569,3 @@ &wifi {
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
};
-
-/* PINCTRL - additions to nodes defined in sdm845.dtsi */
-
-&qup_uart6_default {
- pinmux {
- pins = "gpio45", "gpio46", "gpio47", "gpio48";
- function = "qup6";
- };
-
- cts {
- pins = "gpio45";
- bias-disable;
- };
-
- rts-tx {
- pins = "gpio46", "gpio47";
- drive-strength = <2>;
- bias-disable;
- };
-
- rx {
- pins = "gpio48";
- bias-pull-up;
- };
-};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 7747081b9887..c8b439dcbca4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -639,6 +639,8 @@ wcd_intr_default: wcd-intr-default {
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
@@ -735,28 +737,3 @@ &wifi {
qcom,snoc-host-cap-skip-quirk;
status = "okay";
};
-
-/* PINCTRL - additions to nodes defined in sdm845.dtsi */
-
-&qup_uart6_default {
- pinmux {
- pins = "gpio45", "gpio46", "gpio47", "gpio48";
- function = "qup6";
- };
-
- cts {
- pins = "gpio45";
- bias-disable;
- };
-
- rts-tx {
- pins = "gpio46", "gpio47";
- drive-strength = <2>;
- bias-disable;
- };
-
- rx {
- pins = "gpio48";
- bias-pull-up;
- };
-};
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index f0e286715d1b..55de40bea684 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2971,6 +2971,28 @@ pinmux {
};
};
+ qup_uart6_4pin: qup-uart6-4pin-state {
+
+ cts-pins {
+ pins = "gpio45";
+ function = "qup6";
+ bias-pull-down;
+ };
+
+ rts-tx-pins {
+ pins = "gpio46", "gpio47";
+ function = "qup6";
+ drive-strength = <2>;
+ bias-disable;
+ };
+
+ rx-pins {
+ pins = "gpio48";
+ function = "qup6";
+ bias-pull-up;
+ };
+ };
+
qup_uart7_default: qup-uart7-default {
pinmux {
pins = "gpio95", "gpio96";
--
2.38.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/3] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth
2022-10-16 17:29 [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Caleb Connolly
2022-10-16 17:29 ` [PATCH v2 1/3] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux Caleb Connolly
@ 2022-10-16 17:29 ` Caleb Connolly
2022-10-16 17:29 ` [PATCH v2 3/3] arm64: dts: qcom: sdm845-*: fix uart6 aliases Caleb Connolly
2022-10-18 3:05 ` [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Caleb Connolly @ 2022-10-16 17:29 UTC (permalink / raw)
To: caleb
Cc: Dylan Van Assche, Andy Gross, Bjorn Andersson, devicetree,
Konrad Dybcio, Krzysztof Kozlowski, linux-arm-msm, linux-kernel,
Rob Herring
From: Dylan Van Assche <me@dylanvanassche.be>
Add serial1 alias, firmware name and use 4 pin UART pinmux.
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 83261c9bb4f2..bb77ccfdc68c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -23,6 +23,7 @@ / {
aliases {
display0 = &framebuffer0;
serial0 = &uart9;
+ serial1 = &uart6;
};
chosen {
@@ -693,9 +694,17 @@ config {
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
+ /*
+ * This path is relative to the qca/
+ * subdir under lib/firmware.
+ */
+ firmware-name = "axolotl/crnv21.bin";
+
vddio-supply = <&vreg_s4a_1p8>;
vddxo-supply = <&vreg_l7a_1p8>;
vddrf-supply = <&vreg_l17a_1p3>;
--
2.38.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 3/3] arm64: dts: qcom: sdm845-*: fix uart6 aliases
2022-10-16 17:29 [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Caleb Connolly
2022-10-16 17:29 ` [PATCH v2 1/3] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux Caleb Connolly
2022-10-16 17:29 ` [PATCH v2 2/3] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth Caleb Connolly
@ 2022-10-16 17:29 ` Caleb Connolly
2022-10-18 3:05 ` [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Caleb Connolly @ 2022-10-16 17:29 UTC (permalink / raw)
To: caleb
Cc: Andy Gross, Bjorn Andersson, devicetree, Konrad Dybcio,
Krzysztof Kozlowski, linux-arm-msm, linux-kernel, Rob Herring
From: Caleb Connolly <caleb@connolly.tech>
Some devices have been using hsuart0 as an alias for the bluetooth UART,
rename this to serial1
Signed-off-by: Caleb Connolly <caleb@connolly.tech>
---
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +-
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index 923d5d681daa..a8ae6de51af4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -16,7 +16,7 @@
/ {
aliases {
bluetooth0 = &bluetooth;
- hsuart0 = &uart6;
+ serial1 = &uart6;
serial0 = &uart9;
wifi0 = &wifi;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index f87b1e2025b6..215dd8098a44 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -22,7 +22,7 @@ / {
aliases {
serial0 = &uart9;
- hsuart0 = &uart6;
+ serial1 = &uart6;
};
chosen {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 02ec0fa4e5f0..5d99908d4628 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -19,7 +19,7 @@
/ {
aliases {
serial0 = &uart9;
- hsuart0 = &uart6;
+ serial1 = &uart6;
};
chosen {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
index 5dde27b7daf2..1646db2328d4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
@@ -35,7 +35,7 @@ / {
qcom,msm-id = <321 0x20001>;
aliases {
- hsuart0 = &uart6;
+ serial1 = &uart6;
};
gpio-keys {
--
2.38.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf
2022-10-16 17:29 [PATCH v2 0/3] arm64: dts: qcom: sdm845: commonize bluetooth pinconf Caleb Connolly
` (2 preceding siblings ...)
2022-10-16 17:29 ` [PATCH v2 3/3] arm64: dts: qcom: sdm845-*: fix uart6 aliases Caleb Connolly
@ 2022-10-18 3:05 ` Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2022-10-18 3:05 UTC (permalink / raw)
To: kc, caleb
Cc: Dmitry Baryshkov, devicetree, linux-kernel, agross, robh+dt,
linux-arm-msm, Krzysztof Kozlowski, Konrad Dybcio
On Sun, 16 Oct 2022 18:29:40 +0100, Caleb Connolly wrote:
> From: Caleb Connolly <caleb@connolly.tech>
>
> This series commonises the 4-pin pinconf used by almost all devices which have have
> Bluetooth on uart6 and removes the node from individual device DTS files.
>
> It also updates the old hsuart alias definitions to serial1. I'm happy to drop this if it
> may causes issues with userspace, but it seemed to make sense to throw in while we're at it.
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux
commit: 691dfbf54214c9c42444f357fc3a8103a10ad738
[2/3] arm64: dts: qcom: sdm845-shift-axolotl: fix Bluetooth
commit: 9833e23b6905d0ab342deb16a6c2312759ab5a0d
[3/3] arm64: dts: qcom: sdm845-*: fix uart6 aliases
commit: 4772c03002c3eb2fc6dd0f908af0d8371a622499
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread