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

Commit e764712f 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 overlay for 8996 V3"

parents 305eb0fc d03192eb

arch/arm/boot/dts/qcom/Makefile

+8 −1
Original line number Diff line number Diff line 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

dtbo-$(CONFIG_ARCH_MSM8996) += \

	msm8996-mtp-overlay.dtbo \

	msm8996-cdp-overlay.dtbo \

	apq8096pro-v1.1-auto-adp-overlay.dtbo \

	apq8096pro-v1.1-auto-adp-lite-overlay.dtbo \

	msm8996pro-auto-adp-overlay.dtbo \
@@ -10,7 +11,13 @@ dtbo-$(CONFIG_ARCH_MSM8996) += \ 


msm8996-mtp-overlay.dtbo-base :=  msm8996pro-v1.1-pmi8996.dtb \

				msm8996-v3-pmi8996.dtb \

				msm8996pro-v1.1-pmi8994.dtb

				msm8996pro-v1.1-pmi8994.dtb \

				msm8996-v313-pmi8994.dtb \

				msm8996-v30-pm8994-pmi8994-pm8004.dtb



msm8996-cdp-overlay.dtbo-base :=  msm8996-v3-pmi8994.dtb \

				 msm8996pro-pmi8994-pm8004.dtb



apq8096pro-v1.1-auto-adp-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb

apq8096pro-v1.1-auto-adp-lite-overlay.dtbo-base := apq8096pro-v1.1-auto.dtb

msm8996pro-auto-adp-overlay.dtbo-base := msm8996pro-auto.dtb

arch/arm/boot/dts/qcom/msm8996-cdp-overlay.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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/;

/plugin/;



#include "msm8996-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 CDP";

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

	qcom,board-id = <1 0>, <0x01000001 0>;

};

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

+2 −13
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016,2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, 2018-2019, 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
@@ -10,7 +10,7 @@ 
 * GNU General Public License for more details.

 */



#include "msm8996-pinctrl.dtsi"

#include <dt-bindings/clock/msm-clocks-8996.h>

#include "msm8996-camera-sensor-cdp.dtsi"

#include "msm8996-wsa881x.dtsi"
@@ -201,17 +201,6 @@ 
		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@7c {

		label = "xo_therm_buf";

		reg = <0x7c>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};

};



&pm8994_adc_tm {

arch/arm/boot/dts/qcom/msm8996-v3-pmi8994.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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 "msm8996-v3.dtsi"

#include "msm8996-pm8994-pmi8994-pm8004.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3 + PMI8994 + PM8004";

	compatible = "qcom,msm8996";

	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;

	qcom,msm-id = <246 0x30001>;

	qcom,pmic-name = "PMI8994";

};

arch/arm/boot/dts/qcom/msm8996-v30-pm8994-pmi8994-pm8004.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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 "msm8996-v3.0.dtsi"

#include "msm8996-pm8994-pmi8994-pm8004.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 + PMI8994 + PM8004";

	compatible = "qcom,msm8996";

	qcom,pmic-id = <0x20009 0x2000A 0x1000C 0x0>;

	qcom,msm-id = <246 0x30000>;

	qcom,pmic-name = "PMI8994";

};