Merge "ARM: dts: msm: Replace stub regulators with RPM-controlled regulators" (cea52313) · Commits · e / devices / android_kernel_xiaomi_markw

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

+223 −145

Original line number	Diff line number	Diff line
		@@ -13,160 +13,238 @@

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

		/* Stub regulators */

		/ {
		&rpm_bus {
		/* PMDCALIFORNIUM S1 = VDD_MSS supply */
		rpm-regulator-smpa1 {
		status = "okay";
		pmdcalifornium_s1: regulator-s1 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s1";
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <800000>;
		qcom,init-voltage = <800000>;
		status = "okay";
		};
		};

		rpm-regulator-smpa2 {
		status = "okay";
		pmdcalifornium_s2: regulator-s2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s2";
		regulator-min-microvolt = <1256000>;
		regulator-max-microvolt = <1256000>;
		qcom,init-voltage = <1256000>;
		status = "okay";
		};
		};

		rpm-regulator-smpa3 {
		status = "okay";
		pmdcalifornium_s3: regulator-s3 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s3";
		regulator-min-microvolt = <1024000>;
		regulator-max-microvolt = <1024000>;
		qcom,init-voltage = <1024000>;
		status = "okay";
		};
		};

		rpm-regulator-smpa4 {
		status = "okay";
		pmdcalifornium_s4: regulator-s4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_s4";
		regulator-min-microvolt = <1856000>;
		regulator-max-microvolt = <1856000>;
		qcom,init-voltage = <1856000>;
		status = "okay";
		};
		};

		/* PMDCALIFORNIUM S5 = VDD_CX supply */
		rpm-regulator-smpa5 {
		status = "okay";
		pmdcalifornium_s5_level: regulator-s5-level {
		compatible = "qcom,stub-regulator";
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmdcalifornium_s5_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};

		pmdcalifornium_s5_level_ao: regulator-s5-level-ao {
		compatible = "qcom,stub-regulator";
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmdcalifornium_s5_level_ao";
		qcom,set = <1>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};

		pmdcalifornium_s5_floor_level: regulator-s5-floor-level {
		compatible = "qcom,stub-regulator";
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmdcalifornium_s5_floor_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-floor-level;
		};
		};

		rpm-regulator-ldoa1 {
		status = "okay";
		pmdcalifornium_l1: regulator-l1 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l1";
		regulator-min-microvolt = <1224000>;
		regulator-max-microvolt = <1224000>;
		qcom,init-voltage = <1224000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa2 {
		status = "okay";
		pmdcalifornium_l2: regulator-l2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l2";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		qcom,init-voltage = <1200000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa3 {
		status = "okay";
		pmdcalifornium_l3: regulator-l3 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l3";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <1000000>;
		qcom,init-voltage = <1000000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa4 {
		status = "okay";
		pmdcalifornium_l4: regulator-l4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l4";
		regulator-min-microvolt = <928000>;
		regulator-max-microvolt = <928000>;
		qcom,init-voltage = <928000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa5 {
		status = "okay";
		pmdcalifornium_l5: regulator-l5 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l5";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa6 {
		status = "okay";
		pmdcalifornium_l6: regulator-l6 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l6";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa7 {
		status = "okay";
		pmdcalifornium_l7: regulator-l7 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l7";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2848000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa8 {
		status = "okay";
		pmdcalifornium_l8: regulator-l8 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l8";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <1000000>;
		qcom,init-voltage = <1000000>;
		status = "okay";
		};
		};

		/* PMDCALIFORNIUM L9 = VDD_MX supply */
		rpm-regulator-ldoa9 {
		status = "okay";
		pmdcalifornium_l9_level: regulator-l9-level {
		compatible = "qcom,stub-regulator";
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pmdcalifornium_l9_level";
		qcom,set = <3>;
		regulator-min-microvolt = <RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt = <RPM_SMD_REGULATOR_LEVEL_TURBO>;
		regulator-min-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_RETENTION>;
		regulator-max-microvolt =
		<RPM_SMD_REGULATOR_LEVEL_TURBO>;
		qcom,use-voltage-level;
		};
		};

		rpm-regulator-ldoa10 {
		status = "okay";
		pmdcalifornium_l10: regulator-l10 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l10";
		regulator-min-microvolt = <3088000>;
		regulator-max-microvolt = <3088000>;
		qcom,init-voltage = <3088000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa11 {
		status = "okay";
		pmdcalifornium_l11: regulator-l11 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l11";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-max-microvolt = <2848000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa12 {
		status = "okay";
		pmdcalifornium_l12: regulator-l12 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l12";
		regulator-min-microvolt = <2704000>;
		regulator-max-microvolt = <2704000>;
		qcom,init-voltage = <2704000>;
		status = "okay";
		};
		};

		rpm-regulator-ldoa13 {
		status = "okay";
		pmdcalifornium_l13: regulator-l13 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pmdcalifornium_l13";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2848000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};
		};
		};

		&soc {
		codec_buck_vreg: codec_buck_vreg {
		compatible = "regulator-fixed";
		regulator-name = "codec_1.8v";

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@
		soc: soc { };
		};

		#include "mdmcalifornium-regulator.dtsi"
		#include "mdmcalifornium-smp2p.dtsi"
		#include "msm-gdsc.dtsi"
		#include "mdmcalifornium-blsp.dtsi"
		@@ -720,3 +719,7 @@
		reg = <0x0185d044 0x4>;
		status = "ok";
		};

		#include "msm-pmdcalifornium-rpm-regulator.dtsi"
		#include "msm-pmdcalifornium.dtsi"
		#include "mdmcalifornium-regulator.dtsi"

arch/arm/boot/dts/qcom/msm-pmdcalifornium-rpm-regulator.dtsi

0 → 100644

+301 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, 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.
		*/

		&rpm_bus {
		rpm-regulator-smpa1 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <1>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s1 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_s1";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-smpa2 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <2>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s2 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_s2";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-smpa3 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <3>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s3 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_s3";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-smpa4 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <4>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s4 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_s4";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-smpa5 { /* VDD_CX supply */
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "rwcx";
		qcom,resource-id = <0>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s5 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_s5";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa1 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <1>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l1 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l1";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa2 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <2>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l2 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l2";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa3 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <3>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l3 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l3";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa4 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <4>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l4 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l4";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa5 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <5>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l5 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l5";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa6 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <6>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l6 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l6";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa7 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <7>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l7 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l7";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa8 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <8>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l8 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l8";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa9 { /* VDD_MX supply */
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "rwmx";
		qcom,resource-id = <0>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l9 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l9";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa10 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <10>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l10 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l10";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa11 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <11>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l11 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l11";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa12 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <12>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l12 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l12";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-ldoa13 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <13>;
		qcom,regulator-type = <0>;
		qcom,hpm-min-load = <10000>;
		status = "disabled";

		regulator-l13 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "californium_l13";
		qcom,set = <3>;
		status = "disabled";
		};
		};
		};