video: sh_mobile_lcdcfb: Support HAVE_CLK=n configurations.
This provides a workaround for users of sh_mobile_lcdcfb that don't define HAVE_CLK and have otherwise sane clock initialization. At the same time, move the sh_mobile_lcdc.h header to include/video/. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
bbfbd8b151
commit
225c9a8d1d
|
@ -20,7 +20,7 @@
|
|||
#include <linux/smc911x.h>
|
||||
#include <media/soc_camera_platform.h>
|
||||
#include <media/sh_mobile_ceu.h>
|
||||
#include <asm/sh_mobile_lcdc.h>
|
||||
#include <video/sh_mobile_lcdc.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/clock.h>
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <asm/sh_mobile_lcdc.h>
|
||||
#include <video/sh_mobile_lcdc.h>
|
||||
#include <asm/migor.h>
|
||||
|
||||
/* LCD Module is a PH240320T according to board schematics. This module
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
#include <linux/clk.h>
|
||||
#include <media/soc_camera_platform.h>
|
||||
#include <media/sh_mobile_ceu.h>
|
||||
#include <video/sh_mobile_lcdc.h>
|
||||
#include <asm/clock.h>
|
||||
#include <asm/machvec.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/sh_keysc.h>
|
||||
#include <asm/sh_mobile_lcdc.h>
|
||||
#include <asm/migor.h>
|
||||
|
||||
/* Address IRQ Size Bus Description
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
#define BSC_CS6ABCR 0xfec1001c
|
||||
|
||||
#include <asm/sh_mobile_lcdc.h>
|
||||
#include <video/sh_mobile_lcdc.h>
|
||||
|
||||
int migor_lcd_qvga_setup(void *board_data, void *sys_ops_handle,
|
||||
struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include <linux/clk.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <asm/sh_mobile_lcdc.h>
|
||||
#include <video/sh_mobile_lcdc.h>
|
||||
|
||||
#define PALETTE_NR 16
|
||||
|
||||
|
@ -34,7 +34,9 @@ struct sh_mobile_lcdc_chan {
|
|||
|
||||
struct sh_mobile_lcdc_priv {
|
||||
void __iomem *base;
|
||||
#ifdef CONFIG_HAVE_CLK
|
||||
struct clk *clk;
|
||||
#endif
|
||||
unsigned long lddckr;
|
||||
struct sh_mobile_lcdc_chan ch[2];
|
||||
};
|
||||
|
@ -422,6 +424,7 @@ static int sh_mobile_lcdc_setup_clocks(struct device *dev, int clock_source,
|
|||
|
||||
priv->lddckr = icksel << 16;
|
||||
|
||||
#ifdef CONFIG_HAVE_CLK
|
||||
if (str) {
|
||||
priv->clk = clk_get(dev, str);
|
||||
if (IS_ERR(priv->clk)) {
|
||||
|
@ -431,6 +434,7 @@ static int sh_mobile_lcdc_setup_clocks(struct device *dev, int clock_source,
|
|||
|
||||
clk_enable(priv->clk);
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -688,10 +692,12 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
|
|||
fb_dealloc_cmap(&info->cmap);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HAVE_CLK
|
||||
if (priv->clk) {
|
||||
clk_disable(priv->clk);
|
||||
clk_put(priv->clk);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (priv->base)
|
||||
iounmap(priv->base);
|
||||
|
|
Loading…
Reference in a new issue