Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux

Pull fbdev changes from Tomi Valkeinen:
 "OMAPDSS changes, including:
   - use dynanic debug prints
   - OMAP platform dependency removals
   - Creation of compat-layer, helping us to improve omapdrm
   - Misc cleanups, aiming to make omadss more in line with the upcoming
     common display framework

  Exynos DP changes for the 3.8 merge window:
   - Device Tree support for Samsung Exynos DP
   - SW Link training is cleaned up.
   - HPD interrupt is supported.

  Samsung Framebuffer changes for the 3.8 merge window:
   - The bit definitions of header file are updated.
   - Some minor typos are fixed.
   - Some minor bugs of s3c_fb_check_var() are fixed.

  FB related changes for SH Mobile, Freescale DIU

  Add support for the Solomon SSD1307 OLED Controller"

* tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
  OMAPDSS: fix TV-out issue with DSI PLL
  Revert "OMAPFB: simplify locking"
  OMAPFB: remove silly loop in fb2display()
  OMAPFB: fix error handling in omapfb_find_best_mode()
  OMAPFB: use devm_kzalloc to allocate omapfb2_device
  OMAPDSS: DISPC: remove dispc fck uses
  OMAPDSS: DISPC: get dss clock rate from dss driver
  drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
  drivers/video: add support for the Solomon SSD1307 OLED Controller
  OMAPDSS: use omapdss_compat_init() in other drivers
  OMAPDSS: export dispc functions
  OMAPDSS: export dss_feat functions
  OMAPDSS: export dss_mgr_ops functions
  OMAPDSS: separate compat files in the Makefile
  OMAPDSS: move display sysfs init to compat layer
  OMAPDSS: DPI: use dispc's check_timings
  OMAPDSS: DISPC: add dispc_ovl_check()
  OMAPDSS: move irq handling to dispc-compat
  OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
  OMAPDSS: move blocking mgr enable/disable to compat layer
  ...

Conflicts:
	arch/arm/mach-davinci/devices-da8xx.c
	arch/arm/plat-omap/common.c
	drivers/media/platform/omap/omap_vout.c

3 files changed, 107 insertions, 101 deletions

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 25eb88a923e6..032d10817e79 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -213,95 +213,6 @@ static struct platform_device irda_device = {
         .num_resources  = ARRAY_SIZE(irda_resources),
 };
 
-static unsigned char lcd_backlight_seq[3][2] = {
-        { 0x04, 0x07 },
-        { 0x23, 0x80 },
-        { 0x03, 0x01 },
-};
-
-static void lcd_backlight_on(void)
-{
-        struct i2c_adapter *a;
-        struct i2c_msg msg;
-        int k;
-
-        a = i2c_get_adapter(1);
-        for (k = 0; a && k < 3; k++) {
-                msg.addr = 0x6d;
-                msg.buf = &lcd_backlight_seq[k][0];
-                msg.len = 2;
-                msg.flags = 0;
-                if (i2c_transfer(a, &msg, 1) != 1)
-                        break;
-        }
-}
-
-static void lcd_backlight_reset(void)
-{
-        gpio_set_value(GPIO_PORT235, 0);
-        mdelay(24);
-        gpio_set_value(GPIO_PORT235, 1);
-}
-
-/* LCDC0 */
-static const struct fb_videomode lcdc0_modes[] = {
-        {
-                .name           = "R63302(QHD)",
-                .xres           = 544,
-                .yres           = 961,
-                .left_margin    = 72,
-                .right_margin   = 600,
-                .hsync_len      = 16,
-                .upper_margin   = 8,
-                .lower_margin   = 8,
-                .vsync_len      = 2,
-                .sync           = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
-        },
-};
-
-static struct sh_mobile_lcdc_info lcdc0_info = {
-        .clock_source = LCDC_CLK_PERIPHERAL,
-        .ch[0] = {
-                .chan = LCDC_CHAN_MAINLCD,
-                .interface_type = RGB24,
-                .clock_divider = 1,
-                .flags = LCDC_FLAGS_DWPOL,
-                .fourcc = V4L2_PIX_FMT_RGB565,
-                .lcd_modes = lcdc0_modes,
-                .num_modes = ARRAY_SIZE(lcdc0_modes),
-                .panel_cfg = {
-                        .width = 44,
-                        .height = 79,
-                        .display_on = lcd_backlight_on,
-                        .display_off = lcd_backlight_reset,
-                },
-        }
-};
-
-static struct resource lcdc0_resources[] = {
-        [0] = {
-                .name   = "LCDC0",
-                .start  = 0xfe940000, /* P4-only space */
-                .end    = 0xfe943fff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = intcs_evt2irq(0x580),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device lcdc0_device = {
-        .name           = "sh_mobile_lcdc_fb",
-        .num_resources  = ARRAY_SIZE(lcdc0_resources),
-        .resource       = lcdc0_resources,
-        .id             = 0,
-        .dev    = {
-                .platform_data  = &lcdc0_info,
-                .coherent_dma_mask = ~0,
-        },
-};
-
 /* MIPI-DSI */
 static struct resource mipidsi0_resources[] = {
         [0] = {
@@ -358,7 +269,7 @@ sh_mipi_set_dot_clock_pck_err:
 
 static struct sh_mipi_dsi_info mipidsi0_info = {
         .data_format    = MIPI_RGB888,
-        .lcd_chan       = &lcdc0_info.ch[0],
+        .channel        = LCDC_CHAN_MAINLCD,
         .lane           = 2,
         .vsynw_offset   = 20,
         .clksrc         = 1,
@@ -378,6 +289,109 @@ static struct platform_device mipidsi0_device = {
         },
 };
 
+static unsigned char lcd_backlight_seq[3][2] = {
+        { 0x04, 0x07 },
+        { 0x23, 0x80 },
+        { 0x03, 0x01 },
+};
+
+static int lcd_backlight_set_brightness(int brightness)
+{
+        struct i2c_adapter *adap;
+        struct i2c_msg msg;
+        unsigned int i;
+        int ret;
+
+        if (brightness == 0) {
+                /* Reset the chip */
+                gpio_set_value(GPIO_PORT235, 0);
+                mdelay(24);
+                gpio_set_value(GPIO_PORT235, 1);
+                return 0;
+        }
+
+        adap = i2c_get_adapter(1);
+        if (adap == NULL)
+                return -ENODEV;
+
+        for (i = 0; i < ARRAY_SIZE(lcd_backlight_seq); i++) {
+                msg.addr = 0x6d;
+                msg.buf = &lcd_backlight_seq[i][0];
+                msg.len = 2;
+                msg.flags = 0;
+
+                ret = i2c_transfer(adap, &msg, 1);
+                if (ret < 0)
+                        break;
+        }
+
+        i2c_put_adapter(adap);
+        return ret < 0 ? ret : 0;
+}
+
+/* LCDC0 */
+static const struct fb_videomode lcdc0_modes[] = {
+        {
+                .name           = "R63302(QHD)",
+                .xres           = 544,
+                .yres           = 961,
+                .left_margin    = 72,
+                .right_margin   = 600,
+                .hsync_len      = 16,
+                .upper_margin   = 8,
+                .lower_margin   = 8,
+                .vsync_len      = 2,
+                .sync           = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
+        },
+};
+
+static struct sh_mobile_lcdc_info lcdc0_info = {
+        .clock_source = LCDC_CLK_PERIPHERAL,
+        .ch[0] = {
+                .chan = LCDC_CHAN_MAINLCD,
+                .interface_type = RGB24,
+                .clock_divider = 1,
+                .flags = LCDC_FLAGS_DWPOL,
+                .fourcc = V4L2_PIX_FMT_RGB565,
+                .lcd_modes = lcdc0_modes,
+                .num_modes = ARRAY_SIZE(lcdc0_modes),
+                .panel_cfg = {
+                        .width = 44,
+                        .height = 79,
+                },
+                .bl_info = {
+                        .name = "sh_mobile_lcdc_bl",
+                        .max_brightness = 1,
+                        .set_brightness = lcd_backlight_set_brightness,
+                },
+                .tx_dev = &mipidsi0_device,
+        }
+};
+
+static struct resource lcdc0_resources[] = {
+        [0] = {
+                .name   = "LCDC0",
+                .start  = 0xfe940000, /* P4-only space */
+                .end    = 0xfe943fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = intcs_evt2irq(0x580),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device lcdc0_device = {
+        .name           = "sh_mobile_lcdc_fb",
+        .num_resources  = ARRAY_SIZE(lcdc0_resources),
+        .resource       = lcdc0_resources,
+        .id             = 0,
+        .dev    = {
+                .platform_data  = &lcdc0_info,
+                .coherent_dma_mask = ~0,
+        },
+};
+
 /* Fixed 2.8V regulators to be used by SDHI0 */
 static struct regulator_consumer_supply fixed2v8_power_consumers[] =
 {
@@ -531,8 +545,8 @@ static struct platform_device *ag5evm_devices[] __initdata = {
         &fsi_device,
         &mmc_device,
         &irda_device,
-        &lcdc0_device,
         &mipidsi0_device,
+        &lcdc0_device,
         &sdhi0_device,
         &sdhi1_device,
 };
@@ -621,7 +635,7 @@ static void __init ag5evm_init(void)
         /* LCD backlight controller */
         gpio_request(GPIO_PORT235, NULL); /* RESET */
         gpio_direction_output(GPIO_PORT235, 0);
-        lcd_backlight_reset();
+        lcd_backlight_set_brightness(0);
 
         /* enable SDHI0 on CN15 [SD I/F] */
         gpio_request(GPIO_FN_SDHIWP0, NULL);
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 40657854e3ad..99ef190d0909 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -552,11 +552,9 @@ static struct resource mipidsi0_resources[] = {
         },
 };
 
-static struct sh_mobile_lcdc_info lcdc_info;
-
 static struct sh_mipi_dsi_info mipidsi0_info = {
         .data_format    = MIPI_RGB888,
-        .lcd_chan       = &lcdc_info.ch[0],
+        .channel        = LCDC_CHAN_MAINLCD,
         .lane           = 2,
         .vsynw_offset   = 17,
         .phyctrl        = 0x6 << 8,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 3f56e70795b7..2fed62f66045 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -370,11 +370,6 @@ static int mackerel_set_brightness(int brightness)
         return 0;
 }
 
-static int mackerel_get_brightness(void)
-{
-        return gpio_get_value(GPIO_PORT31);
-}
-
 static const struct sh_mobile_meram_cfg lcd_meram_cfg = {
         .icb[0] = {
                 .meram_size     = 0x40,
@@ -403,7 +398,6 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                         .name = "sh_mobile_lcdc_bl",
                         .max_brightness = 1,
                         .set_brightness = mackerel_set_brightness,
-                        .get_brightness = mackerel_get_brightness,
                 },
                 .meram_cfg = &lcd_meram_cfg,
         }