Re: [PATCH v3 4/5] regulator: tps65090: Allow setting the overcurrent wait time

[Doug Anderson]

Lee,

On Wed, Apr 23, 2014 at 4:51 AM, Lee Jones <lee.jones@xxxxxxxxxx> 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@xxxxxxxxxxxx>
>> Signed-off-by: Simon Glass <sjg@xxxxxxxxxxxx>
>> Signed-off-by: Michael Spang <spang@xxxxxxxxxxxx>
>> Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
>> ---
>> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/