Merge "ARM: dts: msm: Update the PM660 device nodes" (dde07f28) · Commits · e / devices / android_kernel_xiaomi_markw

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

+60 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,36 @@
		*/

		&rpm_bus {
		rpm-regulator-smpa2 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <2>;
		qcom,regulator-type = <1>;
		status = "disabled";

		regulator-s2 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pm660_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>;
		status = "disabled";

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

		rpm-regulator-smpa4 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		@@ -266,6 +296,21 @@
		};
		};

		rpm-regulator-ldoa16 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <16>;
		qcom,regulator-type = <0>;
		status = "disabled";

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

		rpm-regulator-ldoa17 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		@@ -281,6 +326,21 @@
		};
		};

		rpm-regulator-ldoa18 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";
		qcom,resource-id = <18>;
		qcom,regulator-type = <0>;
		status = "disabled";

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

		rpm-regulator-ldoa19 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "ldoa";

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -10,15 +10,14 @@
		* GNU General Public License for more details.
		*/

		#include <dt-bindings/spmi/spmi.h>
		#include <dt-bindings/interrupt-controller/irq.h>

		&spmi_bus {
		qcom,pm660@0 {
		compatible ="qcom,spmi-pmic";
		reg = <0x0 SPMI_USID>;
		#address-cells = <2>;
		#size-cells = <0>;
		spmi-slave-container;
		reg = <0x0>;
		#address-cells = <1>;
		#size-cells = <1>;

		pm660_revid: qcom,revid@100 {
		compatible = "qcom,qpnp-revid";
		@@ -67,6 +66,7 @@
		};

		pm660_gpios: gpios {
		spmi-dev-container;
		compatible = "qcom,qpnp-pin";
		gpio-controller;
		#gpio-cells = <2>;
		@@ -159,6 +159,7 @@
		};

		pm660_rtc: qcom,pm660_rtc {
		spmi-dev-container;
		compatible = "qcom,qpnp-rtc";
		#address-cells = <1>;
		#size-cells = <1>;
		@@ -302,10 +303,10 @@
		};

		qcom,pm660@1 {
		compatible ="qcom,spmi-pmic";
		reg = <0x1 SPMI_USID>;
		#address-cells = <2>;
		#size-cells = <0>;
		spmi-slave-container;
		reg = <0x1>;
		#address-cells = <1>;
		#size-cells = <1>;

		pm660_haptics: qcom,haptic@c000 {
		compatible = "qcom,qpnp-haptic";