From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Lee Jones <lee.jones@linaro•org>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Kozlowski <k.kozlowski.k@gmail•com>,
Kukjin Kim <kgene@kernel•org>
Subject: linux-next: manual merge of the mfd tree with the arm-soc tree
Date: Thu, 15 Oct 2015 13:19:11 +1100 [thread overview]
Message-ID: <20151015131911.3b3a7ca8@canb.auug.org.au> (raw)
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in:
Documentation/devicetree/bindings/mfd/s2mps11.txt
between commit:
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
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc Documentation/devicetree/bindings/mfd/s2mps11.txt
index 90eaef393325,a0bc753955c2..000000000000
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/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).
Optional nodes:
- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
next reply other threads:[~2015-10-15 2:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 2:19 Stephen Rothwell [this message]
2015-10-15 2:23 ` linux-next: manual merge of the mfd tree with the arm-soc tree Krzysztof Kozlowski
2015-10-15 8:04 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2025-07-25 1:30 Stephen Rothwell
2022-03-09 2:29 Stephen Rothwell
2022-03-09 9:18 ` Krzysztof Kozlowski
2022-03-23 0:58 ` Stephen Rothwell
2017-01-24 2:43 Stephen Rothwell
2017-01-24 8:16 ` Lee Jones
2011-11-01 5:19 Stephen Rothwell
2011-10-11 5:41 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151015131911.3b3a7ca8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=k.kozlowski.k@gmail$(echo .)com \
--cc=kgene@kernel$(echo .)org \
--cc=lee.jones@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox