summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel <sre@debian.org>2013-11-17 12:29:06 +0000
committerSebastian Reichel <sre@kernel.org>2014-04-23 17:44:56 +0200
commite30c9e89390a1e19688356c1e6b41800ce459d2a (patch)
tree7a5800bfcea54419f784cf169a48ba9a3e9cfbd2
parenta555dfa40b9f46b0b32d4903e01989b964bfefb6 (diff)
downloadlinux-e30c9e89390a1e19688356c1e6b41800ce459d2a.tar.bz2
[media] ir-rx51: switch to common clock framework
This updates the Nokia N900 IR driver to use the common clock framework instead of omap platform code. Signed-off-by: Sebastian Reichel <sre@debian.org>
-rw-r--r--drivers/media/rc/ir-rx51.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index b1e19a26208d..13958220aa73 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>
@@ -208,7 +208,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;