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

Commit 0c2258e6 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: Switch to level-based voting on mdm9640"

parents 638efd10 56255a51

arch/arm/boot/dts/qcom/mdm9640-cc.dtsi

+13 −12
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


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

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

#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>



&soc {

	clock_a7pll: qcom,a7pll@0xB008018 {
@@ -24,16 +25,16 @@ 
		clocks = <&clock_gcc clk_xo_a>;



		qcom,regulator-names = "a7pll_vdd_dig";

		a7pll_vdd_dig-supply = <&pmd9635_s5_corner_ao>;

		a7pll_vdd_dig-supply = <&pmd9635_s5_level_ao>;



		a7pll_vdd_dig: a7pll_vdd_dig {

			compatible = "qcom,simple-vdd-class";

			qcom,regulators = <&pmd9635_s5_corner_ao>;

			qcom,regulators = <&pmd9635_s5_level_ao>;

			qcom,uV-levels =

					<RPM_REGULATOR_CORNER_NONE>,

					<RPM_REGULATOR_CORNER_SVS_SOC>,

					<RPM_REGULATOR_CORNER_NOMINAL>,

					<RPM_REGULATOR_CORNER_SUPER_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>,

					<RPM_SMD_REGULATOR_LEVEL_SVS>,

					<RPM_SMD_REGULATOR_LEVEL_NOM>,

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

		};

	};
@@ -46,16 +47,16 @@ 
		clocks = <&clock_a7pll clk_a7_debug_mux>;



		qcom,regulator-names = "gcc_vdd_dig";

		gcc_vdd_dig-supply = <&pmd9635_s5_corner>;

		gcc_vdd_dig-supply = <&pmd9635_s5_level>;



		gcc_vdd_dig: gcc_vdd_dig {

			compatible = "qcom,simple-vdd-class";

			qcom,regulators = <&pmd9635_s5_corner>;

			qcom,regulators = <&pmd9635_s5_level>;

			qcom,uV-levels =

					<RPM_REGULATOR_CORNER_NONE>,

					<RPM_REGULATOR_CORNER_SVS_SOC>,

					<RPM_REGULATOR_CORNER_NOMINAL>,

					<RPM_REGULATOR_CORNER_SUPER_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>,

					<RPM_SMD_REGULATOR_LEVEL_SVS>,

					<RPM_SMD_REGULATOR_LEVEL_NOM>,

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

		};



	};

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

+30 −20
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>



&rpm_bus {

	rpm-regulator-smpa1 {

		status = "okay";
@@ -54,31 +56,37 @@ 
	/* PMD9635 S5 = VDD_CX supply */

	rpm-regulator-smpa5 {

		status = "okay";

		pmd9635_s5_corner: regulator-s5-corner {

		pmd9635_s5_level: regulator-s5-level {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "9635_s5_corner";

			regulator-name = "9635_s5_level";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

		};



		pmd9635_s5_corner_ao: regulator-s5-corner-ao {

		pmd9635_s5_level_ao: regulator-s5-level-ao {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "9635_s5_corner_ao";

			regulator-name = "9635_s5_level_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

		};



		pmd9635_s5_floor_corner: regulator-s5-floor-corner {

		pmd9635_s5_floor_level: regulator-s5-floor-level {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "9635_s5_floor_corner";

			regulator-name = "9635_s5_floor_level";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-floor-level;

		};

	};
@@ -165,13 +173,15 @@ 
	/* PMD9635 L9 = VDD_MX supply */

	rpm-regulator-ldoa9 {

		status = "okay";

		pmd9635_l9_corner: regulator-l9-corner {

		pmd9635_l9_level: regulator-l9-level {

			compatible = "qcom,rpm-smd-regulator";

			regulator-name = "9635_l9_corner";

			regulator-name = "9635_l9_level";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,use-voltage-level;

		};

	};

arch/arm/boot/dts/qcom/mdm9640.dtsi

+16 −13
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "skeleton.dtsi"

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

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

#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>



/ {

	model = "Qualcomm Technologies, Inc. MSM 9640";
@@ -302,12 +303,12 @@ 
			 <&clock_a7pll clk_a7pll_clk>;



		qcom,speed0-bin-v0 =

			<         0 0>,

			< 400000000 4>,

			< 787200000 5>,

			<1190400000 7>;

			<         0 RPM_SMD_REGULATOR_LEVEL_NONE>,

			< 400000000 RPM_SMD_REGULATOR_LEVEL_SVS>,

			< 787200000 RPM_SMD_REGULATOR_LEVEL_NOM>,

			<1190400000 RPM_SMD_REGULATOR_LEVEL_TURBO>;



		cpu-vdd-supply = <&pmd9635_s5_corner_ao>;

		cpu-vdd-supply = <&pmd9635_s5_level_ao>;

		#clock-cells = <1>;

	};
@@ -502,15 +503,17 @@ 
		qcom,mx-restriction-temp = <5>;

		qcom,mx-restriction-temp-hysteresis = <5>;

		qcom,mx-retention-min = <3>;

		vdd-mx-supply = <&pmd9635_l9_corner>;

		vdd-mx-supply = <&pmd9635_l9_level>;

		qcom,vdd-restriction-temp = <5>;

		qcom,vdd-restriction-temp-hysteresis = <10>;

		vdd-dig-supply = <&pmd9635_s5_floor_corner>;

		vdd-dig-supply = <&pmd9635_s5_floor_level>;



		qcom,vdd-dig-rstr{

			qcom,vdd-rstr-reg = "vdd-dig";

			qcom,levels = <5 7 7>; /* Nominal, Super Turbo, Super Turbo */

			qcom,min-level = <1>; /* No Request */

			qcom,levels = <RPM_SMD_REGULATOR_LEVEL_NOM

					RPM_SMD_REGULATOR_LEVEL_TURBO

					RPM_SMD_REGULATOR_LEVEL_TURBO>;

			qcom,min-level = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;

		};

	};
@@ -1134,10 +1137,10 @@ 
					"gpll0_mss_clk";



		interrupts = <0 24 1>;

		vdd_cx-supply = <&pmd9635_s5_corner>;

		vdd_cx-voltage = <7>;

		vdd_mx-supply = <&pmd9635_l9_corner>;

		vdd_mx-uV = <7>;

		vdd_cx-supply = <&pmd9635_s5_level>;

		vdd_cx-voltage = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

		vdd_mx-supply = <&pmd9635_l9_level>;

		vdd_mx-uV = <RPM_SMD_REGULATOR_LEVEL_TURBO>;

		vdd_pll-supply = <&pmd9635_l7>;

		qcom,vdd_pll = <1800000>;

		qcom,firmware-name = "modem";