Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6

Pull fbdev updates from Florian Tobias Schandinat:
 - large updates for OMAP
   - support for LCD3 overlay manager (omap5)
   - omapdss output cleanup
   - removal of passive matrix LCD support as there are no drivers for
     such panels for DSS or DSS2 and nobody complained (cleanup)
 - large updates for SH Mobile
   - overlay support
   - separating MERAM (cache) from framebuffer driver
 - some updates for Exynos and da8xx-fb
 - various other small patches

* tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6: (78 commits)
  da8xx-fb: fix compile issue due to missing include
  fbdev: Make pixel_to_pat() failure mode more friendly
  da8xx-fb: do not turn ON LCD backlight unless LCDC is enabled
  fbdev: sh_mobile_lcdc: Fix vertical panning step
  video: exynos mipi dsi: Fix mipi dsi regulators handling issue
  video: da8xx-fb: do clock reset of revision 2 LCDC before enabling
  arm: da850: configure LCDC fifo threshold
  video: da8xx-fb: configure FIFO threshold to reduce underflow errors
  video: da8xx-fb: fix flicker due to 1 frame delay in updated frame
  video: da8xx-fb rev2: fix disabling of palette completion interrupt
  da8xx-fb: add missing FB_BLANK operations
  video: exynos_dp: use usleep_range instead of delay
  video: exynos_dp: check the only INTERLANE_ALIGN_DONE bit during Link Training
  fb: epson1355fb: Fix section mismatch
  video: exynos_dp: fix wrong DPCD address during Link Training
  video/smscufx: fix line counting in fb_write
  aty128fb: Fix coding style issues
  fbdev: sh_mobile_lcdc: Fix pan offset computation in YUV mode
  fbdev: sh_mobile_lcdc: Fix overlay registers update during pan operation
  fbdev: sh_mobile_lcdc: Support horizontal panning
  ...

2 files changed, 22 insertions, 4 deletions

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index d1624a315c9a..783eab6845c4 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -546,6 +546,7 @@ static struct lcd_ctrl_config lcd_cfg = {
         .sync_edge              = 0,
         .sync_ctrl              = 1,
         .raster_order           = 0,
+        .fifo_th                = 6,
 };
 
 struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 5fb47a14f4ba..af1ed7d24a1f 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -37,6 +37,7 @@
 
 #define DISPC_CONTROL           0x0040
 #define DISPC_CONTROL2          0x0238
+#define DISPC_CONTROL3          0x0848
 #define DISPC_IRQSTATUS         0x0018
 
 #define DSS_SYSCONFIG           0x10
@@ -52,6 +53,7 @@
 #define EVSYNC_EVEN_IRQ_SHIFT   2
 #define EVSYNC_ODD_IRQ_SHIFT    3
 #define FRAMEDONE2_IRQ_SHIFT    22
+#define FRAMEDONE3_IRQ_SHIFT    30
 #define FRAMEDONETV_IRQ_SHIFT   24
 
 /*
@@ -376,7 +378,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
 static void dispc_disable_outputs(void)
 {
         u32 v, irq_mask = 0;
-        bool lcd_en, digit_en, lcd2_en = false;
+        bool lcd_en, digit_en, lcd2_en = false, lcd3_en = false;
         int i;
         struct omap_dss_dispc_dev_attr *da;
         struct omap_hwmod *oh;
@@ -405,7 +407,13 @@ static void dispc_disable_outputs(void)
                 lcd2_en = v & LCD_EN_MASK;
         }
 
-        if (!(lcd_en | digit_en | lcd2_en))
+        /* store value of LCDENABLE for LCD3 */
+        if (da->manager_count > 3) {
+                v = omap_hwmod_read(oh, DISPC_CONTROL3);
+                lcd3_en = v & LCD_EN_MASK;
+        }
+
+        if (!(lcd_en | digit_en | lcd2_en | lcd3_en))
                 return; /* no managers currently enabled */
 
         /*
@@ -426,10 +434,12 @@ static void dispc_disable_outputs(void)
 
         if (lcd2_en)
                 irq_mask |= 1 << FRAMEDONE2_IRQ_SHIFT;
+        if (lcd3_en)
+                irq_mask |= 1 << FRAMEDONE3_IRQ_SHIFT;
 
         /*
          * clear any previous FRAMEDONE, FRAMEDONETV,
-         * EVSYNC_EVEN/ODD or FRAMEDONE2 interrupts
+         * EVSYNC_EVEN/ODD, FRAMEDONE2 or FRAMEDONE3 interrupts
          */
         omap_hwmod_write(irq_mask, oh, DISPC_IRQSTATUS);
 
@@ -445,12 +455,19 @@ static void dispc_disable_outputs(void)
                 omap_hwmod_write(v, oh, DISPC_CONTROL2);
         }
 
+        /* disable LCD3 manager */
+        if (da->manager_count > 3) {
+                v = omap_hwmod_read(oh, DISPC_CONTROL3);
+                v &= ~LCD_EN_MASK;
+                omap_hwmod_write(v, oh, DISPC_CONTROL3);
+        }
+
         i = 0;
         while ((omap_hwmod_read(oh, DISPC_IRQSTATUS) & irq_mask) !=
                irq_mask) {
                 i++;
                 if (i > FRAMEDONE_IRQ_TIMEOUT) {
-                        pr_err("didn't get FRAMEDONE1/2 or TV interrupt\n");
+                        pr_err("didn't get FRAMEDONE1/2/3 or TV interrupt\n");
                         break;
                 }
                 mdelay(1);