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

Commit 691d8ff5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Fix interrupt type configuration for PM8150B charger"

parents 897b1fcf 9b46490a

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

+36 −36
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ 
					<0x2 0x10 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x10 0x7 IRQ_TYPE_LEVEL_HIGH>;

					<0x2 0x10 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x10 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "chgr-error",

						  "chg-state-change",
@@ -199,13 +199,13 @@ 
			qcom,dcdc@1100 {

				reg = <0x1100 0x100>;

				interrupts =

					<0x2 0x11 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x11 0x5 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x11 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x7 IRQ_TYPE_LEVEL_HIGH>;

					<0x2 0x11 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "otg-fail",

						  "otg-oc-disable-sw",
@@ -220,12 +220,12 @@ 
				reg = <0x1200 0x100>;

				interrupts =

					<0x2 0x12 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x12 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x5 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x7 IRQ_TYPE_LEVEL_HIGH>;

					<0x2 0x12 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x12 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x12 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x12 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x12 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x12 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "bat-temp",

						  "bat-ov",
@@ -239,12 +239,12 @@ 
			qcom,usb@1300 {

				reg = <0x1300 0x100>;

				interrupts =

					<0x2 0x13 0x0 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x5 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x13 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x13 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x13 0x7 IRQ_TYPE_EDGE_RISING>;
@@ -261,13 +261,13 @@ 
			qcom,dc@1400 {

				reg = <0x1400 0x100>;

				interrupts =

					<0x2 0x14 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x5 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x14 0x7 IRQ_TYPE_LEVEL_HIGH>;

					<0x2 0x14 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x14 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "dcin-vashdn",

						  "dcin-uv",
@@ -282,12 +282,12 @@ 
				reg = <0x1500 0x100>;

				interrupts =

					<0x2 0x15 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x15 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x15 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x15 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "typec-or-rid-detect-change",
@@ -305,11 +305,11 @@ 
				interrupts =

					<0x2 0x16 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x6 IRQ_TYPE_EDGE_FALLING>,

					<0x2 0x16 0x7 IRQ_TYPE_EDGE_RISING>;

					<0x2 0x16 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x16 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x16 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x16 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x16 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",