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

Commit e0665763 authored by Kiran Gunda's avatar Kiran Gunda Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Fix interrupt configuration for PM8953/PMI8950 peripherals 



Currently SPMI-PMIC device tree nodes are configured with three
interrupt-cells, which is incorrect. Fix it by configuring all
spmi child nodes with four interrupt cells.

Change-Id: I68d3e1cd5a51fbe4b5fd936af4809e83e194d8b4
Signed-off-by: default avatarKiran Gunda <kgunda@codeaurora.org>
parent e76aff6f

arch/arm64/boot/dts/qcom/pm8953.dtsi

+17 −17
Original line number Diff line number Diff line
@@ -27,10 +27,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>;
@@ -52,7 +52,7 @@ 
		pm8953_temp_alarm: qcom,temp-alarm@2400 {

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

			reg = <0x2400 0x100>;

			interrupts = <0x0 0x24 0x0>;

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

			label = "pm8953_tz";

			qcom,channel-num = <8>;

			qcom,threshold-set = <0>;
@@ -159,7 +159,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

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

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

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

			qcom,adc-vdd-reference = <1800>;
@@ -215,9 +215,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_EDGE_RISING>,

					<0x0 0x34 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x34 0x4 IRQ_TYPE_EDGE_RISING>;

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

						"high-thr-en-set",

						"low-thr-en-set";
@@ -241,20 +241,20 @@ 


			qcom,pm8953_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

				interrupts = <0x0 0x61 0x1>;

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

			};

		};



		pm8953_typec: qcom,pm8953_typec@bf00 {

			compatible = "qcom,qpnp-typec";

			reg = <0xbf00 0x100>;

			interrupts =    <0x0 0xbf 0x0>,

					<0x0 0xbf 0x1>,

					<0x0 0xbf 0x2>,

					<0x0 0xbf 0x3>,

					<0x0 0xbf 0x4>,

					<0x0 0xbf 0x6>,

					<0x0 0xbf 0x7>;

			interrupts =    <0x0 0xbf 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0xbf 0x7 IRQ_TYPE_EDGE_RISING>;



			interrupt-names =       "vrd-change",

						"ufp-detect",

arch/arm64/boot/dts/qcom/pmi8950.dtsi

+55 −59
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x2 0x31 0x0>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

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

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

			qcom,adc-vdd-reference = <1800>;
@@ -140,7 +140,6 @@ 
		};



		pmi8950_gpios: gpios {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -162,7 +161,6 @@ 
		};



		pmi8950_mpps: mpps {

			spmi-dev-container;

			compatible = "qcom,qpnp-pin";

			gpio-controller;

			#gpio-cells = <2>;
@@ -196,7 +194,6 @@ 
		};



		pmi8950_charger: qcom,qpnp-smbcharger {

			spmi-dev-container;

			compatible = "qcom,qpnp-smbcharger";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -218,14 +215,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",
@@ -239,9 +236,9 @@ 


			qcom,otg@1100 {

				reg = <0x1100 0x100>;

				interrupts =	<0x2 0x11 0x0>,

						<0x2 0x11 0x1>,

						<0x2 0x11 0x3>;

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

						<0x2 0x11 0x1 IRQ_TYPE_NONE>,

						<0x2 0x11 0x3 IRQ_TYPE_NONE>;

				interrupt-names =	"otg-fail",

							"otg-oc",

						"usbid-change";
@@ -249,14 +246,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",
@@ -270,10 +267,10 @@ 


			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

				interrupts =	<0x2 0x13 0x0>,

						<0x2 0x13 0x1>,

					<0x2 0x13 0x2>,

						<0x2 0x13 0x5>;

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

						<0x2 0x13 0x1 IRQ_TYPE_NONE>,

						<0x2 0x13 0x2 IRQ_TYPE_NONE>,

						<0x2 0x13 0x5 IRQ_TYPE_NONE>;



				interrupt-names =	"usbin-uv",

						"usbin-ov",
@@ -283,20 +280,20 @@ 


			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";

			};



			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",
@@ -312,7 +309,6 @@ 
		};



		pmi8950_fg: qcom,fg {

			spmi-dev-container;

			compatible = "qcom,qpnp-fg";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -330,13 +326,13 @@ 
			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>;

				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>;



				interrupt-names =	"high-soc",

							"low-soc",
@@ -349,14 +345,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",
@@ -375,8 +371,8 @@ 
			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

				interrupts =	<0x2 0x44 0x0>,

						<0x2 0x44 0x2>;

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

						<0x2 0x44 0x2 IRQ_TYPE_NONE>;



				interrupt-names =	"mem-avail",

							"data-rcvry-sug";
@@ -387,8 +383,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>;
@@ -429,7 +425,6 @@ 


		labibb: qpnp-labibb-regulator {

			status = "disabled";

			spmi-dev-container;

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

			#address-cells = <1>;

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

					"qpnp-wled-ibb-base",

					"qpnp-wled-lab-base";

			interrupts = <0x3 0xd8 0x2>;

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

			interrupt-names = "sc-irq";

			status = "okay";

			linux,name = "wled";
@@ -531,6 +526,7 @@ 
			qcom,fs-curr-ua = <20000>;

			qcom,led-strings-list = [00 01];

			qcom,en-ext-pfet-sc-pro;

			qcom,pmic-revid = <&pmi8950_revid>;

			qcom,cons-sync-write-delay-us = <1000>;

		};
@@ -617,8 +613,8 @@ 
		pmi_haptic: qcom,haptic@c000 {

			compatible = "qcom,qpnp-haptic";

			reg = <0xc000 0x100>;

			interrupts = <0x3 0xc0 0x0>,

					<0x3 0xc0 0x1>;

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

					<0x3 0xc0 0x1 IRQ_TYPE_EDGE_BOTH>;

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

			qcom,pmic-revid = <&pmi8950_revid>;

			vcc_pon-supply = <&pon_perph_reg>;