Merge "ARM: dts: msm: add device tree overlay for 8996" (457f5f45) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/Makefile

+9 −0

Original line number	Diff line number	Diff line
		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		dtbo-$(CONFIG_ARCH_MSM8996) += \
		msm8996-mtp-overlay.dtbo

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

		else
		dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		msm8996-v2-pmi8994-mtp.dtb \
		msm8996-v2-pmi8994-pmk8001-cdp.dtb \
		@@ -115,6 +123,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \
		apq8096-v3-pmi8996-dragonboard.dtb \
		msm8996-auto-mizar.dtb
		endif

		dtb-$(CONFIG_MSM_GVM_QUIN) += vplatform-lfv-msm8996-telematics.dtb \
		vplatform-lfv-msm8996-ivi.dtb \

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-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
		@@ -833,7 +833,7 @@
		};
		};

		pinctrl@01010000 {
		pinctrl@1010000 {
		pcie2 {
		pcie2_perst_default: pcie2_perst_default {
		mux {

0 → 100644

+23 −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-mtp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM 8996 MTP";
		compatible = "qcom,mtp";
		qcom,board-id = <8 0>;
		};

+2 −13

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-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-mtp.dtsi"
		#include "msm8996-wsa881x.dtsi"

		@@ -182,17 +182,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 {

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-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
		@@ -11,7 +11,7 @@
		*/

		&soc {
		tlmm: pinctrl@01010000 {
		tlmm: pinctrl@1010000 {
		compatible = "qcom,msm8996-pinctrl";
		reg = <0x01010000 0x300000>;
		interrupts = <0 208 0>;