Re: [PATCH 8/8] arm64: dts: qcom: msm8996-xiaomi-scorpio: Include msm8996pro.dtsi
From: Konrad Dybcio <hidden>
Date: 2021-10-15 19:04:05
Also in:
linux-arm-msm, linux-clk, linux-devicetree, lkml, phone-devel
On 14.10.2021 13:00, Yassine Oudjana wrote:
quoted hunk ↗ jump to hunk
Move msm8996.dtsi include to the end of the include chain. Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> --- arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 3 --- arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 1 + arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi index d239b01b8505..831cd39aff14 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi@@ -3,9 +3,6 @@ * Copyright (c) 2020, Yassine Oudjana <y.oudjana@protonmail.com> */ -/dts-v1/; - -#include "msm8996.dtsi" #include "pm8994.dtsi" #include "pmi8994.dtsi" #include <dt-bindings/input/input.h>diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts index 77d508e5164a..8ea5390f86ab 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts@@ -5,6 +5,7 @@ /dts-v1/; +#include "msm8996.dtsi" #include "msm8996-xiaomi-common.dtsi" #include <dt-bindings/sound/qcom,q6afe.h> #include <dt-bindings/sound/qcom,q6asm.h>diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts index ea2ca271fe7d..4ffe7be34285 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts
If this device uses msm8996pro, perhaps the filename should reflect that? I don't know whether renaming it would be "legal" though.. Konrad