Hi Russell,
On Mon, Mar 02, 2015 at 11:54:35PM +0000, Russell King - ARM Linux wrote:
(Combining replies...)
On Tue, Mar 03, 2015 at 12:53:37AM +0200, Sakari Ailus wrote:
Hi Laurent and Russell,
On Tue, Mar 03, 2015 at 12:33:44AM +0200, Laurent Pinchart wrote:
Sakari, does it conflict with the omap3isp DT support ? If so, how would you prefer to resolve the conflict ? Russell, would it be fine to merge this through Mauro's tree ?
As other changes will depend on this, I'd prefer not to. The whole "make clk_get() return a unique struct clk" wasn't well tested, and several places broke - and currently clk_add_alias() is broken as a result of that.
I'm trying to get to the longer term solution, where clkdev internally uses a struct clk_hw pointer rather than a struct clk pointer, and I want to clean stuff up first.
If omap3isp needs to keep this code, then so be it - I'll come up with a different patch improving its use of clkdev instead.
I discussed this with Laurent and the two options we thought are
- You provide a stable branch on which I can rebase the patches, in order to avoid a merge conflict or
- We ignore the conflict and let Stephen Rothwell handle it. The conflict itself is relatively simple to resolve.