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

arm64: dts: qcom: sdm630-xperia: Retire sdm630-sony-xperia-ganges.dtsi 



After further consideration, it is not worth to keep another
separate DTSI, as the differences between Nile and Ganges are
very minimal. Instead, let's just address the minimal differences
between Kirin and Mermaid.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210728222542.54269-34-konrad.dybcio@somainline.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent fcbcd062

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts

+11 −1
Original line number Diff line number Diff line
@@ -5,9 +5,19 @@ 


/dts-v1/;



#include "sdm630-sony-xperia-ganges.dtsi"

#include "sdm630.dtsi"

#include "sdm630-sony-xperia-nile.dtsi"



/ {

	model = "Sony Xperia 10";

	compatible = "sony,kirin-row", "qcom,sdm630";



	chosen {

		framebuffer@9d400000 {

			reg = <0 0x9d400000 0 (2520 * 1080 * 4)>;

			height = <2520>;

		};

	};

};



/delete-node/ &vreg_l18a_1v8;

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges.dtsi

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

/*

 * Copyright (c) 2020, Martin Botka

 */



/dts-v1/;



/* Ganges is very similar to Nile, but

 * there are some differences that will need

 * to be addresed when more peripherals are

 * enabled upstream. Hence the separate DTSI.

 */

#include "sdm630-sony-xperia-nile.dtsi"



/ {

	chosen {

		framebuffer@9d400000 {

			reg = <0 0x9d400000 0 (2520 * 1080 * 4)>;

			height = <2520>;

		};

	};



	/* Yes, this is intentional.

	 * Ganges devices only use gpio-keys for

	 * Volume Down, but currently there's an

	 * issue with it that has to be resolved.

	 * Until then, let's not make the kernel panic

	 */

	/delete-node/ gpio-keys;



	soc {



		i2c@c175000 {

			status = "okay";



			/* Novatek touchscreen */

		};

	};



};

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-discovery.dts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/dts-v1/;



#include "sdm630.dtsi"

#include "sdm630-sony-xperia-nile.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-pioneer.dts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/dts-v1/;



#include "sdm630.dtsi"

#include "sdm630-sony-xperia-nile.dtsi"



/ {

arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile-voyager.dts

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/dts-v1/;



#include "sdm630.dtsi"

#include "sdm630-sony-xperia-nile.dtsi"



/ {