On 24/07/2022 16:04, Dmitry Baryshkov wrote:
> From: Yassine Oudjana <yassine.oudjana@xxxxxxxxx>
>
> 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.
>
> Signed-off-by: Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
> [DB: Applied the same change to Xiaomi Mi 5s Plus (natrium).]
> [DB: Dropped msm-id changes.]
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/Makefile | 4 ++--
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 3 ---
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 1 +
> ...m8996-xiaomi-natrium.dts => msm8996pro-xiaomi-natrium.dts} | 3 ++-
> ...m8996-xiaomi-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} | 3 ++-
> 5 files changed, 7 insertions(+), 7 deletions(-)
> rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-natrium.dts => msm8996pro-xiaomi-natrium.dts} (99%)
> rename arch/arm64/boot/dts/qcom/{msm8996-xiaomi-scorpio.dts => msm8996pro-xiaomi-scorpio.dts} (99%)
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 1d86a33de528..78534c33a61e 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Best regards,
Krzysztof
