Commit a743dff7 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8996-tone: Rule out PM(I)8994 variants 



It looks like all Tone devices out in the wild are using PMI8996, which
suggests the PMI8994-variant DTs are not needed. Remove them.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220430162525.607946-1-konrad.dybcio@somainline.org
parent bb9bb412

arch/arm64/boot/dts/qcom/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-satsuki.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-sony-xperia-kitakami-sumire.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-sony-xperia-kitakami-suzuran.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-pmi8996-sony-xperia-tone-dora.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-pmi8996-sony-xperia-tone-kagura.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-pmi8996-sony-xperia-tone-keyaki.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-sony-xperia-tone-dora.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-sony-xperia-tone-kagura.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-sony-xperia-tone-keyaki.dtb

arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-dora.dts

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright (c) 2021, Konrad Dybcio <konrad.dybcio@somainline.org>

 */



#include "msm8996-sony-xperia-tone-dora.dts"

#include "pmi8996.dtsi"



/ {

	model = "Sony Xperia X Performance (PMI8996)";

};

arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-kagura.dts

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright (c) 2021, Konrad Dybcio <konrad.dybcio@somainline.org>

 */



#include "msm8996-sony-xperia-tone-kagura.dts"

#include "pmi8996.dtsi"



/ {

	model = "Sony Xperia XZ (PMI8996)";

};

arch/arm64/boot/dts/qcom/msm8996-pmi8996-sony-xperia-tone-keyaki.dts

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Copyright (c) 2021, Konrad Dybcio <konrad.dybcio@somainline.org>

 */



#include "msm8996-sony-xperia-tone-keyaki.dts"

#include "pmi8996.dtsi"



/ {

	model = "Sony Xperia XZs (PMI8996)";

};

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "msm8996.dtsi"

#include "pm8994.dtsi"

#include "pmi8994.dtsi"

#include "pmi8996.dtsi"

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
@@ -20,7 +21,6 @@ 


/ {

	qcom,msm-id = <246 0x30001>; /* MSM8996 V3.1 (Final) */

	qcom,pmic-id = <0x20009 0x2000a 0 0>; /* PM8994 + PMI8994 */

	qcom,board-id = <8 0>;



	chosen {