From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Jul 2008 11:31:35 +0000 (+0300)
Subject: Revert "OMAP: DISPC: Fix to disable also interface clocks. 2nd."
X-Git-Tag: v2.6.26-omap1~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c32c81d59d2d8a66e63f82c9732db256d302068e;p=linux-2.6-omap-h63xx.git

Revert "OMAP: DISPC: Fix to disable also interface clocks. 2nd."

This reverts commit af82f9a81aa2a4287a5ed63937fce07b3670b04a.

Otherwise at least 24xx framebuffer breaks.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index d82588c9aef..6aff476e722 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -914,13 +914,18 @@ static void put_dss_clocks(void)
 
 static void enable_lcd_clocks(int enable)
 {
-	if (enable) {
-		clk_enable(dispc.dss_ick);
+	if (enable)
 		clk_enable(dispc.dss1_fck);
-	} else {
+	else
 		clk_disable(dispc.dss1_fck);
+}
+
+static void enable_interface_clocks(int enable)
+{
+	if (enable)
+		clk_enable(dispc.dss_ick);
+	else
 		clk_disable(dispc.dss_ick);
-	}
 }
 
 static void enable_digit_clocks(int enable)
@@ -1356,6 +1361,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 	if ((r = get_dss_clocks()) < 0)
 		return r;
 
+	enable_interface_clocks(1);
 	enable_lcd_clocks(1);
 
 #ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
@@ -1459,6 +1465,7 @@ fail2:
 	free_irq(INT_24XX_DSS_IRQ, fbdev);
 fail1:
 	enable_lcd_clocks(0);
+	enable_interface_clocks(0);
 	put_dss_clocks();
 
 	return r;
@@ -1475,6 +1482,7 @@ static void omap_dispc_cleanup(void)
 	cleanup_fbmem();
 	free_palette_ram();
 	free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
+	enable_interface_clocks(0);
 	put_dss_clocks();
 }