arm64: dts: qcom: msm8996-xiaomi-scorpio, natrium: Use MSM8996 Pro
authorYassine Oudjana <yassine.oudjana@gmail.com>
Sun, 24 Jul 2022 14:04:17 +0000 (17:04 +0300)
committerBjorn Andersson <andersson@kernel.org>
Mon, 17 Oct 2022 18:55:26 +0000 (13:55 -0500)
commitcea41be7ca66f0cdd0fa8e76ca799eed149d91c3
tree21e984b077cb1fd238c7fc0d8fdb27a3a36f2583
parent8898c9748a872866f8c2973e719b26bf7c6ab64e
arm64: dts: qcom: msm8996-xiaomi-scorpio, natrium: Use MSM8996 Pro

The Xiaomi Mi Note 2 has the MSM8996 Pro SoC. Rename the dts
to match, include msm8996pro.dtsi, and add the qcom,msm8996pro
compatible. To do that, the msm8996.dtsi include in msm8996-xiaomi-common
has to be moved to msm8996-xiaomi-gemini, the only device that needs it
included after this change.

Since MSM8996Pro is largely compatible with MSM8996, keep old compatible
too rather than insiting on qcom,msm8996pro only. This allows the code
that doesn't yet know about msm8996pro to continue supporting these
devices.

[DB: Dropped msm-id changes.]

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
[DB: Applied the same change to Xiaomi Mi 5s Plus (natrium).]
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220724140421.1933004-4-dmitry.baryshkov@linaro.org
arch/arm64/boot/dts/qcom/Makefile
arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts [moved from arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts with 99% similarity]
arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts [moved from arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts with 99% similarity]