linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] [media] ir-rx51: fix clock API related build issues
Date: Tue, 5 Mar 2013 17:09:53 -0800	[thread overview]
Message-ID: <20130306010952.GJ11806@atomide.com> (raw)
In-Reply-To: <20130305212351.4993d8c6@redhat.com>

* Mauro Carvalho Chehab <mchehab@redhat.com> [130305 16:28]:
> Em Tue,  5 Mar 2013 23:16:46 +0100
> Arnd Bergmann <arnd@arndb.de> escreveu:
> 
> > OMAP1 no longer provides its own clock interfaces since patch
> > a135eaae52 "ARM: OMAP: remove plat/clock.h". This is great, but
> > we now have to convert the ir-rx51 driver to use the generic
> > interface from linux/clk.h.
> > 
> > The driver also uses the omap_dm_timer_get_fclk() function,
> > which is not exported for OMAP1, so we have to move the
> > definition out of the OMAP2 specific section.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> 
> From my side:
> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>

There's just one issue, this driver most likely only needed on
rx51 board.. So I suggest we just mark the driver depends on
ARCH_OMAP2PLUS and let's drop this patch.

This driver is already disabled for ARCH_MULTIPLATFORM
as we need to move dmtimer.c to drivers and have some minimal
include/linux/timer-omap.h for it.
 
> > --- a/arch/arm/plat-omap/dmtimer.c
> > +++ b/arch/arm/plat-omap/dmtimer.c
> > @@ -333,6 +333,14 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
> >  }
> >  EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq);
> >  
> > +struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
> > +{
> > +	if (timer)
> > +		return timer->fclk;
> > +	return NULL;
> > +}
> > +EXPORT_SYMBOL_GPL(omap_dm_timer_get_fclk);
> > +
> >  #if defined(CONFIG_ARCH_OMAP1)
> >  #include <mach/hardware.h>
> >  /**
> > @@ -371,14 +379,6 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);
> >  
> >  #else
> >  
> > -struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
> > -{
> > -	if (timer)
> > -		return timer->fclk;
> > -	return NULL;
> > -}
> > -EXPORT_SYMBOL_GPL(omap_dm_timer_get_fclk);
> > -
> >  __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask)
> >  {
> >  	BUG();

Then omap_dm_timer_get_fclk() won't work on omap1 as there's no
separate functional clock. We probably should not even export
this function eventually when things are fixed up.

Regards,

Tony

  reply	other threads:[~2013-03-06  1:09 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-05 22:16 [PATCH 0/9] fixes for ARM build regressions in 3.9-rc1 Arnd Bergmann
2013-03-05 22:16 ` [PATCH 1/9] clk: vt8500: Fix "fix device clock divisor calculations" Arnd Bergmann
2013-03-05 22:16 ` [PATCH 2/9] Revert parts of "hlist: drop the node parameter from iterators" Arnd Bergmann
2013-03-05 22:16 ` [PATCH 3/9] mfd: remove __exit_p annotation for twl4030_madc_remove Arnd Bergmann
2013-03-06  1:01   ` Tony Lindgren
2013-03-05 22:16 ` [PATCH 4/9] usb: gadget: fix omap_udc build errors Arnd Bergmann
2013-03-05 22:22   ` Felipe Balbi
2013-03-06  0:44     ` Greg Kroah-Hartman
2013-03-06  8:05       ` Felipe Balbi
2013-03-05 22:16 ` [PATCH 5/9] ARM: omap1: add back missing includes Arnd Bergmann
2013-03-05 22:27   ` Arnd Bergmann
2013-03-06  0:59     ` Tony Lindgren
2013-03-06 11:23       ` Arnd Bergmann
2013-03-06 17:44         ` Tony Lindgren
2013-03-05 22:16 ` [PATCH 6/9] [media] ir-rx51: fix clock API related build issues Arnd Bergmann
2013-03-06  0:23   ` Mauro Carvalho Chehab
2013-03-06  1:09     ` Tony Lindgren [this message]
2013-03-06  6:22       ` Timo Kokkonen
2013-03-06 17:16         ` Tony Lindgren
2013-03-05 22:16 ` [PATCH 7/9] [media] s5p-fimc: fix s5pv210 build Arnd Bergmann
2013-03-06 23:48   ` Kukjin Kim
2013-03-05 22:16 ` [PATCH 8/9] iommu: OMAP: build only on OMAP2+ Arnd Bergmann
2013-03-06  1:10   ` Tony Lindgren
2013-03-09 18:02   ` Joerg Roedel
2013-03-05 22:16 ` [PATCH 9/9] ARM: spear3xx: Use correct pl080 header file Arnd Bergmann
2013-03-05 23:13   ` Viresh Kumar
2013-03-11 22:34     ` Arnd Bergmann
2013-03-12  0:53       ` Viresh Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130306010952.GJ11806@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).