Merge "ARM: dts: msm: update regulator configurations for 8996AU CDP" (2d22d761) · Commits · e / devices / android_kernel_xiaomi_markw

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

+94 −0

Original line number	Diff line number	Diff line
		@@ -404,6 +404,15 @@
		qcom,invert = <0>;
		status = "okay";
		};

		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";
		};
		};

		&soc {
		@@ -858,3 +867,88 @@
		&wsa881x_214 {
		/delete-property/ qcom,spkr-sd-n-gpio;
		};

		&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";
		};
		};
		};

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

+23 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-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
		@@ -1445,6 +1445,14 @@
		enable-active-high;
		gpio = <&pm8994_gpios 9 0>;
		};

		hl7509_en_vreg: hl7509_en_vreg {
		compatible = "regulator-fixed";
		regulator-name = "hl7509_en_vreg";
		gpio = <&pm8994_mpps 6 0>;
		enable-active-high;
		status = "disabled";
		};
		};

		&pmi8994_charger {
		@@ -1458,3 +1466,17 @@
		};
		};

		/* Halo HL7509 external buck that powers VDD_GFX supply on 8996AU boards */
		&i2c_7 {
		hl7509_vreg: hl7509-regulator@68 {
		compatible = "halo,hl7509";
		reg = <0x68>;
		vin-supply = <&hl7509_en_vreg>;
		fcs,disable-suspend;
		fcs,suspend-voltage-selector = <1>;
		regulator-min-microvolt = <600000>;
		regulator-max-microvolt = <1230000>;
		regulator-ramp-delay = <500>;
		status = "disabled";
		};
		};