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

Commit 145ac103 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 smb2 charger for PM660"

parents 333bfdd7 4b1fab19

arch/arm/boot/dts/qcom/msm-pm660.dtsi

+124 −0
Original line number Diff line number Diff line
@@ -301,6 +301,130 @@ 
			};

		};



		pm660_charger: qcom,qpnp-smb2 {

			compatible = "qcom,qpnp-smb2";

			#address-cells = <1>;

			#size-cells = <1>;



			qcom,pmic-revid = <&pm660_revid>;

			qcom,wipower-max-uw = <5000000>;



			qcom,thermal-mitigation

					= <3000000 2500000 2000000 1500000

						1000000 500000>;

			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =

					<0x0 0x10 0x0>,

					<0x0 0x10 0x1>,

					<0x0 0x10 0x2>,

					<0x0 0x10 0x3>,

					<0x0 0x10 0x4>;



				interrupt-names = "chg-error",

						  "chg-state-change",

						  "step-chg-state-change",

						  "step-chg-soc-update-fail",

						  "step-chg-soc-update-request";

			};



			qcom,otg@1100 {

				reg = <0x1100 0x100>;

				interrupts = <0x0 0x11 0x0>,

					     <0x0 0x11 0x1>,

					     <0x0 0x11 0x2>,

					     <0x0 0x11 0x3>;



				interrupt-names = "otg-fail",

						  "otg-overcurrent",

						  "otg-oc-dis-sw-sts",

						  "testmode-change-detect";

			};



			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts =

					<0x0 0x12 0x0>,

					<0x0 0x12 0x1>,

					<0x0 0x12 0x2>,

					<0x0 0x12 0x3>,

					<0x0 0x12 0x4>,

					<0x0 0x12 0x5>;



				interrupt-names = "bat-temp",

						  "bat-ocp",

						  "bat-ov",

						  "bat-low",

						  "bat-therm-or-id-missing",

						  "bat-terminal-missing";

			};



			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =

					<0x0 0x13 0x0>,

					<0x0 0x13 0x1>,

					<0x0 0x13 0x2>,

					<0x0 0x13 0x3>,

					<0x0 0x13 0x4>,

					<0x0 0x13 0x5>,

					<0x0 0x13 0x6>,

					<0x0 0x13 0x7>;



				interrupt-names = "usbin-collapse",

						  "usbin-lt-3p6v",

						  "usbin-uv",

						  "usbin-ov",

						  "usbin-plugin",

						  "usbin-src-change",

						  "usbin-icl-change",

						  "type-c-change";

			};



			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

				interrupts =

					<0x0 0x14 0x0>,

					<0x0 0x14 0x1>,

					<0x0 0x14 0x2>,

					<0x0 0x14 0x3>,

					<0x0 0x14 0x4>,

					<0x0 0x14 0x5>,

					<0x0 0x14 0x6>;



				interrupt-names = "dcin-collapse",

						  "dcin-lt-3p6v",

						  "dcin-uv",

						  "dcin-ov",

						  "dcin-plugin",

						  "div2-en-dg",

						  "dcin-icl-change";

			};



			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts =

					<0x0 0x16 0x0>,

					<0x0 0x16 0x1>,

					<0x0 0x16 0x2>,

					<0x0 0x16 0x3>,

					<0x0 0x16 0x4>,

					<0x0 0x16 0x5>,

					<0x0 0x16 0x6>,

					<0x0 0x16 0x7>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",

						  "aicl-fail",

						  "aicl-done",

						  "high-duty-cycle",

						  "input-current-limiting",

						  "temperature-change",

						  "switcher-power-ok";

			};

		};





		pm660_pbs: qcom,pbs@7300 {

			compatible = "qcom,qpnp-pbs";

			reg = <0x7300 0x100>;

arch/arm/boot/dts/qcom/msm8909w-pm660-regulator.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -307,6 +307,16 @@ 
	};

};



&pm660_charger {

	smb2_vbus: qcom,smb2-vbus {

		regulator-name = "smb2-vbus";

	};



	smb2_vconn: qcom,smb2-vconn {

		regulator-name = "smb2-vconn";

	};

};



/* SPM controlled regulators */

&spmi_bus {

	qcom,pm660@1 {