Re: linux-next: build failure after merge of the omap_dss2 tree

[Hans de Goede]

This is a multi-part message in MIME format.
Hi Tomi,

On 11/25/2014 12:00 PM, Tomi Valkeinen wrote:
> On 18/11/14 17:07, David Herrmann wrote:
> > Hi
> >
> > On Tue, Nov 18, 2014 at 3:53 PM, Tomi Valkeinen <tomi.valkeinen@xxxxxx> wrote:
> > > Hi,
> > >
> > > Thanks Stephen!
> > >
> > > Hans, have you had a look at this? kbuild test bot also reported this.
> >
> > The fix from Stephen should not go to main-line. It breaks simplefb on
> > x86 without OF. Imo, linux/clk.h should provide a fallback if OF is
> > not defined (like it already does for of_clk_get() and friends).
> >
> > Hans, any comments?
>
> Hans, ping.

Sorry I somehow missed this thread so far, I did see the kbuild mail, but
it looked like a false positive to me, for the compile error case I already fixed
in the last revision of the patch, adding #ifdef CONFIG_OF around the offending code.

But on closer inspection I see that the entirety of linux/clk-provider.h is wrapped
in one huge #ifdef CONFIG_COMMON_CLK and then later on also has:

#ifdef CONFIG_OF
...
int of_clk_get_parent_count(struct device_node *np);
...
#endif

So we need both CONFIG_OF and CONFIG_COMMON_CLK, the attached patch
should fix this.

Regards,

Hans