arm64: dts: qcom: msm8992/4-lumia*: Create a common DTS

Lumia 950 and 950XL are both based on the Octagon board, sharing
the vast majority of components, configuration etc. Commonize it.

Signed-off-by: Gustave Monce <gustave.monce@outlook.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210131013853.55810-6-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 80ff80a9a66c20932fb6b6ba692f1e17089fdff7..549a7a2151d455f241f24ba88634a19c59bfbcbe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -13,10 +13,10 @@ dtb-$(CONFIG_ARCH_QCOM)     += msm8916-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8916-samsung-a3u-eur.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8916-samsung-a5u-eur.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8992-bullhead-rev-101.dtb
-dtb-$(CONFIG_ARCH_QCOM)        += msm8992-msft-lumia-talkman.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
-dtb-$(CONFIG_ARCH_QCOM)        += msm8994-msft-lumia-cityman.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += msm8994-msft-lumia-octagon-cityman.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8994-sony-xperia-kitakami-ivy.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8994-sony-xperia-kitakami-karin.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8994-sony-xperia-kitakami-satsuki.dtb

diff --git a/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-octagon-talkman.dts b/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-octagon-talkman.dts
new file mode 100644 (file)
index 0000000..5322b9c
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-octagon-talkman.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2020, Konrad Dybcio <konrad.dybcio@somainline.org>
+ * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>
+ */
+
+/dts-v1/;
+
+#include "msm8992.dtsi"
+#include "msm8994-msft-lumia-octagon.dtsi"
+
+/ {
+       model = "Microsoft Lumia 950";
+       compatible = "microsoft,talkman", "qcom,msm8992";
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts b/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts
deleted file mode 100644 (file)
index c337a86..0000000
--- a/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts
+++ /dev/null
@@ -1,67 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2020, Konrad Dybcio
- */
-
-/dts-v1/;
-
-#include "msm8992.dtsi"
-#include "pm8994.dtsi"
-#include "pmi8994.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/gpio-keys.h>
-
-/ {
-       model = "Microsoft Lumia 950";
-       compatible = "microsoft,talkman", "qcom,msm8992";
-
-       /* Most Lumia 950 users use GRUB to load their kernels,
-        * hence there is no need for msm-id and friends.
-        */
-
-       /* This enables graphical output via bootloader-enabled display.
-        * acpi=no is required due to WP platforms having ACPI support, but
-        * only for Windows-based OSes.
-        */
-       chosen {
-               bootargs = "earlycon=efifb console=efifb acpi=no";
-
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-       };
-};
-
-&blsp_i2c1 {
-       status = "okay";
-
-       rmi4-i2c-dev@4b {
-               compatible = "syna,rmi4-i2c";
-               reg = <0x4b>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <77 IRQ_TYPE_EDGE_FALLING>;
-
-               rmi4-f01@1 {
-                       reg = <0x01>;
-                       syna,nosleep-mode = <1>;
-               };
-
-               rmi4-f12@12 {
-                       reg = <0x12>;
-                       syna,sensor-type = <1>;
-                       syna,clip-x-low = <0>;
-                       syna,clip-x-high = <1440>;
-                       syna,clip-y-low = <0>;
-                       syna,clip-y-high = <2560>;
-               };
-       };
-};
-
-&sdhc_1 {
-       status = "okay";
-
-       mmc-hs200-1_8v;
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts
deleted file mode 100644 (file)
index 2d989a7..0000000
--- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts
+++ /dev/null
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2020, Konrad Dybcio
- */
-
-/dts-v1/;
-
-#include "msm8994.dtsi"
-#include "pm8994.dtsi"
-#include "pmi8994.dtsi"
-
-/ {
-       model = "Microsoft Lumia 950 XL";
-       compatible = "microsoft,cityman", "qcom,msm8994";
-
-       /*
-        * Most Lumia 950XL users use GRUB to load their kernels,
-        * hence there is no need for msm-id and friends.
-        */
-
-       /*
-        * This enables graphical output via bootloader-enabled display.
-        * acpi=no is required due to WP platforms having ACPI support, but
-        * only for Windows-based OSes.
-        */
-       chosen {
-               bootargs = "earlycon=efifb console=efifb acpi=no";
-
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-       };
-};
-
-&blsp1_i2c1 {
-       status = "okay";
-
-       rmi4-i2c-dev@4b {
-               compatible = "syna,rmi4-i2c";
-               reg = <0x4b>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <77 IRQ_TYPE_EDGE_FALLING>;
-
-               rmi4-f01@1 {
-                       reg = <0x01>;
-                       syna,nosleep-mode = <1>;
-               };
-
-               rmi4-f12@12 {
-                       reg = <0x12>;
-                       syna,sensor-type = <1>;
-                       syna,clip-x-low = <0>;
-                       syna,clip-x-high = <1440>;
-                       syna,clip-y-low = <0>;
-                       syna,clip-y-high = <2660>;
-               };
-       };
-};
-
-&blsp1_uart2 {
-       status = "okay";
-};
-
-&blsp2_uart2 {
-       status = "okay";
-};
-
-&sdhc1 {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dts b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dts
new file mode 100644 (file)
index 0000000..d0aaf57
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2020, Konrad Dybcio <konrad.dybcio@somainline.org>
+ * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>
+ */
+
+/dts-v1/;
+
+#include "msm8994.dtsi"
+#include "msm8994-msft-lumia-octagon.dtsi"
+
+/ {
+       model = "Microsoft Lumia 950 XL";
+       compatible = "microsoft,cityman", "qcom,msm8994";
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
new file mode 100644 (file)
index 0000000..53628dd
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Common Board Device Tree for
+ * Microsoft Mobile MSM8994 Octagon Platforms
+ *
+ * Copyright (c) 2020, Konrad Dybcio
+ * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>
+ */
+
+#include "pm8994.dtsi"
+#include "pmi8994.dtsi"
+
+/ {
+       /*
+        * Most Lumia 950/XL users use GRUB to load their kernels,
+        * hence there is no need for msm-id and friends.
+        */
+
+       /*
+        * This enables graphical output via bootloader-enabled display.
+        * acpi=no is required due to WP platforms having ACPI support, but
+        * only for Windows-based OSes.
+        */
+       chosen {
+               bootargs = "earlycon=efifb console=efifb acpi=no";
+
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+       };
+};
+
+&blsp1_i2c1 {
+       status = "okay";
+
+       rmi4-i2c-dev@4b {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x4b>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <77 IRQ_TYPE_EDGE_FALLING>;
+
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
+               };
+
+               rmi4-f12@12 {
+                       reg = <0x12>;
+                       syna,sensor-type = <1>;
+                       syna,clip-x-low = <0>;
+                       syna,clip-x-high = <1440>;
+                       syna,clip-y-low = <0>;
+                       syna,clip-y-high = <2560>;
+               };
+       };
+};
+
+&blsp1_uart2 {
+       status = "okay";
+};
+
+&blsp2_uart2 {
+       status = "okay";
+};
+
+&sdhc1 {
+       status = "okay";
+};