summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Dybcio <konradybcio@gmail.com>2020-06-25 20:21:08 +0200
committerBjorn Andersson <bjorn.andersson@linaro.org>2020-07-27 23:43:04 -0700
commitd54df2210d2fc41fa094a415faa801be6d350d77 (patch)
treec0dc509d6ed3499f6a2fc61ca1a4ffd4799531d7
parent4acc8d64e56e70d0af319d7decafad2ad4e10f58 (diff)
downloadlinux-stable-d54df2210d2fc41fa094a415faa801be6d350d77.tar.gz
linux-stable-d54df2210d2fc41fa094a415faa801be6d350d77.tar.bz2
linux-stable-d54df2210d2fc41fa094a415faa801be6d350d77.zip
arm64: dts: qcom: bullhead: Move UART pinctrl to SoC
This pinout is common for every 8992-based device and should therefore reside in the SoC device tree. Also convert addresses into phandles. Signed-off-by: Konrad Dybcio <konradybcio@gmail.com> Link: https://lore.kernel.org/r/20200625182118.131476-5-konradybcio@gmail.com Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r--arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 4f70681e730d..5969b5cfdc85 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -23,15 +23,6 @@
stdout-path = "serial0:115200n8";
};
- soc {
- serial@f991e000 {
- status = "okay";
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&blsp1_uart2_default>;
- pinctrl-1 = <&blsp1_uart2_sleep>;
- };
- };
-
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
@@ -48,6 +39,10 @@
};
};
+&blsp1_uart2 {
+ status = "okay";
+};
+
&rpm_requests {
pm8994-regulators {
compatible = "qcom,rpm-pm8994-regulators";