linux-next: manual merge of the mfd tree with the arm-soc tree
sfr at canb.auug.org.au
Wed Oct 14 19:19:11 PDT 2015
Today's linux-next merge of the mfd tree got a conflict in:
6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
from the arm-soc tree and commit:
db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
from the mfd tree.
I fixed it up (see below) and can carry the fix as necessary (no action
Stephen Rothwell sfr at canb.auug.org.au
diff --cc Documentation/devicetree/bindings/mfd/s2mps11.txt
@@@ -15,10 -15,9 +15,13 @@@ Optional properties
- interrupt-parent: Specifies the phandle of the interrupt controller to which
the interrupts from s2mps11 are delivered to.
- interrupts: Interrupt specifiers for interrupt sources.
+- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
+ connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
+ register to turn off the power. Usually the ACOKB is pulled up to VBATT so
+ when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
+ - samsung,s2mps11-wrstbi-ground: Indicates that WRSTBI pin of PMIC is pulled
+ down. When the system is suspended it will always go down thus triggerring
+ unwanted buck warm reset (setting buck voltages to default values).
- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
More information about the linux-arm-kernel