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

Commit d6a90151 authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar Committed by Rohit Vaswani
Browse files

ARM: dts: msm: Update spmi devices to be platform devices 



Since the drivers have been updated to run on platform devices
with new bindings, update their dtsi nodes to confirm to the new
bindings.

Change-Id: I709d38c90272e3159eb1cf92febb27328d70aff7
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent 0c98f90e

arch/arm64/boot/dts/qcom/msm-pm8004.dtsi

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

 */



#include <dt-bindings/spmi/spmi.h>

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



&spmi_bus {

	qcom,pm8004@4 {

		spmi-slave-container;

		reg = <0x4>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "qcom,spmi-pmic";

		reg = <0x4 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm8004_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -34,14 +37,13 @@ 
		qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x4 0x24 0x0>;

			interrupts = <0x4 0x24 0x0 IRQ_TYPE_NONE>;

			label = "pm8004_tz";

			qcom,threshold-set = <0>;

			qcom,default-temp = <37000>;

		};



		pm8004_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -76,9 +78,9 @@ 
	};



	qcom,pm8004@5 {

		spmi-slave-container;

		reg = <0x5>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x5 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

	};

};

arch/arm64/boot/dts/qcom/msm-pm8994.dtsi

+21 −26
Original line number Diff line number Diff line
@@ -10,17 +10,15 @@ 
 * GNU General Public License for more details.

 */



&spmi_bus {

	#address-cells = <1>;

	#size-cells = <0>;

	interrupt-controller;

	#interrupt-cells = <3>;

#include <dt-bindings/spmi/spmi.h>

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



&spmi_bus {

	qcom,pm8994@0 {

		spmi-slave-container;

		reg = <0x0>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x0 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pm8994_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -30,7 +28,7 @@ 
		qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0>;

			interrupts = <0x0 0x24 0x0 IRQ_TYPE_NONE>;

			label = "pm8994_tz";

			qcom,channel-num = <8>;

			qcom,threshold-set = <0>;
@@ -40,10 +38,10 @@ 
		qcom,power-on@800 {

			compatible = "qcom,qpnp-power-on";

			reg = <0x800 0x100>;

			interrupts = <0x0 0x8 0x0>,

				     <0x0 0x8 0x1>,

				     <0x0 0x8 0x4>,

				     <0x0 0x8 0x5>;

			interrupts = <0x0 0x8 0x0 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x1 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x4 IRQ_TYPE_NONE>,

				     <0x0 0x8 0x5 IRQ_TYPE_NONE>;

			interrupt-names = "kpdpwr", "resin",

					"resin-bark", "kpdpwr-resin-bark";

			qcom,pon-dbc-delay = <15625>;
@@ -78,7 +76,6 @@ 
		};



		pm8994_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -214,7 +211,6 @@ 
		};



		pm8994_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -276,7 +272,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

			interrupts = <0x0 0x31 0x0 IRQ_TYPE_NONE>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;
@@ -321,9 +317,9 @@ 
			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

				     <0x0 0x34 0x4>;

			interrupts =	<0x0 0x34 0x0 IRQ_TYPE_NONE>,

					<0x0 0x34 0x3 IRQ_TYPE_NONE>,

				     <0x0 0x34 0x4 IRQ_TYPE_NONE>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";
@@ -338,7 +334,6 @@ 
		};



		pm8994_rtc: qcom,pm8994_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -350,16 +345,16 @@ 
			};

			qcom,pm8994_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x0 0x61 0x1>;

				interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

			};

		};

	};



	qcom,pm8994@1 {

		spmi-slave-container;

		reg = <0x1>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x1 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pwm@b100 {

			compatible = "qcom,qpnp-pwm";

arch/arm64/boot/dts/qcom/msm-pmi8994.dtsi

+68 −75
Original line number Diff line number Diff line
@@ -10,17 +10,15 @@ 
 * GNU General Public License for more details.

 */



&spmi_bus {

	#address-cells = <1>;

	#size-cells = <0>;

	interrupt-controller;

	#interrupt-cells = <3>;

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

#include <dt-bindings/spmi/spmi.h>



&spmi_bus {

	qcom,pmi8994@2 {

		spmi-slave-container;

		reg = <0x2>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "qcom,spmi-pmic";

		reg = <0x2 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmi8994_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -39,7 +37,6 @@ 
		};



		pmi8994_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -109,7 +106,6 @@ 
		};



		pmi8994_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -146,8 +142,8 @@ 
			compatible = "qcom,msm-bcl";

			reg = <0x4200 0xFF 0x88E 0x2>;

			reg-names = "fg_user_adc", "pon_spare";

			interrupts = <0x2 0x42 0x0>,

					<0x2 0x42 0x1>;

			interrupts = <0x2 0x42 0x0 IRQ_TYPE_NONE>,

					<0x2 0x42 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-high-ibat-int",

					"bcl-low-vbat-int";

			qcom,vbat-scaling-factor = <39000>;
@@ -168,9 +164,9 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x2 0x31 0x0>,

					<0x2 0x31 0x3>,

				     <0x2 0x31 0x4>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_NONE>,

					<0x2 0x31 0x3 IRQ_TYPE_NONE>,

				     <0x2 0x31 0x4 IRQ_TYPE_NONE>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";
@@ -193,7 +189,6 @@ 
		};



		pmi8994_charger: qcom,qpnp-smbcharger {

			spmi-dev-container;

			compatible = "qcom,qpnp-smbcharger";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -218,14 +213,14 @@ 


			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

				interrupts =	<0x2 0x10 0x0>,

						<0x2 0x10 0x1>,

						<0x2 0x10 0x2>,

						<0x2 0x10 0x3>,

						<0x2 0x10 0x4>,

						<0x2 0x10 0x5>,

						<0x2 0x10 0x6>,

						<0x2 0x10 0x7>;

				interrupts =	<0x2 0x10 0x0 IRQ_TYPE_NONE>,

						<0x2 0x10 0x1 IRQ_TYPE_NONE>,

						<0x2 0x10 0x2 IRQ_TYPE_NONE>,

						<0x2 0x10 0x3 IRQ_TYPE_NONE>,

						<0x2 0x10 0x4 IRQ_TYPE_NONE>,

						<0x2 0x10 0x5 IRQ_TYPE_NONE>,

						<0x2 0x10 0x6 IRQ_TYPE_NONE>,

						<0x2 0x10 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"chg-error",

							"chg-inhibit",
@@ -243,14 +238,14 @@ 


			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

				interrupts =	<0x2 0x12 0x0>,

						<0x2 0x12 0x1>,

						<0x2 0x12 0x2>,

						<0x2 0x12 0x3>,

						<0x2 0x12 0x4>,

						<0x2 0x12 0x5>,

						<0x2 0x12 0x6>,

						<0x2 0x12 0x7>;

				interrupts =	<0x2 0x12 0x0 IRQ_TYPE_NONE>,

						<0x2 0x12 0x1 IRQ_TYPE_NONE>,

						<0x2 0x12 0x2 IRQ_TYPE_NONE>,

						<0x2 0x12 0x3 IRQ_TYPE_NONE>,

						<0x2 0x12 0x4 IRQ_TYPE_NONE>,

						<0x2 0x12 0x5 IRQ_TYPE_NONE>,

						<0x2 0x12 0x6 IRQ_TYPE_NONE>,

						<0x2 0x12 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"batt-hot",

							"batt-warm",
@@ -264,13 +259,13 @@ 


			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =	<0x2 0x13 0x0>,

						<0x2 0x13 0x1>,

						<0x2 0x13 0x2>,

						<0x2 0x13 0x3>,

						<0x2 0x13 0x4>,

						<0x2 0x13 0x5>,

						<0x2 0x13 0x6>;

				interrupts =	<0x2 0x13 0x0 IRQ_TYPE_NONE>,

						<0x2 0x13 0x1 IRQ_TYPE_NONE>,

						<0x2 0x13 0x2 IRQ_TYPE_NONE>,

						<0x2 0x13 0x3 IRQ_TYPE_NONE>,

						<0x2 0x13 0x4 IRQ_TYPE_NONE>,

						<0x2 0x13 0x5 IRQ_TYPE_NONE>,

						<0x2 0x13 0x6 IRQ_TYPE_NONE>;



				interrupt-names =	"usbin-uv",

							"usbin-ov",
@@ -283,8 +278,8 @@ 


			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

				interrupts =	<0x2 0x14 0x0>,

						<0x2 0x14 0x1>;

				interrupts =	<0x2 0x14 0x0 IRQ_TYPE_NONE>,

						<0x2 0x14 0x1 IRQ_TYPE_NONE>;



				interrupt-names =	"dcin-uv",

							"dcin-ov";
@@ -292,12 +287,12 @@ 


			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

				interrupts =	<0x2 0x16 0x0>,

						<0x2 0x16 0x1>,

						<0x2 0x16 0x2>,

						<0x2 0x16 0x3>,

						<0x2 0x16 0x4>,

						<0x2 0x16 0x5>;

				interrupts =	<0x2 0x16 0x0 IRQ_TYPE_NONE>,

						<0x2 0x16 0x1 IRQ_TYPE_NONE>,

						<0x2 0x16 0x2 IRQ_TYPE_NONE>,

						<0x2 0x16 0x3 IRQ_TYPE_NONE>,

						<0x2 0x16 0x4 IRQ_TYPE_NONE>,

						<0x2 0x16 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"power-ok",

							"temp-shutdown",
@@ -309,7 +304,6 @@ 
		};



		pmi8994_fg: qcom,fg {

			spmi-dev-container;

			compatible = "qcom,qpnp-fg";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -327,14 +321,14 @@ 
			qcom,fg-soc@4000 {

				status = "okay";

				reg = <0x4000 0x100>;

				interrupts =	<0x2 0x40 0x0>,

						<0x2 0x40 0x1>,

						<0x2 0x40 0x2>,

						<0x2 0x40 0x3>,

						<0x2 0x40 0x4>,

						<0x2 0x40 0x5>,

						<0x2 0x40 0x6>,

						<0x2 0x40 0x7>;

				interrupts =	<0x2 0x40 0x0 IRQ_TYPE_NONE>,

						<0x2 0x40 0x1 IRQ_TYPE_NONE>,

						<0x2 0x40 0x2 IRQ_TYPE_NONE>,

						<0x2 0x40 0x3 IRQ_TYPE_NONE>,

						<0x2 0x40 0x4 IRQ_TYPE_NONE>,

						<0x2 0x40 0x5 IRQ_TYPE_NONE>,

						<0x2 0x40 0x6 IRQ_TYPE_NONE>,

						<0x2 0x40 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"high-soc",

							"low-soc",
@@ -348,14 +342,14 @@ 


			qcom,fg-batt@4100 {

				reg = <0x4100 0x100>;

				interrupts =	<0x2 0x41 0x0>,

						<0x2 0x41 0x1>,

						<0x2 0x41 0x2>,

						<0x2 0x41 0x3>,

						<0x2 0x41 0x4>,

						<0x2 0x41 0x5>,

						<0x2 0x41 0x6>,

						<0x2 0x41 0x7>;

				interrupts =	<0x2 0x41 0x0 IRQ_TYPE_NONE>,

						<0x2 0x41 0x1 IRQ_TYPE_NONE>,

						<0x2 0x41 0x2 IRQ_TYPE_NONE>,

						<0x2 0x41 0x3 IRQ_TYPE_NONE>,

						<0x2 0x41 0x4 IRQ_TYPE_NONE>,

						<0x2 0x41 0x5 IRQ_TYPE_NONE>,

						<0x2 0x41 0x6 IRQ_TYPE_NONE>,

						<0x2 0x41 0x7 IRQ_TYPE_NONE>;



				interrupt-names =	"soft-cold",

							"soft-hot",
@@ -382,8 +376,8 @@ 
			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

				interrupts =	<0x2 0x44 0x0>,

						<0x2 0x44 0x1>;

				interrupts =	<0x2 0x44 0x0 IRQ_TYPE_NONE>,

						<0x2 0x44 0x1 IRQ_TYPE_NONE>;



				interrupt-names =	"mem-avail",

							"data-rcvry-sug";
@@ -392,10 +386,10 @@ 
	};



	qcom,pmi8994@3 {

		spmi-slave-container;

		reg = <0x3>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x3 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmi8994_pwm_1: pwm@b100 {

			compatible = "qcom,qpnp-pwm";
@@ -443,7 +437,6 @@ 


		labibb: qpnp-labibb-regulator {

			status = "disabled";

			spmi-dev-container;

			compatible = "qcom,qpnp-labibb-regulator";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -522,7 +515,7 @@ 
					"qpnp-wled-sink-base",

					"qpnp-wled-ibb-base",

					"qpnp-wled-lab-base";

			interrupts = <0x3 0xd8 0x2>;

			interrupts = <0x3 0xd8 0x2 IRQ_TYPE_NONE>;

			interrupt-names = "sc-irq";

			status = "okay";

			linux,name = "wled";
@@ -548,8 +541,8 @@ 
			status = "disabled";

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

				     <0x3 0xc0 0x1>;

			interrupts = <0x3 0xc0 0x0 IRQ_TYPE_NONE>,

				     <0x3 0xc0 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "sc-irq", "play-irq";

			vcc_pon-supply = <&pon_perph_reg>;

			qcom,play-mode = "direct";

arch/arm64/boot/dts/qcom/msm-pmk8001.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
 * GNU General Public License for more details.

 */



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

#include <dt-bindings/spmi/spmi.h>

&spmi_bus {

	qcom,pmk8001@6 {

		spmi-slave-container;

		reg = <0x6>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x6 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;



		pmk8001_revid: qcom,revid@100 {

			compatible = "qcom,qpnp-revid";
@@ -30,7 +32,6 @@ 
		};



		pmk8001_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -64,7 +65,6 @@ 
		};



		qcom,pmk8001_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -76,15 +76,15 @@ 
			};

			qcom,pmk8001_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x6 0x61 0x1>;

				interrupts = <0x6 0x61 0x1 IRQ_TYPE_NONE>;

			};

		};

	};



	qcom,pmk8001@7 {

		spmi-slave-container;

		reg = <0x7>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x7 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

	};

};

arch/arm64/boot/dts/qcom/msm8996-regulator.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/spmi/spmi.h>



&rpm_bus {

	/* PM8994 S1 + S6 = 2 phase VDD_CX supply */
@@ -529,10 +530,10 @@ 
	};



	qcom,pm8004@5 {

		spmi-slave-container;

		reg = <0x5>;

		#address-cells = <1>;

		#size-cells = <1>;

		compatible ="qcom,spmi-pmic";

		reg = <0x5 SPMI_USID>;

		#address-cells = <2>;

		#size-cells = <0>;

		/*

		 * PM8004 S2 + S4 = 2 phase VDD_GFX supply when PM8004 is

		 * present on the board.