From: Doug Anderson <dianders@chromium.org>
To: Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>
Cc: Anton Vorontsov <anton@enomsg.org>,
Olof Johansson <olof@lixom.net>,
Sachin Kamat <sachin.kamat@linaro.org>,
AJAY KUMAR RAMAKRISHNA SHYMALAMMA <ajaykumar.rs@samsung.com>,
linux-samsung-soc <linux-samsung-soc@vger.kernel.org>,
Simon Glass <sjg@chromium.org>,
Michael Spang <spang@chromium.org>,
Sean Paul <seanpaul@chromium.org>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Randy Dunlap <rdunlap@infradead.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
linux-doc@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 4/5] regulator: tps65090: Allow setting the overcurrent wait time
Date: Wed, 23 Apr 2014 08:48:07 -0700 [thread overview]
Message-ID: <CAD=FV=WN4hVibiK_8+mpNfO7UQnd35ZT9EXA9fuw-mnBzzb1cA@mail.gmail.com> (raw)
In-Reply-To: <20140423115102.GO21613@lee--X1>
Lee,
On Wed, Apr 23, 2014 at 4:51 AM, Lee Jones <lee.jones@linaro.org> wrote:
>> The tps65090 regulator allows you to specify how long you want it to
>> wait before detecting an overcurrent condition. Allow specifying that
>> through the device tree (or through platform data).
>>
>> Signed-off-by: Doug Anderson <dianders@chromium.org>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> Signed-off-by: Michael Spang <spang@chromium.org>
>> Signed-off-by: Sean Paul <seanpaul@chromium.org>
>> ---
>> Changes in v3:
>> - Fixed kernel-doc notation for return
>>
>> Changes in v2:
>> - Separated the overcurrent and retries changes into two patches.
>> - Now set overcurrent at probe time since it doesn't change.
>>
>> .../devicetree/bindings/regulator/tps65090.txt | 4 ++
>> drivers/regulator/tps65090-regulator.c | 56 ++++++++++++++++++++++
>> include/linux/mfd/tps65090.h | 5 ++
>> 3 files changed, 65 insertions(+)
>
> Applied, thanks.
Ummmm, Mark said that he had already applied this patch to his tree (I
mentioned it in my recent summary and you can see it in this thread
too). I don't see it on git.kernel.org though
<https://git.kernel.org/cgit/linux/kernel/git/broonie/regulator.git/log/?h=for-next>
I'm worried this will cause a merge conflict if you both apply it.
-Doug
next prev parent reply other threads:[~2014-04-23 15:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 23:12 [PATCH v3 0/5] Fixes for tps65090 for Samsung ARM Chromebook Doug Anderson
2014-04-16 23:12 ` [PATCH v3 1/5] mfd: tps65090: Don't tell child devices we have an IRQ if we don't Doug Anderson
2014-04-23 11:49 ` Lee Jones
2014-04-16 23:12 ` [PATCH v3 2/5] charger: tps65090: Allow charger module to be used when no irq Doug Anderson
2014-04-16 23:12 ` [PATCH v3 3/5] mfd: tps65090: Stop caching most registers Doug Anderson
2014-04-17 11:00 ` Lee Jones
2014-04-17 15:51 ` Doug Anderson
2014-04-23 11:27 ` Lee Jones
2014-04-23 11:50 ` Lee Jones
2014-04-16 23:12 ` [PATCH v3 4/5] regulator: tps65090: Allow setting the overcurrent wait time Doug Anderson
2014-04-18 15:06 ` Mark Brown
2014-04-23 11:51 ` Lee Jones
2014-04-23 15:48 ` Doug Anderson [this message]
2014-05-01 18:17 ` Olof Johansson
2014-05-01 18:49 ` Mark Brown
2014-05-01 18:49 ` Mark Brown
2014-05-01 18:52 ` Doug Anderson
2014-05-01 19:05 ` Mark Brown
2014-04-16 23:12 ` [PATCH v3 5/5] regulator: tps65090: Make FETs more reliable by adding retries Doug Anderson
2014-04-18 17:43 ` Mark Brown
2014-04-18 18:05 ` Doug Anderson
2014-04-22 7:47 ` Lee Jones
2014-04-22 11:02 ` Mark Brown
2014-04-22 15:07 ` Lee Jones
2014-04-22 15:28 ` Doug Anderson
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='CAD=FV=WN4hVibiK_8+mpNfO7UQnd35ZT9EXA9fuw-mnBzzb1cA@mail.gmail.com' \
--to=dianders@chromium.org \
--cc=ajaykumar.rs@samsung.com \
--cc=anton@enomsg.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=sachin.kamat@linaro.org \
--cc=sameo@linux.intel.com \
--cc=seanpaul@chromium.org \
--cc=sjg@chromium.org \
--cc=spang@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.