Merge "ARM: dts: msm: Disable sensors on MSM8996proAU ADP" (998dfadf) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		msm8996-v3-dtp.dtb \
		msm8996-v3-pm8004-mmxf-adp.dtb \
		msm8996-v3-pm8004-agave-adp.dtb \
		msm8996pro-auto-adp.dtb \
		msm8996pro-auto-cdp.dtb \
		msm8996pro-pmi8994-cdp.dtb \
		msm8996pro-pmi8994-mtp.dtb \
		@@ -71,6 +72,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		apq8096-v3-dragonboard.dtb \
		apq8096-v3-sbc.dtb \
		apq8096-v3-auto-dragonboard.dtb \
		apq8096-v3-auto-cdp.dtb \
		apq8096-v3.0-pmi8994-cdp.dtb \
		apq8096-v3.0-pmi8994-mtp.dtb \
		apq8096-v3.0-pmi8994-pm8004-cdp.dtb \

arch/arm/boot/dts/qcom/apq8096-v3-auto-cdp.dts

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, 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 "apq8096-v3.dtsi"
		#include "msm8996-pm8994.dtsi"
		#include "msm8996-auto-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ 8096 v3 AUTO CDP";
		compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";
		qcom,msm-id = <311 0x30001>;
		qcom,board-id = <0x03010001 0>;
		};

		&spi_9 {
		status = "ok";
		can-controller@0 {
		compatible = "renesas,rh850";
		reg = <0>;
		interrupt-parent = <&tlmm>;
		interrupts = <127 0>;
		spi-max-frequency = <5000000>;
		};
		};

arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts

0 → 100644

+157 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, 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 "msm8996pro.dtsi"
		#include "msm8996-pm8994.dtsi"
		#include "msm8996-agave-adp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
		compatible = "qcom,msm8996-adp", "qcom,msm8996", "qcom,adp";
		qcom,msm-id = <315 0x10000>;
		qcom,board-id = <0x02010019 0>;
		};

		&spi_9 {
		status = "ok";
		can-controller@0 {
		compatible = "renesas,rh850";
		reg = <0>;
		interrupt-parent = <&tlmm>;
		interrupts = <122 0>;
		spi-max-frequency = <5000000>;
		};
		};

		&soc {
		qcom,msm-ssc-sensors {
		status = "disabled";
		};
		};

		&pm8994_mpps {
		mpp@a500 { /* MPP 6 */
		qcom,mode = <1>; /* Digital output */
		qcom,output-type = <0>; /* CMOS logic */
		qcom,vin-sel = <2>; /* S4 1.8V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>; /* Enable GPIO */
		status = "okay";
		};
		};

		&hl7509_en_vreg {
		status = "ok";
		};

		&hl7509_vreg {
		status = "ok";
		};

		&gfx_cpr {
		vdd-supply = <&hl7509_vreg>;
		qcom,cpr-step-quot-init-min = <20>;
		qcom,cpr-step-quot-init-max = <26>;
		qcom,voltage-step = <10000>;
		/delete-property/ qcom,cpr-enable;
		};

		&gfx_vreg {
		qcom,cpr-voltage-ceiling =
		<600000 670000 670000 750000 830000
		910000 960000 1020000>;
		qcom,cpr-voltage-floor =
		<600000 600000 600000 600000 600000
		600000 600000 600000>;
		};

		&pm8994_l3 {
		regulator-min-microvolt = <875000>;
		regulator-max-microvolt = <875000>;
		qcom,init-voltage = <875000>;
		};

		&pm8994_l11 {
		regulator-min-microvolt = <850000>;
		regulator-max-microvolt = <850000>;
		qcom,init-voltage = <850000>;
		};

		&pm8994_l17 {
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		qcom,init-voltage = <1800000>;
		};

		&pm8994_l23 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1100000>;
		qcom,init-voltage = <1100000>;
		};

		&pm8994_l27 {
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <800000>;
		qcom,init-voltage = <800000>;
		};

		&pm8994_l29 {
		regulator-min-microvolt = <2500000>;
		regulator-max-microvolt = <2500000>;
		qcom,init-voltage = <2500000>;
		};

		&rpm_bus {
		rpm-regulator-ldoa26 {
		/delete-node/ pm8994_l26_corner;
		/delete-node/ pm8994_l26_floor_corner;

		pm8994_l26: regulator-l26 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1100000>;
		qcom,init-voltage = <1100000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa31 {
		status = "okay";
		pm8994_l31: regulator-l31 {
		regulator-min-microvolt = <1100000>;
		regulator-max-microvolt = <1100000>;
		qcom,init-voltage = <1100000>;
		status = "okay";
		};
		};
		};

		&gfx_vreg {
		qcom,cpr-voltage-ceiling =
		/* Speed bin 0 */
		<600000 670000 670000 750000 830000 910000 960000 1020000
		1070000>,

		/* Speed bin 1 */
		<600000 670000 670000 750000 830000 910000 960000 1020000
		1070000>;

		qcom,cpr-voltage-floor =
		/* Speed bin 0 */
		<600000 600000 600000 600000 600000 600000 600000 600000
		600000>,

		/* Speed bin 1 */
		<600000 600000 600000 600000 600000 600000 600000 600000
		600000>;
		};

drivers/soc/qcom/socinfo.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -514,11 +514,12 @@ static struct msm_soc_info cpu_of_id[] = {

		/* 8996 IDs */
		[246] = {MSM_CPU_8996, "MSM8996"},
		[310] = {MSM_CPU_8996, "MSM8996"},
		[311] = {MSM_CPU_8996, "APQ8096"},
		[291] = {MSM_CPU_8996, "APQ8096"},
		[305] = {MSM_CPU_8996, "MSM8996pro"},
		[310] = {MSM_CPU_8996, "MSM8996"},
		[311] = {MSM_CPU_8996, "APQ8096"},
		[312] = {MSM_CPU_8996, "APQ8096pro"},
		[315] = {MSM_CPU_8996, "MSM8996pro"},

		/* 8976 ID */
		[266] = {MSM_CPU_8976, "MSM8976"},
		@@ -1215,10 +1216,6 @@ static void * __init setup_dummy_socinfo(void)
		dummy_socinfo.id = 246;
		strlcpy(dummy_socinfo.build_id, "msm8996 - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msm8996_auto()) {
		dummy_socinfo.id = 310;
		strlcpy(dummy_socinfo.build_id, "msm8996-auto - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msm8929()) {
		dummy_socinfo.id = 268;
		strlcpy(dummy_socinfo.build_id, "msm8929 - ",

include/soc/qcom/socinfo.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -94,8 +94,6 @@
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8937")
		#define early_machine_is_msm8996() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996")
		#define early_machine_is_msm8996_auto() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8996-cdp")
		#define early_machine_is_msm8929() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
		#define early_machine_is_mdm9607() \