summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
diff options
context:
space:
mode:
authorCaleb Connolly <caleb@connolly.tech>2022-10-16 19:29:41 +0200
committerBjorn Andersson <andersson@kernel.org>2022-10-18 05:01:46 +0200
commit691dfbf54214c9c42444f357fc3a8103a10ad738 (patch)
treec83bd3a359a15c5a8bd49c03ebc7dfa95c78ab2e /arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
parentarm64: dts: qcom: sc7280: Fix cpufreq-epss compatible (diff)
downloadlinux-691dfbf54214c9c42444f357fc3a8103a10ad738.tar.xz
linux-691dfbf54214c9c42444f357fc3a8103a10ad738.zip
arm64: dts: qcom: sdm845: commonize bluetooth UART pinmux
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> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20221016172944.1892206-2-kc@postmarketos.org
Diffstat (limited to 'arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi')
-rw-r--r--arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi27
1 files changed, 2 insertions, 25 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 163bf9c1a1d8..bcd8e7a97f1e 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -480,6 +480,8 @@
&uart6 {
status = "okay";
+ pinctrl-0 = <&qup_uart6_4pin>;
+
bluetooth {
compatible = "qcom,wcn3990-bt";
@@ -566,28 +568,3 @@
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;
- };
-};