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

Commit d2ea4669 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: update APCC CPR configuration for msm8996proAU"

parents eb99c66d 995695f5

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "apq8096-v3.dtsi"

#include "msm8996-pm8994.dtsi"

#include "msm8996-auto-cdp.dtsi"

#include "msm8996v3-auto.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 AUTO CDP";

arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts

+1 −19
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "apq8096pro.dtsi"

#include "msm8996-pm8994.dtsi"

#include "msm8996-auto-cdp.dtsi"

#include "msm8996pro-auto.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP";
@@ -34,22 +35,3 @@ 
	};

};

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

};

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts

+1 −19
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "apq8096pro-v1.1.dtsi"

#include "msm8996-pm8994.dtsi"

#include "msm8996-auto-cdp.dtsi"

#include "msm8996pro-auto.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP";
@@ -34,22 +35,3 @@ 
	};

};

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

};

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

+0 −83
Original line number Diff line number Diff line
@@ -1030,87 +1030,4 @@ 
	/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-v3-auto-adp.dts

+1 −84
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "msm8996-v3.dtsi"

#include "msm8996-pm8994.dtsi"

#include "msm8996-agave-adp.dtsi"

#include "msm8996v3-auto.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3 AUTO ADP";
@@ -61,14 +62,6 @@ 
	};

};



&hl7509_en_vreg {

	status = "ok";

};



&hl7509_vreg {

	status = "ok";

};



&sdhc_2 {

	cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on_sbc>;
@@ -82,79 +75,3 @@ 
	};

};

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

		};

	};

};