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

Commit 8d030466 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: add I2C buck regulator devices for msm8939"

parents 092a2d75 12cf7e3e

arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -365,5 +365,16 @@ 
				bias-pull-down;

			};

		};



		ext_buck_vsel {

			qcom,pins = <&gp 111>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <0>;

			label = "ext-buck-vsel";



			ext_buck_vsel_default: vsel0 {

				drive-strength = <2>;

			};

		};

	};

};

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

+36 −0
Original line number Diff line number Diff line
@@ -10,6 +10,42 @@ 
 * GNU General Public License for more details.

 */



/* External I2C controlled buck regulators */



&i2c_4 {

	ncp6335d: ncp6335d-regulator@1c {

		compatible = "onnn,ncp6335d-regulator";

		reg = <0x1c>;

		onnn,vsel = <0>;

		onnn,slew-ns = <3333>;

		onnn,step-size = <6250>;

		onnn,min-slew-ns = <416>;

		onnn,max-slew-ns = <3333>;

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1350000>;

		onnn,min-setpoint = <600000>;

		pintrl-names = "default";

		pinctrl-0 = <&ext_buck_vsel_default>;

		onnn,vsel-gpio = <&msm_gpio 111 1>;

		onnn,discharge-enable;

		onnn,restore-reg;

	};



	fan53555: fan53555-regulator@60 {

		compatible = "fairchild,fan53555-regulator";

		reg = <0x60>;

		fairchild,backup-vsel = <1>;

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1350000>;

		regulator-ramp-delay = <1250>;

		pintrl-names = "default";

		pinctrl-0 = <&ext_buck_vsel_default>;

		fairchild,vsel-gpio = <&msm_gpio 111 1>;

		fairchild,restore-reg;

		fairchild,disable-suspend;

	};

};



/* Stub regulators */



/ {

arch/arm/boot/dts/qcom/msm8939-rumi.dts

+8 −0
Original line number Diff line number Diff line
@@ -367,3 +367,11 @@ 
		regulator-max-microvolt = <2700000>;

	};

};



&ncp6335d {

	status = "disabled";

};



&fan53555 {

	status = "disabled";

};

arch/arm/boot/dts/qcom/msm8939-sim.dts

+8 −0
Original line number Diff line number Diff line
@@ -149,3 +149,11 @@ 
&qcom_seecom {

	status = "okay";

};



&ncp6335d {

	status = "disabled";

};



&fan53555 {

	status = "disabled";

};