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

Commit d4674fe1 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: configure interrupt types for charger for pmi8998"

parents 8f808604 f9b14578

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

+43 −38
Original line number Diff line number Diff line
@@ -164,11 +164,12 @@ 


			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

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

				interrupts =

					<0x2 0x10 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x4 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "chg-error",

						  "chg-state-change",
@@ -179,10 +180,10 @@ 


			qcom,otg@1100 {

				reg = <0x1100 0x100>;

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

					     <0x2 0x11 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x11 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x11 0x3 IRQ_TYPE_NONE>;

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

					     <0x2 0x11 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x11 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x11 0x3 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "otg-fail",

						  "otg-overcurrent",
@@ -192,12 +193,13 @@ 


			qcom,bat-if@1200 {

				reg = <0x1200 0x100>;

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

				interrupts =

					<0x2 0x12 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x12 0x1 IRQ_TYPE_EDGE_BOTH>,

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



				interrupt-names = "bat-temp",

						  "bat-ocp",
@@ -209,14 +211,15 @@ 


			qcom,usb-chgpth@1300 {

				reg = <0x1300 0x100>;

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

					     <0x2 0x13 0x7 IRQ_TYPE_NONE>;

				interrupts =

					<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_RISING>,

					<0x2 0x13 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x13 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "usbin-collapse",

						  "usbin-lt-3p6v",
@@ -230,13 +233,14 @@ 


			qcom,dc-chgpth@1400 {

				reg = <0x1400 0x100>;

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

					     <0x2 0x14 0x1 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x2 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x3 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x4 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x5 IRQ_TYPE_NONE>,

					     <0x2 0x14 0x6 IRQ_TYPE_NONE>;

				interrupts =

					<0x2 0x14 0x0 IRQ_TYPE_EDGE_BOTH>,

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



				interrupt-names = "dcin-collapse",

						  "dcin-lt-3p6v",
@@ -249,14 +253,15 @@ 


			qcom,chgr-misc@1600 {

				reg = <0x1600 0x100>;

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

					     <0x2 0x16 0x6 IRQ_TYPE_NONE>,

					     <0x2 0x16 0x7 IRQ_TYPE_NONE>;

				interrupts =

					<0x2 0x16 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x1 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 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x16 0x6 IRQ_TYPE_EDGE_FALLING>,

					<0x2 0x16 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",