From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Thu, 2 Jun 2016 14:03:41 -0600
Subject: [U-Boot] [PATCH] clk: convert API to match reset/mailbox style
In-Reply-To: <CACUy__V8wbj_tVFRVwcEkwNPDQYpMwSMBuLN=es=nKM0zsEQbg@mail.gmail.com>
References: <20160523174710.1712-1-swarren@wwwdotorg.org>
 <5750661D.4050402@wwwdotorg.org>
 <CACUy__V8wbj_tVFRVwcEkwNPDQYpMwSMBuLN=es=nKM0zsEQbg@mail.gmail.com>
Message-ID: <5750911D.2080901@wwwdotorg.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 06/02/2016 11:48 AM, Daniel Schwierzeck wrote:
> Hi Stephen,
>
> 2016-06-02 19:00 GMT+02:00 Stephen Warren <swarren@wwwdotorg.org>:
>> On 05/23/2016 11:47 AM, Stephen Warren wrote:
>>>
>>> From: Stephen Warren <swarren@nvidia.com>
>>>
>>> The following changes are made to the clock API:
>>> * The concept of "clocks" and "peripheral clocks" are unified; each clock
>>>     provider now implements a single set of clocks. This provides a simpler
>>>     conceptual interface to clients, and better aligns with device tree
>>>     clock bindings.
>>> * Clocks are now identified with a single "struct clk", rather than
>>>     requiring clients to store the clock provider device and clock identity
>>>     values separately. For simple clock consumers, this isolates clients
>>>     from internal details of the clock API.
>>> * clk.h is split into clk_client.h and clk_uclass.h to make it obvious
>>>     which parts are relevant to consumers and providers. This aligns with
>>>     the recently added reset and mailbox APIs.
>>> * clk_ops .of_xlate(), .request(), and .free() are added so providers
>>>     can customize these operations if needed. This also aligns with the
>>>     recently added reset and mailbox APIs.
>>> * clk_disable() is added.
>>> * All users of the current clock APIs are updated.
>>> * Sandbox clock tests are updated to exercise clock lookup via DT, and
>>>     clock enable/disable.
>>> * rkclk_get_clk() is removed and replaced with standard APIs.
>>>
>>> Buildman shows no clock-related errors for any board for which buildman
>>> can download a toolchain.
>>>
>>> test/py passes for sandbox (which invokes the dm clk test amongst
>>> others).
>>
>>
>> Simon, does this look good?
>>
>
> could you rebase the patch to current mainline?. I couldn't apply it
> some days ago. Thanks.

It seems to work fine for me; see log below. What problem are you seeing?

[swarren at swarren-lx1 u-boot]$ git checkout u-boot/master
HEAD is now at 8b528709c5bb... spl: fit: Fix load address of fit header

[swarren at swarren-lx1 u-boot]$ git am -3 -s ~/\[U-Boot\]\ \[PATCH\]\ 
clk\:\ convert\ API\ to\ match\ reset_mailbox\ style.eml
Applying: clk: convert API to match reset/mailbox style
Using index info to reconstruct a base tree...
M	arch/sandbox/dts/test.dts
M	drivers/clk/clk_rk3288.c
M	drivers/clk/uniphier/clk-uniphier-mio.c
M	drivers/gpio/rk_gpio.c
M	drivers/mmc/rockchip_dw_mmc.c
M	drivers/mmc/uniphier-sd.c
M	drivers/video/rockchip/rk_vop.c
Falling back to patching base and 3-way merge...
Removing include/clk.h
Auto-merging drivers/video/rockchip/rk_vop.c
Auto-merging drivers/mmc/uniphier-sd.c
Auto-merging drivers/mmc/rockchip_dw_mmc.c
Auto-merging drivers/gpio/rk_gpio.c
Auto-merging drivers/clk/uniphier/clk-uniphier-mio.c
Auto-merging drivers/clk/clk_rk3288.c
Auto-merging arch/sandbox/dts/test.dts