arm64: dts: qcom: msm8992-lg-bullhead: Place LG Bullhead generic code into a DTSI...
authorJean THOMAS <virgule@jeanthomas.me>
Wed, 1 Dec 2021 23:18:31 +0000 (00:18 +0100)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 31 Jan 2022 20:49:11 +0000 (14:49 -0600)
This patch puts the generic code common across all hardware revisions
into a DTSI file.

It also prefixes the DTS filename with the vendor name, to follow the
naming convention used by other DTS files.

Signed-off-by: Jean THOMAS <virgule@jeanthomas.me>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211201231832.188634-1-virgule@jeanthomas.me
arch/arm64/boot/dts/qcom/Makefile
arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts [deleted file]
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts [new file with mode: 0644]
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi [new file with mode: 0644]

index 9db7438..8c6598f 100644 (file)
@@ -18,7 +18,7 @@ dtb-$(CONFIG_ARCH_QCOM)       += msm8916-samsung-a5u-eur.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8916-samsung-j5.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8916-samsung-serranove.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8916-wingtech-wt88047.dtb
-dtb-$(CONFIG_ARCH_QCOM)        += msm8992-bullhead-rev-101.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += msm8992-lg-bullhead-rev-101.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8992-msft-lumia-octagon-talkman.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8992-xiaomi-libra.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8994-angler-rev-101.dtb
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
deleted file mode 100644 (file)
index 4da6c44..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015, LGE Inc. All rights reserved.
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
- */
-
-/dts-v1/;
-
-#include "msm8992.dtsi"
-#include "pm8994.dtsi"
-#include "pmi8994.dtsi"
-
-/* cont_splash_mem has different memory mapping */
-/delete-node/ &cont_splash_mem;
-
-/ {
-       model = "LG Nexus 5X";
-       compatible = "lg,bullhead", "qcom,msm8992";
-       chassis-type = "handset";
-
-       /* required for bootloader to select correct board */
-       qcom,msm-id = <251 0>, <252 0>;
-       qcom,board-id = <0xb64 0>;
-       qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
-
-       /* Bullhead firmware doesn't support PSCI */
-       /delete-node/ psci;
-
-       aliases {
-               serial0 = &blsp1_uart2;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       reserved-memory {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               ramoops@1ff00000 {
-                       compatible = "ramoops";
-                       reg = <0x0 0x1ff00000 0x0 0x40000>;
-                       console-size = <0x10000>;
-                       record-size = <0x10000>;
-                       ftrace-size = <0x10000>;
-                       pmsg-size = <0x20000>;
-               };
-
-               cont_splash_mem: memory@3400000 {
-                       reg = <0 0x03400000 0 0x1200000>;
-                       no-map;
-               };
-       };
-};
-
-&blsp1_uart2 {
-       status = "okay";
-};
-
-&rpm_requests {
-       pm8994_regulators: pm8994-regulators {
-               compatible = "qcom,rpm-pm8994-regulators";
-
-               vdd_l1-supply = <&pm8994_s1>;
-               vdd_l2_26_28-supply = <&pm8994_s3>;
-               vdd_l3_11-supply = <&pm8994_s3>;
-               vdd_l4_27_31-supply = <&pm8994_s3>;
-               vdd_l5_7-supply = <&pm8994_s3>;
-               vdd_l6_12_32-supply = <&pm8994_s5>;
-               vdd_l8_16_30-supply = <&vph_pwr>;
-               vdd_l9_10_18_22-supply = <&vph_pwr>;
-               vdd_l13_19_23_24-supply = <&vph_pwr>;
-               vdd_l14_15-supply = <&pm8994_s5>;
-               vdd_l17_29-supply = <&vph_pwr>;
-               vdd_l20_21-supply = <&vph_pwr>;
-               vdd_l25-supply = <&pm8994_s5>;
-               vdd_lvs1_2 = <&pm8994_s4>;
-
-               /* S1, S2, S6 and S12 are managed by RPMPD */
-
-               pm8994_s1: s1 {
-                       regulator-min-microvolt = <800000>;
-                       regulator-max-microvolt = <800000>;
-               };
-
-               pm8994_s2: s2 {
-                       /* TODO */
-               };
-
-               pm8994_s3: s3 {
-                       regulator-min-microvolt = <1300000>;
-                       regulator-max-microvolt = <1300000>;
-               };
-
-               pm8994_s4: s4 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-allow-set-load;
-                       regulator-system-load = <325000>;
-               };
-
-               pm8994_s5: s5 {
-                       regulator-min-microvolt = <2150000>;
-                       regulator-max-microvolt = <2150000>;
-               };
-
-               pm8994_s7: s7 {
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-               };
-
-               /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
-
-               pm8994_l1: l1 {
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-               };
-
-               pm8994_l2: l2 {
-                       regulator-min-microvolt = <1250000>;
-                       regulator-max-microvolt = <1250000>;
-               };
-
-               pm8994_l3: l3 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-
-               pm8994_l4: l4 {
-                       regulator-min-microvolt = <1225000>;
-                       regulator-max-microvolt = <1225000>;
-               };
-
-               /* L5 is inaccessible from RPM */
-
-               pm8994_l6: l6 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               /* L7 is inaccessible from RPM */
-
-               pm8994_l8: l8 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l9: l9 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l10: l10 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l11: l11 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-
-               pm8994_l12: l12 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l13: l13 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2950000>;
-               };
-
-               pm8994_l14: l14 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-
-               pm8994_l15: l15 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l16: l16 {
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2700000>;
-               };
-
-               pm8994_l17: l17 {
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2700000>;
-               };
-
-               pm8994_l18: l18 {
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-               };
-
-               pm8994_l19: l19 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l20: l20 {
-                       regulator-min-microvolt = <2950000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       regulator-allow-set-load;
-                       regulator-system-load = <570000>;
-               };
-
-               pm8994_l21: l21 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
-
-               pm8994_l22: l22 {
-                       regulator-min-microvolt = <3100000>;
-                       regulator-max-microvolt = <3100000>;
-               };
-
-               pm8994_l23: l23 {
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-               };
-
-               pm8994_l24: l24 {
-                       regulator-min-microvolt = <3075000>;
-                       regulator-max-microvolt = <3150000>;
-               };
-
-               pm8994_l25: l25 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8994_l26: l26 {
-                       /* TODO: value from downstream
-                       regulator-min-microvolt = <987500>;
-                       fails to apply */
-               };
-
-               pm8994_l27: l27 {
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-               };
-
-               pm8994_l28: l28 {
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-               };
-
-               pm8994_l29: l29 {
-                       /* TODO: Unsupported voltage range.
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       qcom,init-voltage = <2800000>;
-                       */
-               };
-
-               pm8994_l30: l30 {
-                       /* TODO: get this verified
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       qcom,init-voltage = <1800000>;
-                       */
-               };
-
-               pm8994_l31: l31 {
-                       regulator-min-microvolt = <1262500>;
-                       regulator-max-microvolt = <1262500>;
-               };
-
-               pm8994_l32: l32 {
-                       /* TODO: get this verified
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       qcom,init-voltage = <1800000>;
-                       */
-               };
-       };
-
-       pmi8994_regulators: pmi8994-regulators {
-               compatible = "qcom,rpm-pmi8994-regulators";
-
-               vdd_s1-supply = <&vph_pwr>;
-               vdd_bst_byp-supply = <&vph_pwr>;
-
-               pmi8994_s1: s1 {};
-
-               /* S2 & S3 - VDD_GFX */
-
-               pmi8994_bby: boost-bypass {};
-       };
-};
-
-&sdhc1 {
-       status = "okay";
-
-       mmc-hs400-1_8v;
-};
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead-rev-101.dts
new file mode 100644 (file)
index 0000000..e6a5ebd
--- /dev/null
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) Jean Thomas <virgule@jeanthomas.me>
+ */
+
+/dts-v1/;
+
+#include "msm8992-lg-bullhead.dtsi"
+
+/ {
+       model = "LG Nexus 5X rev 1.01";
+
+       /* required for bootloader to select correct board */
+       qcom,board-id = <0xb64 0>;
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
new file mode 100644 (file)
index 0000000..3b0cc85
--- /dev/null
@@ -0,0 +1,302 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) 2015, LGE Inc. All rights reserved.
+ * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
+ */
+
+/dts-v1/;
+
+#include "msm8992.dtsi"
+#include "pm8994.dtsi"
+#include "pmi8994.dtsi"
+
+/* cont_splash_mem has different memory mapping */
+/delete-node/ &cont_splash_mem;
+
+/ {
+       model = "LG Nexus 5X";
+       compatible = "lg,bullhead", "qcom,msm8992";
+       chassis-type = "handset";
+
+       qcom,msm-id = <251 0>, <252 0>;
+       qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
+
+       /* Bullhead firmware doesn't support PSCI */
+       /delete-node/ psci;
+
+       aliases {
+               serial0 = &blsp1_uart2;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               ramoops@1ff00000 {
+                       compatible = "ramoops";
+                       reg = <0x0 0x1ff00000 0x0 0x40000>;
+                       console-size = <0x10000>;
+                       record-size = <0x10000>;
+                       ftrace-size = <0x10000>;
+                       pmsg-size = <0x20000>;
+               };
+
+               cont_splash_mem: memory@3400000 {
+                       reg = <0 0x03400000 0 0x1200000>;
+                       no-map;
+               };
+       };
+};
+
+&blsp1_uart2 {
+       status = "okay";
+};
+
+&rpm_requests {
+       pm8994_regulators: pm8994-regulators {
+               compatible = "qcom,rpm-pm8994-regulators";
+
+               vdd_l1-supply = <&pm8994_s1>;
+               vdd_l2_26_28-supply = <&pm8994_s3>;
+               vdd_l3_11-supply = <&pm8994_s3>;
+               vdd_l4_27_31-supply = <&pm8994_s3>;
+               vdd_l5_7-supply = <&pm8994_s3>;
+               vdd_l6_12_32-supply = <&pm8994_s5>;
+               vdd_l8_16_30-supply = <&vph_pwr>;
+               vdd_l9_10_18_22-supply = <&vph_pwr>;
+               vdd_l13_19_23_24-supply = <&vph_pwr>;
+               vdd_l14_15-supply = <&pm8994_s5>;
+               vdd_l17_29-supply = <&vph_pwr>;
+               vdd_l20_21-supply = <&vph_pwr>;
+               vdd_l25-supply = <&pm8994_s5>;
+               vdd_lvs1_2 = <&pm8994_s4>;
+
+               /* S1, S2, S6 and S12 are managed by RPMPD */
+
+               pm8994_s1: s1 {
+                       regulator-min-microvolt = <800000>;
+                       regulator-max-microvolt = <800000>;
+               };
+
+               pm8994_s2: s2 {
+                       /* TODO */
+               };
+
+               pm8994_s3: s3 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+               };
+
+               pm8994_s4: s4 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-allow-set-load;
+                       regulator-system-load = <325000>;
+               };
+
+               pm8994_s5: s5 {
+                       regulator-min-microvolt = <2150000>;
+                       regulator-max-microvolt = <2150000>;
+               };
+
+               pm8994_s7: s7 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+
+               /* S8, S9, S10 and S11 - SPMI-managed VDD_APC */
+
+               pm8994_l1: l1 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+
+               pm8994_l2: l2 {
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+               };
+
+               pm8994_l3: l3 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+
+               pm8994_l4: l4 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
+
+               /* L5 is inaccessible from RPM */
+
+               pm8994_l6: l6 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               /* L7 is inaccessible from RPM */
+
+               pm8994_l8: l8 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l9: l9 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l10: l10 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l11: l11 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+
+               pm8994_l12: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l13: l13 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
+
+               pm8994_l14: l14 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+
+               pm8994_l15: l15 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l16: l16 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+
+               pm8994_l17: l17 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+
+               pm8994_l18: l18 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+
+               pm8994_l19: l19 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l20: l20 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       regulator-allow-set-load;
+                       regulator-system-load = <570000>;
+               };
+
+               pm8994_l21: l21 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+
+               pm8994_l22: l22 {
+                       regulator-min-microvolt = <3100000>;
+                       regulator-max-microvolt = <3100000>;
+               };
+
+               pm8994_l23: l23 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+
+               pm8994_l24: l24 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3150000>;
+               };
+
+               pm8994_l25: l25 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8994_l26: l26 {
+                       /* TODO: value from downstream
+                       regulator-min-microvolt = <987500>;
+                       fails to apply */
+               };
+
+               pm8994_l27: l27 {
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+
+               pm8994_l28: l28 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+               };
+
+               pm8994_l29: l29 {
+                       /* TODO: Unsupported voltage range.
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+                       qcom,init-voltage = <2800000>;
+                       */
+               };
+
+               pm8994_l30: l30 {
+                       /* TODO: get this verified
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,init-voltage = <1800000>;
+                       */
+               };
+
+               pm8994_l31: l31 {
+                       regulator-min-microvolt = <1262500>;
+                       regulator-max-microvolt = <1262500>;
+               };
+
+               pm8994_l32: l32 {
+                       /* TODO: get this verified
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,init-voltage = <1800000>;
+                       */
+               };
+       };
+
+       pmi8994_regulators: pmi8994-regulators {
+               compatible = "qcom,rpm-pmi8994-regulators";
+
+               vdd_s1-supply = <&vph_pwr>;
+               vdd_bst_byp-supply = <&vph_pwr>;
+
+               pmi8994_s1: s1 {};
+
+               /* S2 & S3 - VDD_GFX */
+
+               pmi8994_bby: boost-bypass {};
+       };
+};
+
+&sdhc1 {
+       status = "okay";
+
+       mmc-hs400-1_8v;
+};