OSDN Git Service

ARM: dts: qcom-msm8916-samsung-e2015: Include dts from arm64
authorLin, Meng-Bo <linmengbo0689@protonmail.com>
Sun, 24 Jul 2022 09:55:37 +0000 (09:55 +0000)
committerBjorn Andersson <andersson@kernel.org>
Mon, 29 Aug 2022 21:13:32 +0000 (16:13 -0500)
After adding all necessary support for MSM8916 SMP/cpuidle without PSCI
on ARM32, build the Samsung Galaxy E5/E7/Grand Max device trees from the
arm64 tree together with the ARM32 include to allow booting this device on
ARM32.

The approach to include device tree files from other architectures is
inspired from e.g. the Raspberry Pi (bcm2711-rpi-4-b.dts) where this is
used to build the device tree for both ARM32 and ARM64.

Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220724095413.14135-1-linmengbo0689@protonmail.com
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts [new file with mode: 0644]
arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts [new file with mode: 0644]
arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts [new file with mode: 0644]

index 05d8aef..3bc6bd5 100644 (file)
@@ -1047,6 +1047,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-ipq8064-rb3011.dtb \
        qcom-msm8226-samsung-s3ve3g.dtb \
        qcom-msm8660-surf.dtb \
+       qcom-msm8916-samsung-e5.dtb \
+       qcom-msm8916-samsung-e7.dtb \
+       qcom-msm8916-samsung-grandmax.dtb \
        qcom-msm8916-samsung-serranove.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-lge-nexus5-hammerhead.dtb \
diff --git a/arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts b/arch/arm/boot/dts/qcom-msm8916-samsung-e5.dts
new file mode 100644 (file)
index 0000000..c8d34de
--- /dev/null
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include "arm64/qcom/msm8916-samsung-e5.dts"
+#include "qcom-msm8916-smp.dtsi"
diff --git a/arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts b/arch/arm/boot/dts/qcom-msm8916-samsung-e7.dts
new file mode 100644 (file)
index 0000000..85be286
--- /dev/null
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include "arm64/qcom/msm8916-samsung-e7.dts"
+#include "qcom-msm8916-smp.dtsi"
diff --git a/arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts b/arch/arm/boot/dts/qcom-msm8916-samsung-grandmax.dts
new file mode 100644 (file)
index 0000000..d3abe05
--- /dev/null
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-2.0-only
+#include "arm64/qcom/msm8916-samsung-grandmax.dts"
+#include "qcom-msm8916-smp.dtsi"