Merge "ARM: dts: msm: configure interrupt types for charger for pm660"

This commit is contained in:
Linux Build Service Account 2017-05-26 00:10:39 -07:00 committed by Gerrit - the friendly Code Review server
commit c78cb70a36

View file

@ -338,11 +338,12 @@
qcom,chgr@1000 {
reg = <0x1000 0x100>;
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>;
interrupts =
<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>;
interrupt-names = "chg-error",
"chg-state-change",
@ -353,10 +354,10 @@
qcom,otg@1100 {
reg = <0x1100 0x100>;
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>;
interrupts = <0x0 0x11 0x0 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x11 0x1 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x11 0x2 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x11 0x3 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "otg-fail",
"otg-overcurrent",
@ -366,12 +367,13 @@
qcom,bat-if@1200 {
reg = <0x1200 0x100>;
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>;
interrupts =
<0x0 0x12 0x0 IRQ_TYPE_EDGE_RISING>,
<0x0 0x12 0x1 IRQ_TYPE_EDGE_BOTH>,
<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>;
interrupt-names = "bat-temp",
"bat-ocp",
@ -383,14 +385,15 @@
qcom,usb-chgpth@1300 {
reg = <0x1300 0x100>;
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>;
interrupts =
<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-lt-3p6v",
@ -404,13 +407,14 @@
qcom,dc-chgpth@1400 {
reg = <0x1400 0x100>;
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>;
interrupts =
<0x0 0x14 0x0 IRQ_TYPE_EDGE_BOTH>,
<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_BOTH>,
<0x0 0x14 0x6 IRQ_TYPE_EDGE_RISING>;
interrupt-names = "dcin-collapse",
"dcin-lt-3p6v",
@ -423,14 +427,15 @@
qcom,chgr-misc@1600 {
reg = <0x1600 0x100>;
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>;
interrupts =
<0x0 0x16 0x0 IRQ_TYPE_EDGE_RISING>,
<0x0 0x16 0x1 IRQ_TYPE_EDGE_RISING>,
<0x0 0x16 0x2 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x16 0x3 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x16 0x4 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x16 0x5 IRQ_TYPE_EDGE_BOTH>,
<0x0 0x16 0x6 IRQ_TYPE_EDGE_FALLING>,
<0x0 0x16 0x7 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "wdog-snarl",
"wdog-bark",