Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (96 commits)
  sh: add support for SMSC Polaris platform
  sh: fix the HD64461 level-triggered interrupts handling
  sh: sh-rtc wakeup support
  sh: sh-rtc invalid time rework
  sh: sh-rtc carry interrupt rework
  sh: disallow kexec virtual entry
  sh: kexec jump: fix for ftrace.
  sh: kexec: Drop SR.BL bit toggling.
  sh: add kexec jump support
  sh: rework kexec segment code
  sh: simplify kexec vbr code
  sh: Flush only the needed range when unmapping a VMA.
  sh: Update debugfs ASID dumping for 16-bit ASID support.
  sh: tlb-pteaex: Kill off legacy PTEA updates.
  sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
  sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp
  sh: espt-giga board support
  sh: dma: Make G2 DMA configurable.
  sh: dma: Make PVR2 DMA configurable.
  sh: Move IRQ multi definition of DMAC to defconfig
  ...

2 files changed, 67 insertions, 15 deletions

diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 0a0fd48a8566..53f8f1100e81 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -61,7 +61,7 @@
 #include <mach-dreamcast/mach/sysasic.h>
 #endif
 
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
 #include <linux/pagemap.h>
 #include <mach/dma.h>
 #include <asm/dma.h>
@@ -188,7 +188,7 @@ static unsigned int is_blanked = 0;		/* Is the screen blanked? */
 static unsigned long pvr2fb_map;
 #endif
 
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
 static unsigned int shdma = PVR2_CASCADE_CHAN;
 static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
 #endif
@@ -207,7 +207,7 @@ static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id);
 static int pvr2_init_cable(void);
 static int pvr2_get_param(const struct pvr2_params *p, const char *s,
                             int val, int size);
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
 static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos);
 #endif
@@ -218,7 +218,7 @@ static struct fb_ops pvr2fb_ops = {
         .fb_blank       = pvr2fb_blank,
         .fb_check_var   = pvr2fb_check_var,
         .fb_set_par     = pvr2fb_set_par,
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
         .fb_write       = pvr2fb_write,
 #endif
         .fb_fillrect    = cfb_fillrect,
@@ -671,7 +671,7 @@ static int pvr2_init_cable(void)
         return cable_type;
 }
 
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
 static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                             size_t count, loff_t *ppos)
 {
@@ -743,7 +743,7 @@ out_unmap:
 
         return ret;
 }
-#endif /* CONFIG_SH_DMA */
+#endif /* CONFIG_PVR2_DMA */
 
 /**
  * pvr2fb_common_init
@@ -893,7 +893,7 @@ static int __init pvr2fb_dc_init(void)
                 return -EBUSY;
         }
 
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
         if (request_dma(pvr2dma, "pvr2") != 0) {
                 free_irq(HW_EVENT_VSYNC, 0);
                 return -EBUSY;
@@ -915,7 +915,7 @@ static void __exit pvr2fb_dc_exit(void)
         }
 
         free_irq(HW_EVENT_VSYNC, 0);
-#ifdef CONFIG_SH_DMA
+#ifdef CONFIG_PVR2_DMA
         free_dma(pvr2dma);
 #endif
 }
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 2c5d069e5f06..b433b8ac76d9 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -33,6 +33,8 @@ struct sh_mobile_lcdc_chan {
         struct fb_info info;
         dma_addr_t dma_handle;
         struct fb_deferred_io defio;
+        unsigned long frame_end;
+        wait_queue_head_t frame_end_wait;
 };
 
 struct sh_mobile_lcdc_priv {
@@ -226,7 +228,10 @@ static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
 static irqreturn_t sh_mobile_lcdc_irq(int irq, void *data)
 {
         struct sh_mobile_lcdc_priv *priv = data;
+        struct sh_mobile_lcdc_chan *ch;
         unsigned long tmp;
+        int is_sub;
+        int k;
 
         /* acknowledge interrupt */
         tmp = lcdc_read(priv, _LDINTR);
@@ -234,8 +239,24 @@ static irqreturn_t sh_mobile_lcdc_irq(int irq, void *data)
         tmp |= 0x000000ff ^ LDINTR_FS; /* status in low 8 */
         lcdc_write(priv, _LDINTR, tmp);
 
-        /* disable clocks */
-        sh_mobile_lcdc_clk_off(priv);
+        /* figure out if this interrupt is for main or sub lcd */
+        is_sub = (lcdc_read(priv, _LDSR) & (1 << 10)) ? 1 : 0;
+
+        /* wake up channel and disable clocks*/
+        for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
+                ch = &priv->ch[k];
+
+                if (!ch->enabled)
+                        continue;
+
+                if (is_sub == lcdc_chan_is_sublcd(ch)) {
+                        ch->frame_end = 1;
+                        wake_up(&ch->frame_end_wait);
+
+                        sh_mobile_lcdc_clk_off(priv);
+                }
+        }
+
         return IRQ_HANDLED;
 }
 
@@ -448,18 +469,27 @@ static void sh_mobile_lcdc_stop(struct sh_mobile_lcdc_priv *priv)
         struct sh_mobile_lcdc_board_cfg *board_cfg;
         int k;
 
-        /* tell the board code to disable the panel */
+        /* clean up deferred io and ask board code to disable panel */
         for (k = 0; k < ARRAY_SIZE(priv->ch); k++) {
                 ch = &priv->ch[k];
-                board_cfg = &ch->cfg.board_cfg;
-                if (board_cfg->display_off)
-                        board_cfg->display_off(board_cfg->board_data);
 
-                /* cleanup deferred io if enabled */
+                /* deferred io mode:
+                 * flush frame, and wait for frame end interrupt
+                 * clean up deferred io and enable clock
+                 */
                 if (ch->info.fbdefio) {
+                        ch->frame_end = 0;
+                        schedule_delayed_work(&ch->info.deferred_work, 0);
+                        wait_event(ch->frame_end_wait, ch->frame_end);
                         fb_deferred_io_cleanup(&ch->info);
                         ch->info.fbdefio = NULL;
+                        sh_mobile_lcdc_clk_on(priv);
                 }
+
+                board_cfg = &ch->cfg.board_cfg;
+                if (board_cfg->display_off)
+                        board_cfg->display_off(board_cfg->board_data);
+
         }
 
         /* stop the lcdc */
@@ -652,6 +682,26 @@ static int sh_mobile_lcdc_set_bpp(struct fb_var_screeninfo *var, int bpp)
         return 0;
 }
 
+static int sh_mobile_lcdc_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        sh_mobile_lcdc_stop(platform_get_drvdata(pdev));
+        return 0;
+}
+
+static int sh_mobile_lcdc_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        return sh_mobile_lcdc_start(platform_get_drvdata(pdev));
+}
+
+static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
+        .suspend = sh_mobile_lcdc_suspend,
+        .resume = sh_mobile_lcdc_resume,
+};
+
 static int sh_mobile_lcdc_remove(struct platform_device *pdev);
 
 static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
@@ -707,6 +757,7 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev, "unsupported interface type\n");
                         goto err1;
                 }
+                init_waitqueue_head(&priv->ch[i].frame_end_wait);
 
                 switch (pdata->ch[i].chan) {
                 case LCDC_CHAN_MAINLCD:
@@ -860,6 +911,7 @@ static struct platform_driver sh_mobile_lcdc_driver = {
         .driver         = {
                 .name           = "sh_mobile_lcdc_fb",
                 .owner          = THIS_MODULE,
+                .pm             = &sh_mobile_lcdc_dev_pm_ops,
         },
         .probe          = sh_mobile_lcdc_probe,
         .remove         = sh_mobile_lcdc_remove,