[PATCH 21/23] video i.MX: Switch to clock support

[Sascha Hauer <s.hauer@pengutronix.de>]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/video/imx.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/video/imx.c b/drivers/video/imx.c
index 452e558..810d8e3 100644
--- a/drivers/video/imx.c
+++ b/drivers/video/imx.c
@@ -22,6 +22,8 @@
 #include <malloc.h>
 #include <errno.h>
 #include <init.h>
+#include <linux/clk.h>
+#include <linux/err.h>
 #include <mach/imx-regs.h>
 #include <asm-generic/div64.h>
 #include <mach/clock.h>
@@ -138,6 +140,7 @@ struct imxfb_rgb {
 
 struct imxfb_info {
 	void __iomem		*regs;
+	struct clk		*clk;
 
 	u_int			pcr;
 	u_int			pwmr;
@@ -341,7 +344,7 @@ static int imxfb_activate_var(struct fb_info *info)
 	writel(readl(fbi->regs + LCDC_CPOS) & ~(CPOS_CC0 | CPOS_CC1),
 		fbi->regs + LCDC_CPOS);
 
-	lcd_clk = imx_get_lcdclk();
+	lcd_clk = clk_get_rate(fbi->clk);
 
 	tmp = mode->pixclock * (unsigned long long)lcd_clk;
 
@@ -564,6 +567,10 @@ static int imxfb_probe(struct device_d *dev)
 	fbi = xzalloc(sizeof(*fbi));
 	info = &fbi->info;
 
+	fbi->clk = clk_get(dev, NULL);
+	if (IS_ERR(fbi->clk))
+		return PTR_ERR(fbi->clk);
+
 	fbi->mode = pdata->mode;
 	fbi->regs = dev_request_mem_region(dev, 0);
 	fbi->pcr = pdata->mode->pcr;
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox