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

Pull fbdev updates from Florian Tobias Schandinat:
 - driver for AUO-K1900 and AUO-K1901 epaper controller
 - large updates for OMAP (e.g. decouple HDMI audio and video)
 - some updates for Exynos and SH Mobile
 - various other small fixes and cleanups

* tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6: (130 commits)
  video: bfin_adv7393fb: Fix cleanup code
  video: exynos_dp: reduce delay time when configuring video setting
  video: exynos_dp: move sw reset prioir to enabling sw defined function
  video: exynos_dp: use devm_ functions
  fb: handle NULL pointers in framebuffer release
  OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request
  OMAPDSS: Apply VENC timings even if panel is disabled
  OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC
  OMAPDSS: DISPC: Support rotation through TILER
  OMAPDSS: VRFB: remove compiler warnings when CONFIG_BUG=n
  OMAPFB: remove compiler warnings when CONFIG_BUG=n
  OMAPDSS: remove compiler warnings when CONFIG_BUG=n
  OMAPDSS: DISPC: fix usage of dispc_ovl_set_accu_uv
  OMAPDSS: use DSI_FIFO_BUG workaround only for manual update displays
  OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods
  OMAPDSS: DISPC: Update Accumulator configuration for chroma plane
  drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers
  video: exynos mipi dsi: support reverse panel type
  video: exynos mipi dsi: Properly interpret the interrupt source flags
  video: exynos mipi dsi: Avoid races in probe()
  ...

8 files changed, 192 insertions, 141 deletions

diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 314df0518afd..ffa29ddfdfce 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -134,24 +134,27 @@ static struct platform_device anw6410_lcd_powerdev = {
 };
 
 static struct s3c_fb_pd_win anw6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode anw6410_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata anw6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &anw6410_lcd_timing,
         .win[0]         = &anw6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 6b20a71d7dbf..d0c352d861f8 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -151,26 +151,29 @@ static struct platform_device crag6410_lcd_powerdev = {
 
 /* 640x480 URT */
 static struct s3c_fb_pd_win crag6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 150,
-                .right_margin   = 80,
-                .upper_margin   = 40,
-                .lower_margin   = 5,
-                .hsync_len      = 40,
-                .vsync_len      = 5,
-                .xres           = 640,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 640,
+        .yres           = 480,
         .virtual_y      = 480 * 2,
         .virtual_x      = 640,
 };
 
+static struct fb_videomode crag6410_lcd_timing = {
+        .left_margin    = 150,
+        .right_margin   = 80,
+        .upper_margin   = 40,
+        .lower_margin   = 5,
+        .hsync_len      = 40,
+        .vsync_len      = 5,
+        .xres           = 640,
+        .yres           = 480,
+};
+
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata crag6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &crag6410_lcd_timing,
         .win[0]         = &crag6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 1bf6b9da20fc..689088162f77 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -129,23 +129,27 @@ static struct platform_device hmt_backlight_device = {
 };
 
 static struct s3c_fb_pd_win hmt_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode hmt_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
 };
 
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata hmt_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &hmt_lcd_timing,
         .win[0]         = &hmt_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index f8ea61ea3b33..5539a255a704 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -140,41 +140,59 @@ static struct s3c2410_platform_nand mini6410_nand_info = {
         .sets           = mini6410_nand_sets,
 };
 
-static struct s3c_fb_pd_win mini6410_fb_win[] = {
+static struct s3c_fb_pd_win mini6410_lcd_type0_fb_win = {
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+        .xres           = 480,
+        .yres           = 272,
+};
+
+static struct fb_videomode mini6410_lcd_type0_timing = {
+        /* 4.3" 480x272 */
+        .left_margin    = 3,
+        .right_margin   = 2,
+        .upper_margin   = 1,
+        .lower_margin   = 1,
+        .hsync_len      = 40,
+        .vsync_len      = 1,
+        .xres           = 480,
+        .yres           = 272,
+};
+
+static struct s3c_fb_pd_win mini6410_lcd_type1_fb_win = {
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode mini6410_lcd_type1_timing = {
+        /* 7.0" 800x480 */
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct s3c_fb_platdata mini6410_lcd_pdata[] __initdata = {
         {
-                .win_mode       = {     /* 4.3" 480x272 */
-                        .left_margin    = 3,
-                        .right_margin   = 2,
-                        .upper_margin   = 1,
-                        .lower_margin   = 1,
-                        .hsync_len      = 40,
-                        .vsync_len      = 1,
-                        .xres           = 480,
-                        .yres           = 272,
-                },
-                .max_bpp        = 32,
-                .default_bpp    = 16,
+                .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &mini6410_lcd_type0_timing,
+                .win[0]         = &mini6410_lcd_type0_fb_win,
+                .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+                .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         }, {
-                .win_mode       = {     /* 7.0" 800x480 */
-                        .left_margin    = 8,
-                        .right_margin   = 13,
-                        .upper_margin   = 7,
-                        .lower_margin   = 5,
-                        .hsync_len      = 3,
-                        .vsync_len      = 1,
-                        .xres           = 800,
-                        .yres           = 480,
-                },
-                .max_bpp        = 32,
-                .default_bpp    = 16,
+                .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &mini6410_lcd_type1_timing,
+                .win[0]         = &mini6410_lcd_type1_fb_win,
+                .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+                .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         },
-};
-
-static struct s3c_fb_platdata mini6410_lcd_pdata __initdata = {
-        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
-        .win[0]         = &mini6410_fb_win[0],
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+        { },
 };
 
 static void mini6410_lcd_power_set(struct plat_lcd_data *pd,
@@ -272,7 +290,7 @@ static void mini6410_parse_features(
                                         "screen type already set\n", f);
                         } else {
                                 int li = f - '0';
-                                if (li >= ARRAY_SIZE(mini6410_fb_win))
+                                if (li >= ARRAY_SIZE(mini6410_lcd_pdata))
                                         printk(KERN_INFO "MINI6410: '%c' out "
                                                 "of range LCD mode\n", f);
                                 else {
@@ -296,14 +314,12 @@ static void __init mini6410_machine_init(void)
         /* Parse the feature string */
         mini6410_parse_features(&features, mini6410_features_str);
 
-        mini6410_lcd_pdata.win[0] = &mini6410_fb_win[features.lcd_index];
-
         printk(KERN_INFO "MINI6410: selected LCD display is %dx%d\n",
-                mini6410_lcd_pdata.win[0]->win_mode.xres,
-                mini6410_lcd_pdata.win[0]->win_mode.yres);
+                mini6410_lcd_pdata[features.lcd_index].win[0]->xres,
+                mini6410_lcd_pdata[features.lcd_index].win[0]->yres);
 
         s3c_nand_set_platdata(&mini6410_nand_info);
-        s3c_fb_set_platdata(&mini6410_lcd_pdata);
+        s3c_fb_set_platdata(&mini6410_lcd_pdata[features.lcd_index]);
         s3c24xx_ts_set_platdata(NULL);
 
         /* configure nCS1 width to 16 bits */
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index b92d8e17d502..326b21604bc3 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -106,41 +106,57 @@ static struct platform_device real6410_device_eth = {
         },
 };
 
-static struct s3c_fb_pd_win real6410_fb_win[] = {
+static struct s3c_fb_pd_win real6410_lcd_type0_fb_win = {
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+        .xres           = 480,
+        .yres           = 272,
+};
+
+static struct fb_videomode real6410_lcd_type0_timing = {
+        /* 4.3" 480x272 */
+        .left_margin    = 3,
+        .right_margin   = 2,
+        .upper_margin   = 1,
+        .lower_margin   = 1,
+        .hsync_len      = 40,
+        .vsync_len      = 1,
+};
+
+static struct s3c_fb_pd_win real6410_lcd_type1_fb_win = {
+        .max_bpp        = 32,
+        .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode real6410_lcd_type1_timing = {
+        /* 7.0" 800x480 */
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct s3c_fb_platdata real6410_lcd_pdata[] __initdata = {
         {
-                .win_mode       = {     /* 4.3" 480x272 */
-                        .left_margin    = 3,
-                        .right_margin   = 2,
-                        .upper_margin   = 1,
-                        .lower_margin   = 1,
-                        .hsync_len      = 40,
-                        .vsync_len      = 1,
-                        .xres           = 480,
-                        .yres           = 272,
-                },
-                .max_bpp        = 32,
-                .default_bpp    = 16,
+                .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &real6410_lcd_type0_timing,
+                .win[0]         = &real6410_lcd_type0_fb_win,
+                .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+                .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         }, {
-                .win_mode       = {     /* 7.0" 800x480 */
-                        .left_margin    = 8,
-                        .right_margin   = 13,
-                        .upper_margin   = 7,
-                        .lower_margin   = 5,
-                        .hsync_len      = 3,
-                        .vsync_len      = 1,
-                        .xres           = 800,
-                        .yres           = 480,
-                },
-                .max_bpp        = 32,
-                .default_bpp    = 16,
+                .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+                .vtiming        = &real6410_lcd_type1_timing,
+                .win[0]         = &real6410_lcd_type1_fb_win,
+                .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
+                .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
         },
-};
-
-static struct s3c_fb_platdata real6410_lcd_pdata __initdata = {
-        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
-        .win[0]         = &real6410_fb_win[0],
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
+        { },
 };
 
 static struct mtd_partition real6410_nand_part[] = {
@@ -253,7 +269,7 @@ static void real6410_parse_features(
                                         "screen type already set\n", f);
                         } else {
                                 int li = f - '0';
-                                if (li >= ARRAY_SIZE(real6410_fb_win))
+                                if (li >= ARRAY_SIZE(real6410_lcd_pdata))
                                         printk(KERN_INFO "REAL6410: '%c' out "
                                                 "of range LCD mode\n", f);
                                 else {
@@ -277,13 +293,11 @@ static void __init real6410_machine_init(void)
         /* Parse the feature string */
         real6410_parse_features(&features, real6410_features_str);
 
-        real6410_lcd_pdata.win[0] = &real6410_fb_win[features.lcd_index];
-
         printk(KERN_INFO "REAL6410: selected LCD display is %dx%d\n",
-                real6410_lcd_pdata.win[0]->win_mode.xres,
-                real6410_lcd_pdata.win[0]->win_mode.yres);
+                real6410_lcd_pdata[features.lcd_index].win[0]->xres,
+                real6410_lcd_pdata[features.lcd_index].win[0]->yres);
 
-        s3c_fb_set_platdata(&real6410_lcd_pdata);
+        s3c_fb_set_platdata(&real6410_lcd_pdata[features.lcd_index]);
         s3c_nand_set_platdata(&real6410_nand_info);
         s3c24xx_ts_set_platdata(NULL);
 
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index c5021d0335c6..d6266d8b43c9 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -108,23 +108,27 @@ static struct platform_device smartq5_buttons_device  = {
 };
 
 static struct s3c_fb_pd_win smartq5_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 216,
-                .right_margin   = 40,
-                .upper_margin   = 35,
-                .lower_margin   = 10,
-                .hsync_len      = 1,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-                .refresh        = 80,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smartq5_lcd_timing = {
+        .left_margin    = 216,
+        .right_margin   = 40,
+        .upper_margin   = 35,
+        .lower_margin   = 10,
+        .hsync_len      = 1,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+        .refresh        = 80,
 };
 
 static struct s3c_fb_platdata smartq5_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smartq5_lcd_timing,
         .win[0]         = &smartq5_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index aa9072a4cbef..0957d2a980e1 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -124,23 +124,27 @@ static struct platform_device smartq7_buttons_device  = {
 };
 
 static struct s3c_fb_pd_win smartq7_fb_win0 = {
-        .win_mode       = {
-                .left_margin    = 3,
-                .right_margin   = 5,
-                .upper_margin   = 1,
-                .lower_margin   = 20,
-                .hsync_len      = 10,
-                .vsync_len      = 3,
-                .xres           = 800,
-                .yres           = 480,
-                .refresh        = 80,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
+};
+
+static struct fb_videomode smartq7_lcd_timing = {
+        .left_margin    = 3,
+        .right_margin   = 5,
+        .upper_margin   = 1,
+        .lower_margin   = 20,
+        .hsync_len      = 10,
+        .vsync_len      = 3,
+        .xres           = 800,
+        .yres           = 480,
+        .refresh        = 80,
 };
 
 static struct s3c_fb_platdata smartq7_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smartq7_lcd_timing,
         .win[0]         = &smartq7_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index d44319b09412..df3103d450e2 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -146,26 +146,29 @@ static struct platform_device smdk6410_lcd_powerdev = {
 };
 
 static struct s3c_fb_pd_win smdk6410_fb_win0 = {
-        /* this is to ensure we use win0 */
-        .win_mode       = {
-                .left_margin    = 8,
-                .right_margin   = 13,
-                .upper_margin   = 7,
-                .lower_margin   = 5,
-                .hsync_len      = 3,
-                .vsync_len      = 1,
-                .xres           = 800,
-                .yres           = 480,
-        },
         .max_bpp        = 32,
         .default_bpp    = 16,
+        .xres           = 800,
+        .yres           = 480,
         .virtual_y      = 480 * 2,
         .virtual_x      = 800,
 };
 
+static struct fb_videomode smdk6410_lcd_timing = {
+        .left_margin    = 8,
+        .right_margin   = 13,
+        .upper_margin   = 7,
+        .lower_margin   = 5,
+        .hsync_len      = 3,
+        .vsync_len      = 1,
+        .xres           = 800,
+        .yres           = 480,
+};
+
 /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = {
         .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
+        .vtiming        = &smdk6410_lcd_timing,
         .win[0]         = &smdk6410_fb_win0,
         .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
         .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,