Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c705745 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add device tree for sdm632 + PM8004"

parents 5383a84e 26c73359

arch/arm64/boot/dts/qcom/Makefile

+9 −3
Original line number Diff line number Diff line
@@ -341,11 +341,14 @@ msm8953-ext-codec-rcm-overlay.dtbo-base := msm8953.dtb \ 
msm8953-cdp-1200p-overlay.dtbo-base := msm8953.dtb

sdm450-cdp-s2-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb \

	sdm632-pm8004.dtb \

	msm8953-pmi632.dtb

sdm450-mtp-s3-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb

	sdm632.dtb \

	sdm632-pm8004.dtb

sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb

	sdm632.dtb \

	sdm632-pm8004.dtb

sdm632-rumi-overlay.dtbo-base := sdm632.dtb



sdm439-mtp-overlay.dtbo-base := sdm439.dtb \
@@ -418,7 +421,10 @@ dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \ 
dtb-$(CONFIG_ARCH_SDM632) += sdm632-rumi.dtb \

	sdm632-cdp-s2.dtb	\

	sdm632-mtp-s3.dtb	\

	sdm632-qrd-sku4.dtb

	sdm632-qrd-sku4.dtb	\

	sdm632-pm8004-cdp-s2.dtb \

	sdm632-pm8004-mtp-s3.dtb \

	sdm632-pm8004-qrd-sku4.dtb



dtb-$(CONFIG_ARCH_SDM439) += sdm439-mtp.dtb \

	sdm439-cdp.dtb \

arch/arm64/boot/dts/qcom/sdm632-cdp-s2.dts

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 + PMI8004 CDP S2";

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 CDP S2";

	compatible = "qcom,sdm632-cdp", "qcom,sdm632", "qcom,cdp";

	qcom,board-id = <1 2>;

	qcom,pmic-id = <0x010016 0x25 0xC 0x0>;

	qcom,pmic-id = <0x010016 0x25 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm632-mtp-s3.dts

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 
#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 + PMI8004 MTP S3";

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 MTP S3";

	compatible = "qcom,sdm632-mtp", "qcom,sdm632", "qcom,mtp";

	qcom,board-id = <8 3>;

	qcom,pmic-id = <0x010016 0x25 0xC 0x0>;

	qcom,pmic-id = <0x010016 0x25 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm632-pm8004-cdp-s2.dts

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "sdm632.dtsi"

#include "sdm450-pmi632-cdp-s2.dtsi"

#include "sdm450-pmi632.dtsi"

#include "sdm632-pm8004.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 + PM8004 CDP S2";

	compatible = "qcom,sdm632-cdp", "qcom,sdm632", "qcom,cdp";

	qcom,board-id = <1 2>;

	qcom,pmic-id = <0x010016 0x25 0xC 0x0>;

};





&soc {

	gpio_keys {

		/delete-node/home;

	};

};



&tlmm {

	tlmm_gpio_key {

		gpio_key_active: gpio_key_active {

			mux {

				pins = "gpio85", "gpio86", "gpio87";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87";

			};

		};



		gpio_key_suspend: gpio_key_suspend {

			mux {

				pins = "gpio85", "gpio86", "gpio87";

			};



			config {

				pins = "gpio85", "gpio86", "gpio87";

			};

		};

	};

};



&pm8953_vadc {

	pinctrl-0 = <&pa_therm1_default>;

	/delete-node/ chan@13;

};



&pm8953_mpps {

	/delete-node/ case_therm;

};



&thermal_zones {

	/delete-node/ case-therm-adc;

	/delete-node/ case-therm-step;

};

arch/arm64/boot/dts/qcom/sdm632-pm8004-mtp-s3.dts

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "sdm632.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"

#include "sdm450-pmi632.dtsi"

#include "sdm632-pm8004.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM632 + PMI632 + PM8004 MTP S3";

	compatible = "qcom,sdm632-mtp", "qcom,sdm632", "qcom,mtp";

	qcom,board-id = <8 3>;

	qcom,pmic-id = <0x010016 0x25 0xC 0x0>;

};



&pm8953_vadc {

	pinctrl-0 = <&pa_therm1_default>;

	/delete-node/ chan@13;

};



&pm8953_mpps {

	/delete-node/ case_therm;

};



&thermal_zones {

	/delete-node/ case-therm-adc;

	/delete-node/ case-therm-step;

};