[0/2] Add input supplies to rk808 regulator

Commit Message

Heiko Stübner Sept. 2, 2014, 7:48 p.m. UTC

Am Dienstag, 2. September 2014, 09:14:27 schrieb Doug Anderson:
> We want to specify the input supplies to the rk808 regulator.  This
> patch series adds them to the driver.  Note that the bindings are
> based atop Chris's most recent version at
> <https://patchwork.kernel.org/patch/4817931/>.  If the regulator patch
> is applied before Chris sends out his next version then I think Chris
> could squash my bindings change (patch 2) into his next version.
> 
> 
> Doug Anderson (2):
>   regulator: RK808: Add proper input supplies for rk808

Patch 1 didn't apply, as it didn't take the recent pdata removal Chris
posted. After fixing this [0], it sucessfully solved the missing supplies
I've seen on the weekend, so

Tested-by: Heiko Stuebner <[e-mail]>


>   dt-bindings: Add input supplies to rk808 bindings
> 
>  Documentation/devicetree/bindings/mfd/rk808.txt | 11 +++++++++++
>  drivers/regulator/rk808-regulator.c             | 15 ++++++++++++++-
>  2 files changed, 25 insertions(+), 1 deletion(-)



[0]

As Chris is supposed to merge these changes into his series, this doesn't
really matter though.

Comments

Douglas Anderson Sept. 2, 2014, 7:50 p.m. UTC | #1

Heiko,

On Tue, Sep 2, 2014 at 12:48 PM, Heiko Stübner <[e-mail]> wrote:
> Am Dienstag, 2. September 2014, 09:14:27 schrieb Doug Anderson:
>> We want to specify the input supplies to the rk808 regulator.  This
>> patch series adds them to the driver.  Note that the bindings are
>> based atop Chris's most recent version at
>> <https://patchwork.kernel.org/patch/4817931/>.  If the regulator patch
>> is applied before Chris sends out his next version then I think Chris
>> could squash my bindings change (patch 2) into his next version.
>>
>>
>> Doug Anderson (2):
>>   regulator: RK808: Add proper input supplies for rk808
>
> Patch 1 didn't apply, as it didn't take the recent pdata removal Chris
> posted. After fixing this [0], it sucessfully solved the missing supplies
> I've seen on the weekend, so
>
> Tested-by: Heiko Stuebner <[e-mail]>

Thanks!  ...ah, I guess I usually apply things with "git am -3" and it
didn't complain about applying my patch atop Chris's or not atop
Chris's.  Sorry for not making it clear.

Patch

--- "[PATCH 1_2] regulator_RK808_Add proper input supplies for rk808.mbox.orig"	2014-09-02 20:49:12.000000000 +0200
+++ "[PATCH 1_2] regulator_RK808_Add proper input supplies for rk808.mbox"	2014-09-02 21:22:57.052197875 +0200
@@ -203,7 +203,7 @@ 
  		.type = REGULATOR_VOLTAGE,
 @@ -364,7 +378,6 @@ static int rk808_regulator_probe(struct platform_device *pdev)
  		if (client->dev.of_node)
- 			config.of_node = pdata->of_node[i];
+ 			config.of_node = rk808_regulator->of_node[i];
  
 -		reg_data->supply_regulator = rk808_reg[i].name;
  		config.init_data = reg_data;