From 8ce2054d4e15a4b04b797805b97c4d3b698ae58a Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 1 Oct 2008 16:24:32 +0900
Subject: [PATCH] --- yaml --- r: 116162 b: refs/heads/master c:
 225c9a8d1da274bf23efec43ec28b1c9e45e12f8 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/sh/boards/board-ap325rxa.c                     | 2 +-
 trunk/arch/sh/boards/mach-migor/lcd_qvga.c                | 2 +-
 trunk/arch/sh/boards/mach-migor/setup.c                   | 2 +-
 trunk/arch/sh/include/asm/migor.h                         | 2 +-
 trunk/drivers/video/sh_mobile_lcdcfb.c                    | 8 +++++++-
 .../sh/include/asm => include/video}/sh_mobile_lcdc.h     | 0
 7 files changed, 12 insertions(+), 6 deletions(-)
 rename trunk/{arch/sh/include/asm => include/video}/sh_mobile_lcdc.h (100%)

diff --git a/[refs] b/[refs]
index 7c04b958d22c..733a81eae715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbfbd8b151fe35c9a1180a7f5254c5d6b8387cc0
+refs/heads/master: 225c9a8d1da274bf23efec43ec28b1c9e45e12f8
diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c
index 00e632fc0688..7ae8dcddfeb4 100644
--- a/trunk/arch/sh/boards/board-ap325rxa.c
+++ b/trunk/arch/sh/boards/board-ap325rxa.c
@@ -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>
 
diff --git a/trunk/arch/sh/boards/mach-migor/lcd_qvga.c b/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
index 6e9609596448..735326c04497 100644
--- a/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
+++ b/trunk/arch/sh/boards/mach-migor/lcd_qvga.c
@@ -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
diff --git a/trunk/arch/sh/boards/mach-migor/setup.c b/trunk/arch/sh/boards/mach-migor/setup.c
index 714dce91cc9b..f27475d2fa0c 100644
--- a/trunk/arch/sh/boards/mach-migor/setup.c
+++ b/trunk/arch/sh/boards/mach-migor/setup.c
@@ -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
diff --git a/trunk/arch/sh/include/asm/migor.h b/trunk/arch/sh/include/asm/migor.h
index c12b632c540b..70596d38fd67 100644
--- a/trunk/arch/sh/include/asm/migor.h
+++ b/trunk/arch/sh/include/asm/migor.h
@@ -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);
diff --git a/trunk/drivers/video/sh_mobile_lcdcfb.c b/trunk/drivers/video/sh_mobile_lcdcfb.c
index 4c32c06579a0..b7468bacce80 100644
--- a/trunk/drivers/video/sh_mobile_lcdcfb.c
+++ b/trunk/drivers/video/sh_mobile_lcdcfb.c
@@ -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);
diff --git a/trunk/arch/sh/include/asm/sh_mobile_lcdc.h b/trunk/include/video/sh_mobile_lcdc.h
similarity index 100%
rename from trunk/arch/sh/include/asm/sh_mobile_lcdc.h
rename to trunk/include/video/sh_mobile_lcdc.h