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

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

Merge "ARM: dts: msm: Fix slave id for pm6150 charger"

parents 7e7c4a64 e0425232

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

+54 −54
Original line number Diff line number Diff line
@@ -69,14 +69,14 @@ 
			qcom,chgr@1000 {

				reg = <0x1000 0x100>;

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

					<0x2 0x10 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x7 IRQ_TYPE_EDGE_RISING>;

					<0x0 0x10 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x10 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "chgr-error",

						  "chg-state-change",
@@ -91,14 +91,14 @@ 
			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 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x2 0x11 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x7 IRQ_TYPE_EDGE_BOTH>;

					<0x0 0x11 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x11 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x11 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x11 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x11 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x11 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x11 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x11 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "otg-fail",

						  "otg-oc-disable-sw",
@@ -113,13 +113,13 @@ 
			qcom,batif@1200 {

				reg = <0x1200 0x100>;

				interrupts =

					<0x2 0x12 0x0 IRQ_TYPE_EDGE_RISING>,

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

					<0x0 0x12 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x12 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x5 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x6 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x12 0x7 IRQ_TYPE_EDGE_BOTH>;



				interrupt-names = "bat-temp",

						  "bat-ov",
@@ -133,14 +133,14 @@ 
			qcom,usb@1300 {

				reg = <0x1300 0x100>;

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

					<0x0 0x13 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x13 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x13 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x13 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "usbin-collapse",

						  "usbin-vashdn",
@@ -155,13 +155,13 @@ 
			qcom,dc@1400 {

				reg = <0x1400 0x100>;

				interrupts =

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

					<0x2 0x14 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x14 0x7 IRQ_TYPE_EDGE_RISING>;

					<0x0 0x14 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x14 0x2 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x14 0x3 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x14 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x14 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x14 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x14 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "dcin-vashdn",

						  "dcin-uv",
@@ -175,14 +175,14 @@ 
			qcom,typec@1500 {

				reg = <0x1500 0x100>;

				interrupts =

					<0x2 0x15 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x15 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x15 0x7 IRQ_TYPE_EDGE_RISING>;

					<0x0 0x15 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "typec-or-rid-detect-change",

						  "typec-vpd-detect",
@@ -197,14 +197,14 @@ 
			qcom,misc@1600 {

				reg = <0x1600 0x100>;

				interrupts =

					<0x2 0x16 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x7 IRQ_TYPE_EDGE_RISING>;

					<0x0 0x16 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x16 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",