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@xxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Cc: Timo Kokkonen <timo.t.kokkonen@xxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: linux-media@xxxxxxxxxxxxxxx --- arch/arm/plat-omap/dmtimer.c | 16 ++++++++-------- drivers/media/rc/ir-rx51.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index a0daa2f..ea133e5 100644 --- 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(); diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index 8ead492..d1364a1 100644 --- a/drivers/media/rc/ir-rx51.c +++ b/drivers/media/rc/ir-rx51.c @@ -25,9 +25,9 @@ #include <linux/platform_device.h> #include <linux/sched.h> #include <linux/wait.h> +#include <linux/clk.h> #include <plat/dmtimer.h> -#include <plat/clock.h> #include <media/lirc.h> #include <media/lirc_dev.h> @@ -209,7 +209,7 @@ static int lirc_rx51_init_port(struct lirc_rx51 *lirc_rx51) } clk_fclk = omap_dm_timer_get_fclk(lirc_rx51->pwm_timer); - lirc_rx51->fclk_khz = clk_fclk->rate / 1000; + lirc_rx51->fclk_khz = clk_get_rate(clk_fclk) / 1000; return 0; -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html