Commit c6e72bd7 authored by Gustave Monce's avatar Gustave Monce Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8992/4-lumia*: Create a common DTS 



Lumia 950 and 950XL are both based on the Octagon board, sharing
the vast majority of components, configuration etc. Commonize it.

Signed-off-by: default avatarGustave Monce <gustave.monce@outlook.com>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210131013853.55810-6-konrad.dybcio@somainline.org


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

arch/arm64/boot/dts/qcom/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a3u-eur.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-samsung-a5u-eur.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-msft-lumia-talkman.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-msft-lumia-octagon-talkman.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-xiaomi-libra.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-msft-lumia-cityman.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-msft-lumia-octagon-cityman.dtb

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

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

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

arch/arm64/boot/dts/qcom/msm8992-msft-lumia-octagon-talkman.dts

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

/*

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

 * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>

 */



/dts-v1/;



#include "msm8992.dtsi"

#include "msm8994-msft-lumia-octagon.dtsi"



/ {

	model = "Microsoft Lumia 950";

	compatible = "microsoft,talkman", "qcom,msm8992";

};

arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts

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

/*

 * Copyright (c) 2020, Konrad Dybcio

 */



/dts-v1/;



#include "msm8992.dtsi"

#include "pm8994.dtsi"

#include "pmi8994.dtsi"

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

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



/ {

	model = "Microsoft Lumia 950";

	compatible = "microsoft,talkman", "qcom,msm8992";



	/* Most Lumia 950 users use GRUB to load their kernels,

	 * hence there is no need for msm-id and friends.

	 */



	/* This enables graphical output via bootloader-enabled display.

	 * acpi=no is required due to WP platforms having ACPI support, but

	 * only for Windows-based OSes.

	 */

	chosen {

		bootargs = "earlycon=efifb console=efifb acpi=no";



		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

	};

};



&blsp_i2c1 {

	status = "okay";



	rmi4-i2c-dev@4b {

		compatible = "syna,rmi4-i2c";

		reg = <0x4b>;

		#address-cells = <1>;

		#size-cells = <0>;



		interrupt-parent = <&tlmm>;

		interrupts = <77 IRQ_TYPE_EDGE_FALLING>;



		rmi4-f01@1 {

			reg = <0x01>;

			syna,nosleep-mode = <1>;

		};



		rmi4-f12@12 {

			reg = <0x12>;

			syna,sensor-type = <1>;

			syna,clip-x-low = <0>;

			syna,clip-x-high = <1440>;

			syna,clip-y-low = <0>;

			syna,clip-y-high = <2560>;

		};

	};

};



&sdhc_1 {

	status = "okay";



	mmc-hs200-1_8v;

};

arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dts

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

/*

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

 * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>

 */



/dts-v1/;



#include "msm8994.dtsi"

#include "msm8994-msft-lumia-octagon.dtsi"



/ {

	model = "Microsoft Lumia 950 XL";

	compatible = "microsoft,cityman", "qcom,msm8994";

};

arch/arm64/boot/dts/qcom/msm8994-msft-lumia-cityman.dts→arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi

+6 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause

/*

 * Common Board Device Tree for

 * Microsoft Mobile MSM8994 Octagon Platforms

 *

 * Copyright (c) 2020, Konrad Dybcio

 * Copyright (c) 2020, Gustave Monce <gustave.monce@outlook.com>

 */



/dts-v1/;



#include "msm8994.dtsi"

#include "pm8994.dtsi"

#include "pmi8994.dtsi"



/ {

	model = "Microsoft Lumia 950 XL";

	compatible = "microsoft,cityman", "qcom,msm8994";



	/*

	 * Most Lumia 950XL users use GRUB to load their kernels,

	 * Most Lumia 950/XL users use GRUB to load their kernels,

	 * hence there is no need for msm-id and friends.

	 */
@@ -55,7 +53,7 @@ rmi4-f12@12 { 
			syna,clip-x-low = <0>;

			syna,clip-x-high = <1440>;

			syna,clip-y-low = <0>;

			syna,clip-y-high = <2660>;

			syna,clip-y-high = <2560>;

		};

	};

};