Discussions about kernels linux-next project ()

Sascha Hauer | 14 Jun 2012 00:10

Re: "clk: add non CONFIG_HAVE_CLK routines" commit

Hi Viresh,

On Tue, Jun 12, 2012 at 11:57:07AM +0100, viresh kumar wrote:
> Hi Paul/Russell,
> 
> On Wed, May 23, 2012 at 12:46 AM, Paul Gortmaker
> <paul.gortmaker <at> windriver.com> wrote:
> > Hi Viresh,
> >
> > The above listed commit, in linux-next as:
> >
> > commit ebbf0cb5d39cc3e22ef4c425475e76b7f45027de
> >
> >    "clk: add non CONFIG_HAVE_CLK routines"
> >
> > shows up as failures in the netx_defconfig, since there
> > are duplicate stub functions between your changes and the
> > file below:
> >
> >  arch/arm/mach-netx/fb.c:72:6: error: redefinition of 'clk_disable'
> >  include/linux/clk.h:299:51: note: previous definition of 'clk_disable' was here
> >  arch/arm/mach-netx/fb.c:76:5: error: redefinition of 'clk_set_rate'
> >  include/linux/clk.h:306:50: note: previous definition of 'clk_set_rate' was here
> >  arch/arm/mach-netx/fb.c:81:5: error: redefinition of 'clk_enable'
> >  include/linux/clk.h:294:50: note: previous definition of 'clk_enable' was here
> >  arch/arm/mach-netx/fb.c:86:13: error: redefinition of 'clk_get'
> >  include/linux/clk.h:280:58: note: previous definition of 'clk_get' was here
> >  arch/arm/mach-netx/fb.c:91:6: error: redefinition of 'clk_put'
> >  include/linux/clk.h:290:51: note: previous definition of 'clk_put' was here
> >  make[2]: *** [arch/arm/mach-netx/fb.o] Error 1

(Continue reading)

headers

Russell King - ARM Linux | 14 Jun 2012 12:04

Re: "clk: add non CONFIG_HAVE_CLK routines" commit

On Thu, Jun 14, 2012 at 12:10:40AM +0200, Sascha Hauer wrote:
> As the netx does not have fb support in mainline you can just drop this
> one aswell. It has no use.

Are you sure?

Grepping for clcd in arch/arm/mach-netx shows that nxdb500 and nxeb500hmi
seem to have all the necessary stuff to support the AMBA CLCD driver.

headers

Sascha Hauer | 14 Jun 2012 12:18

Re: "clk: add non CONFIG_HAVE_CLK routines" commit

On Thu, Jun 14, 2012 at 11:04:25AM +0100, Russell King - ARM Linux wrote:
> On Thu, Jun 14, 2012 at 12:10:40AM +0200, Sascha Hauer wrote:
> > As the netx does not have fb support in mainline you can just drop this
> > one aswell. It has no use.
> 
> Are you sure?
> 
> Grepping for clcd in arch/arm/mach-netx shows that nxdb500 and nxeb500hmi
> seem to have all the necessary stuff to support the AMBA CLCD driver.

Damn, you are right. I wasn't aware the netx has a AMBA cell and just
grepped for netx in drivers/video.
In this case I suggest to just return NULL for every clock.

Sascha

--

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

headers

viresh kumar | 14 Jun 2012 12:21

Re: "clk: add non CONFIG_HAVE_CLK routines" commit

On Thu, Jun 14, 2012 at 11:18 AM, Sascha Hauer <s.hauer <at> pengutronix.de> wrote:
> Damn, you are right. I wasn't aware the netx has a AMBA cell and just
> grepped for netx in drivers/video.
> In this case I suggest to just return NULL for every clock.

And dropping fb's clk code would still be the right solution, as dummy
clk routines will
do that for you.

--
viresh