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

Commit 45a42ee0 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: fix slave-id of charger and FG on PMFALCON"

parents 25f0ed75 3bb0627e

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

+54 −54
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ 


			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 = <0x0 0x10 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x10 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x10 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x10 0x3 IRQ_TYPE_NONE>,

					     <0x0 0x10 0x4 IRQ_TYPE_NONE>;



				interrupt-names = "chg-error",

						  "chg-state-change",
@@ -312,10 +312,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 = <0x0 0x11 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x11 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x11 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x11 0x3 IRQ_TYPE_NONE>;



				interrupt-names = "otg-fail",

						  "otg-overcurrent",
@@ -325,12 +325,12 @@ 


			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 = <0x0 0x12 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x12 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x12 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x12 0x3 IRQ_TYPE_NONE>,

					     <0x0 0x12 0x4 IRQ_TYPE_NONE>,

					     <0x0 0x12 0x5 IRQ_TYPE_NONE>;



				interrupt-names = "bat-temp",

						  "bat-ocp",
@@ -342,14 +342,14 @@ 


			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 = <0x0 0x13 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x3 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x4 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x5 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x6 IRQ_TYPE_NONE>,

					     <0x0 0x13 0x7 IRQ_TYPE_NONE>;



				interrupt-names = "usbin-collapse",

						  "usbin-lt-3p6v",
@@ -363,13 +363,13 @@ 


			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 = <0x0 0x14 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x3 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x4 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x5 IRQ_TYPE_NONE>,

					     <0x0 0x14 0x6 IRQ_TYPE_NONE>;



				interrupt-names = "dcin-collapse",

						  "dcin-lt-3p6v",
@@ -382,14 +382,14 @@ 


			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 = <0x0 0x16 0x0 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x1 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x2 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x3 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x4 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x5 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x6 IRQ_TYPE_NONE>,

					     <0x0 0x16 0x7 IRQ_TYPE_NONE>;



				interrupt-names = "wdog-snarl",

						  "wdog-bark",
@@ -505,15 +505,15 @@ 
			qcom,fg-batt-soc@4000 {

				status = "okay";

				reg = <0x4000 0x100>;

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

					     <0x2 0x40 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x4 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x5

				interrupts = <0x0 0x40 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x4 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x5

							IRQ_TYPE_EDGE_RISING>,

					     <0x2 0x40 0x6 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x40 0x7 IRQ_TYPE_EDGE_BOTH>;

					     <0x0 0x40 0x6 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x40 0x7 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "soc-update",

						  "soc-ready",

						  "bsoc-delta",
@@ -527,11 +527,11 @@ 
			qcom,fg-batt-info@4100 {

				status = "okay";

				reg = <0x4100 0x100>;

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

					     <0x2 0x41 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x41 0x6 IRQ_TYPE_EDGE_BOTH>;

				interrupts = <0x0 0x41 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x41 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x41 0x2 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x41 0x3 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x41 0x6 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "vbatt-pred-delta",

						  "vbatt-low",

						  "esr-delta",
@@ -542,9 +542,9 @@ 
			qcom,fg-memif@4400 {

				status = "okay";

				reg = <0x4400 0x100>;

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

					     <0x2 0x44 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x2 0x44 0x2 IRQ_TYPE_EDGE_BOTH>;

				interrupts = <0x0 0x44 0x0 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x44 0x1 IRQ_TYPE_EDGE_BOTH>,

					     <0x0 0x44 0x2 IRQ_TYPE_EDGE_BOTH>;

				interrupt-names = "ima-rdy",

						  "mem-xcp",

						  "dma-grant";