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

Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
 - drivers for Samsung Exynos MIPI DSI and display port
 - i740fb to support those old Intel chips
 - large updates to OMAP, viafb and sh_mobile_lcdcfb
 - some updates to s3c-fb and udlfb, few patches to others

Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.

* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
  Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
  OMAPDSS: register dss drivers in module init
  video: pxafb: add clk_prepare/clk_unprepare calls
  fbdev: bfin_adv7393fb: Drop needless include
  fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
  fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
  Revert "MAINTAINERS: add entry for exynos mipi display drivers"
  fbdev: da8xx: add support for SP10Q010 display
  fbdev: da8xx:: fix reporting of the display timing info
  drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
  OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
  fbdev: sh_mobile_meram: Implement system suspend/resume
  fbdev: sh_mobile_meram: Remove unneeded sanity checks
  fbdev: sh_mobile_meram: Don't perform update in register operation
  arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
  fbdev: sh_mobile_lcdc: Don't store copy of platform data
  fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
  arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
  fbdev: sh_mobile_meram: Allocate ICBs automatically
  fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
  ...

8 files changed, 528 insertions, 78 deletions

diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index c0b018790f07..4ff57e81051d 100644
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -222,41 +222,11 @@ struct omapfb_display_info {
 
 #include <plat/board.h>
 
-#ifdef CONFIG_ARCH_OMAP1
-#define OMAPFB_PLANE_NUM                1
-#else
-#define OMAPFB_PLANE_NUM                3
-#endif
-
-struct omapfb_mem_region {
-        u32             paddr;
-        void __iomem    *vaddr;
-        unsigned long   size;
-        u8              type;           /* OMAPFB_PLANE_MEM_* */
-        enum omapfb_color_format format;/* OMAPFB_COLOR_* */
-        unsigned        format_used:1;  /* Must be set when format is set.
-                                         * Needed b/c of the badly chosen 0
-                                         * base for OMAPFB_COLOR_* values
-                                         */
-        unsigned        alloc:1;        /* allocated by the driver */
-        unsigned        map:1;          /* kernel mapped by the driver */
-};
-
-struct omapfb_mem_desc {
-        int                             region_cnt;
-        struct omapfb_mem_region        region[OMAPFB_PLANE_NUM];
-};
-
 struct omapfb_platform_data {
         struct omap_lcd_config          lcd;
-        struct omapfb_mem_desc          mem_desc;
-        void                            *ctrl_platform_data;
 };
 
-/* in arch/arm/plat-omap/fb.c */
-extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
-extern void omapfb_set_ctrl_platform_data(void *pdata);
-extern void omapfb_reserve_sdram_memblock(void);
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config);
 
 #endif
 
diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
new file mode 100644
index 000000000000..8847a9d6dd42
--- /dev/null
+++ b/include/video/exynos_dp.h
@@ -0,0 +1,131 @@
+/*
+ * Samsung SoC DP device support
+ *
+ * Copyright (C) 2012 Samsung Electronics Co., Ltd.
+ * Author: Jingoo Han <jg1.han@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _EXYNOS_DP_H
+#define _EXYNOS_DP_H
+
+#define DP_TIMEOUT_LOOP_COUNT 100
+#define MAX_CR_LOOP 5
+#define MAX_EQ_LOOP 4
+
+enum link_rate_type {
+        LINK_RATE_1_62GBPS = 0x06,
+        LINK_RATE_2_70GBPS = 0x0a
+};
+
+enum link_lane_count_type {
+        LANE_COUNT1 = 1,
+        LANE_COUNT2 = 2,
+        LANE_COUNT4 = 4
+};
+
+enum link_training_state {
+        START,
+        CLOCK_RECOVERY,
+        EQUALIZER_TRAINING,
+        FINISHED,
+        FAILED
+};
+
+enum voltage_swing_level {
+        VOLTAGE_LEVEL_0,
+        VOLTAGE_LEVEL_1,
+        VOLTAGE_LEVEL_2,
+        VOLTAGE_LEVEL_3,
+};
+
+enum pre_emphasis_level {
+        PRE_EMPHASIS_LEVEL_0,
+        PRE_EMPHASIS_LEVEL_1,
+        PRE_EMPHASIS_LEVEL_2,
+        PRE_EMPHASIS_LEVEL_3,
+};
+
+enum pattern_set {
+        PRBS7,
+        D10_2,
+        TRAINING_PTN1,
+        TRAINING_PTN2,
+        DP_NONE
+};
+
+enum color_space {
+        COLOR_RGB,
+        COLOR_YCBCR422,
+        COLOR_YCBCR444
+};
+
+enum color_depth {
+        COLOR_6,
+        COLOR_8,
+        COLOR_10,
+        COLOR_12
+};
+
+enum color_coefficient {
+        COLOR_YCBCR601,
+        COLOR_YCBCR709
+};
+
+enum dynamic_range {
+        VESA,
+        CEA
+};
+
+enum pll_status {
+        PLL_UNLOCKED,
+        PLL_LOCKED
+};
+
+enum clock_recovery_m_value_type {
+        CALCULATED_M,
+        REGISTER_M
+};
+
+enum video_timing_recognition_type {
+        VIDEO_TIMING_FROM_CAPTURE,
+        VIDEO_TIMING_FROM_REGISTER
+};
+
+enum analog_power_block {
+        AUX_BLOCK,
+        CH0_BLOCK,
+        CH1_BLOCK,
+        CH2_BLOCK,
+        CH3_BLOCK,
+        ANALOG_TOTAL,
+        POWER_ALL
+};
+
+struct video_info {
+        char *name;
+
+        bool h_sync_polarity;
+        bool v_sync_polarity;
+        bool interlaced;
+
+        enum color_space color_space;
+        enum dynamic_range dynamic_range;
+        enum color_coefficient ycbcr_coeff;
+        enum color_depth color_depth;
+
+        enum link_rate_type link_rate;
+        enum link_lane_count_type lane_count;
+};
+
+struct exynos_dp_platdata {
+        struct video_info *video_info;
+
+        void (*phy_init)(void);
+        void (*phy_exit)(void);
+};
+
+#endif /* _EXYNOS_DP_H */
diff --git a/include/video/exynos_mipi_dsim.h b/include/video/exynos_mipi_dsim.h
new file mode 100644
index 000000000000..772c770535f1
--- /dev/null
+++ b/include/video/exynos_mipi_dsim.h
@@ -0,0 +1,359 @@
+/* include/video/exynos_mipi_dsim.h
+ *
+ * Platform data header for Samsung SoC MIPI-DSIM.
+ *
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd
+ *
+ * InKi Dae <inki.dae@samsung.com>
+ * Donghwa Lee <dh09.lee@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef _EXYNOS_MIPI_DSIM_H
+#define _EXYNOS_MIPI_DSIM_H
+
+#include <linux/device.h>
+#include <linux/fb.h>
+
+#define PANEL_NAME_SIZE         (32)
+
+/*
+ * Enumerate display interface type.
+ *
+ * DSIM_COMMAND means cpu interface and rgb interface for DSIM_VIDEO.
+ *
+ * P.S. MIPI DSI Master has two display controller intefaces, RGB Interface
+ *      for main display and CPU Interface(same as I80 Interface) for main
+ *      and sub display.
+ */
+enum mipi_dsim_interface_type {
+        DSIM_COMMAND,
+        DSIM_VIDEO
+};
+
+enum mipi_dsim_virtual_ch_no {
+        DSIM_VIRTUAL_CH_0,
+        DSIM_VIRTUAL_CH_1,
+        DSIM_VIRTUAL_CH_2,
+        DSIM_VIRTUAL_CH_3
+};
+
+enum mipi_dsim_burst_mode_type {
+        DSIM_NON_BURST_SYNC_EVENT,
+        DSIM_BURST_SYNC_EVENT,
+        DSIM_NON_BURST_SYNC_PULSE,
+        DSIM_BURST,
+        DSIM_NON_VIDEO_MODE
+};
+
+enum mipi_dsim_no_of_data_lane {
+        DSIM_DATA_LANE_1,
+        DSIM_DATA_LANE_2,
+        DSIM_DATA_LANE_3,
+        DSIM_DATA_LANE_4
+};
+
+enum mipi_dsim_byte_clk_src {
+        DSIM_PLL_OUT_DIV8,
+        DSIM_EXT_CLK_DIV8,
+        DSIM_EXT_CLK_BYPASS
+};
+
+enum mipi_dsim_pixel_format {
+        DSIM_CMD_3BPP,
+        DSIM_CMD_8BPP,
+        DSIM_CMD_12BPP,
+        DSIM_CMD_16BPP,
+        DSIM_VID_16BPP_565,
+        DSIM_VID_18BPP_666PACKED,
+        DSIM_18BPP_666LOOSELYPACKED,
+        DSIM_24BPP_888
+};
+
+/*
+ * struct mipi_dsim_config - interface for configuring mipi-dsi controller.
+ *
+ * @auto_flush: enable or disable Auto flush of MD FIFO using VSYNC pulse.
+ * @eot_disable: enable or disable EoT packet in HS mode.
+ * @auto_vertical_cnt: specifies auto vertical count mode.
+ *      in Video mode, the vertical line transition uses line counter
+ *      configured by VSA, VBP, and Vertical resolution.
+ *      If this bit is set to '1', the line counter does not use VSA and VBP
+ *      registers.(in command mode, this variable is ignored)
+ * @hse: set horizontal sync event mode.
+ *      In VSYNC pulse and Vporch area, MIPI DSI master transfers only HSYNC
+ *      start packet to MIPI DSI slave at MIPI DSI spec1.1r02.
+ *      this bit transfers HSYNC end packet in VSYNC pulse and Vporch area
+ *      (in mommand mode, this variable is ignored)
+ * @hfp: specifies HFP disable mode.
+ *      if this variable is set, DSI master ignores HFP area in VIDEO mode.
+ *      (in command mode, this variable is ignored)
+ * @hbp: specifies HBP disable mode.
+ *      if this variable is set, DSI master ignores HBP area in VIDEO mode.
+ *      (in command mode, this variable is ignored)
+ * @hsa: specifies HSA disable mode.
+ *      if this variable is set, DSI master ignores HSA area in VIDEO mode.
+ *      (in command mode, this variable is ignored)
+ * @cma_allow: specifies the number of horizontal lines, where command packet
+ *      transmission is allowed after Stable VFP period.
+ * @e_interface: specifies interface to be used.(CPU or RGB interface)
+ * @e_virtual_ch: specifies virtual channel number that main or
+ *      sub diaplsy uses.
+ * @e_pixel_format: specifies pixel stream format for main or sub display.
+ * @e_burst_mode: selects Burst mode in Video mode.
+ *      in Non-burst mode, RGB data area is filled with RGB data and NULL
+ *      packets, according to input bandwidth of RGB interface.
+ *      In Burst mode, RGB data area is filled with RGB data only.
+ * @e_no_data_lane: specifies data lane count to be used by Master.
+ * @e_byte_clk: select byte clock source. (it must be DSIM_PLL_OUT_DIV8)
+ *      DSIM_EXT_CLK_DIV8 and DSIM_EXT_CLK_BYPASSS are not supported.
+ * @pll_stable_time: specifies the PLL Timer for stability of the ganerated
+ *      clock(System clock cycle base)
+ *      if the timer value goes to 0x00000000, the clock stable bit of status
+ *      and interrupt register is set.
+ * @esc_clk: specifies escape clock frequency for getting the escape clock
+ *      prescaler value.
+ * @stop_holding_cnt: specifies the interval value between transmitting
+ *      read packet(or write "set_tear_on" command) and BTA request.
+ *      after transmitting read packet or write "set_tear_on" command,
+ *      BTA requests to D-PHY automatically. this counter value specifies
+ *      the interval between them.
+ * @bta_timeout: specifies the timer for BTA.
+ *      this register specifies time out from BTA request to change
+ *      the direction with respect to Tx escape clock.
+ * @rx_timeout: specifies the timer for LP Rx mode timeout.
+ *      this register specifies time out on how long RxValid deasserts,
+ *      after RxLpdt asserts with respect to Tx escape clock.
+ *      - RxValid specifies Rx data valid indicator.
+ *      - RxLpdt specifies an indicator that D-PHY is under RxLpdt mode.
+ *      - RxValid and RxLpdt specifies signal from D-PHY.
+ */
+struct mipi_dsim_config {
+        unsigned char                   auto_flush;
+        unsigned char                   eot_disable;
+
+        unsigned char                   auto_vertical_cnt;
+        unsigned char                   hse;
+        unsigned char                   hfp;
+        unsigned char                   hbp;
+        unsigned char                   hsa;
+        unsigned char                   cmd_allow;
+
+        enum mipi_dsim_interface_type   e_interface;
+        enum mipi_dsim_virtual_ch_no    e_virtual_ch;
+        enum mipi_dsim_pixel_format     e_pixel_format;
+        enum mipi_dsim_burst_mode_type  e_burst_mode;
+        enum mipi_dsim_no_of_data_lane  e_no_data_lane;
+        enum mipi_dsim_byte_clk_src     e_byte_clk;
+
+        /*
+         * ===========================================
+         * |    P    |    M    |    S    |    MHz    |
+         * -------------------------------------------
+         * |    3    |   100   |    3    |    100    |
+         * |    3    |   100   |    2    |    200    |
+         * |    3    |    63   |    1    |    252    |
+         * |    4    |   100   |    1    |    300    |
+         * |    4    |   110   |    1    |    330    |
+         * |   12    |   350   |    1    |    350    |
+         * |    3    |   100   |    1    |    400    |
+         * |    4    |   150   |    1    |    450    |
+         * |    6    |   118   |    1    |    472    |
+         * |    3    |   120   |    1    |    480    |
+         * |   12    |   250   |    0    |    500    |
+         * |    4    |   100   |    0    |    600    |
+         * |    3    |    81   |    0    |    648    |
+         * |    3    |    88   |    0    |    704    |
+         * |    3    |    90   |    0    |    720    |
+         * |    3    |   100   |    0    |    800    |
+         * |   12    |   425   |    0    |    850    |
+         * |    4    |   150   |    0    |    900    |
+         * |   12    |   475   |    0    |    950    |
+         * |    6    |   250   |    0    |   1000    |
+         * -------------------------------------------
+         */
+
+        /*
+         * pms could be calculated as the following.
+         * M * 24 / P * 2 ^ S = MHz
+         */
+        unsigned char                   p;
+        unsigned short                  m;
+        unsigned char                   s;
+
+        unsigned int                    pll_stable_time;
+        unsigned long                   esc_clk;
+
+        unsigned short                  stop_holding_cnt;
+        unsigned char                   bta_timeout;
+        unsigned short                  rx_timeout;
+};
+
+/*
+ * struct mipi_dsim_device - global interface for mipi-dsi driver.
+ *
+ * @dev: driver model representation of the device.
+ * @id: unique device id.
+ * @clock: pointer to MIPI-DSI clock of clock framework.
+ * @irq: interrupt number to MIPI-DSI controller.
+ * @reg_base: base address to memory mapped SRF of MIPI-DSI controller.
+ *      (virtual address)
+ * @lock: the mutex protecting this data structure.
+ * @dsim_info: infomation for configuring mipi-dsi controller.
+ * @master_ops: callbacks to mipi-dsi operations.
+ * @dsim_lcd_dev: pointer to activated ddi device.
+ *      (it would be registered by mipi-dsi driver.)
+ * @dsim_lcd_drv: pointer to activated_ddi driver.
+ *      (it would be registered by mipi-dsi driver.)
+ * @lcd_info: pointer to mipi_lcd_info structure.
+ * @state: specifies status of MIPI-DSI controller.
+ *      the status could be RESET, INIT, STOP, HSCLKEN and ULPS.
+ * @data_lane: specifiec enabled data lane number.
+ *      this variable would be set by driver according to e_no_data_lane
+ *      automatically.
+ * @e_clk_src: select byte clock source.
+ * @pd: pointer to MIPI-DSI driver platform data.
+ */
+struct mipi_dsim_device {
+        struct device                   *dev;
+        int                             id;
+        struct resource                 *res;
+        struct clk                      *clock;
+        unsigned int                    irq;
+        void __iomem                    *reg_base;
+        struct mutex                    lock;
+
+        struct mipi_dsim_config         *dsim_config;
+        struct mipi_dsim_master_ops     *master_ops;
+        struct mipi_dsim_lcd_device     *dsim_lcd_dev;
+        struct mipi_dsim_lcd_driver     *dsim_lcd_drv;
+
+        unsigned int                    state;
+        unsigned int                    data_lane;
+        unsigned int                    e_clk_src;
+        bool                            suspended;
+
+        struct mipi_dsim_platform_data  *pd;
+};
+
+/*
+ * struct mipi_dsim_platform_data - interface to platform data
+ *      for mipi-dsi driver.
+ *
+ * @lcd_panel_name: specifies lcd panel name registered to mipi-dsi driver.
+ *      lcd panel driver searched would be actived.
+ * @dsim_config: pointer of structure for configuring mipi-dsi controller.
+ * @enabled: indicate whether mipi controller got enabled or not.
+ * @lcd_panel_info: pointer for lcd panel specific structure.
+ *      this structure specifies width, height, timing and polarity and so on.
+ * @phy_enable: pointer to a callback controlling D-PHY enable/reset
+ */
+struct mipi_dsim_platform_data {
+        char                            lcd_panel_name[PANEL_NAME_SIZE];
+
+        struct mipi_dsim_config         *dsim_config;
+        unsigned int                    enabled;
+        void                            *lcd_panel_info;
+
+        int (*phy_enable)(struct platform_device *pdev, bool on);
+};
+
+/*
+ * struct mipi_dsim_master_ops - callbacks to mipi-dsi operations.
+ *
+ * @cmd_write: transfer command to lcd panel at LP mode.
+ * @cmd_read: read command from rx register.
+ * @get_dsim_frame_done: get the status that all screen data have been
+ *      transferred to mipi-dsi.
+ * @clear_dsim_frame_done: clear frame done status.
+ * @get_fb_frame_done: get frame done status of display controller.
+ * @trigger: trigger display controller.
+ *      - this one would be used only in case of CPU mode.
+ *  @set_early_blank_mode: set framebuffer blank mode.
+ *      - this callback should be called prior to fb_blank() by a client driver
+ *      only if needing.
+ *  @set_blank_mode: set framebuffer blank mode.
+ *      - this callback should be called after fb_blank() by a client driver
+ *      only if needing.
+ */
+
+struct mipi_dsim_master_ops {
+        int (*cmd_write)(struct mipi_dsim_device *dsim, unsigned int data_id,
+                const unsigned char *data0, unsigned int data1);
+        int (*cmd_read)(struct mipi_dsim_device *dsim, unsigned int data_id,
+                unsigned int data0, unsigned int req_size, u8 *rx_buf);
+        int (*get_dsim_frame_done)(struct mipi_dsim_device *dsim);
+        int (*clear_dsim_frame_done)(struct mipi_dsim_device *dsim);
+
+        int (*get_fb_frame_done)(struct fb_info *info);
+        void (*trigger)(struct fb_info *info);
+        int (*set_early_blank_mode)(struct mipi_dsim_device *dsim, int power);
+        int (*set_blank_mode)(struct mipi_dsim_device *dsim, int power);
+};
+
+/*
+ * device structure for mipi-dsi based lcd panel.
+ *
+ * @name: name of the device to use with this device, or an
+ *      alias for that name.
+ * @dev: driver model representation of the device.
+ * @id: id of device to be registered.
+ * @bus_id: bus id for identifing connected bus
+ *      and this bus id should be same as id of mipi_dsim_device.
+ * @irq: irq number for signaling when framebuffer transfer of
+ *      lcd panel module is completed.
+ *      this irq would be used only for MIPI-DSI based CPU mode lcd panel.
+ * @master: pointer to mipi-dsi master device object.
+ * @platform_data: lcd panel specific platform data.
+ */
+struct mipi_dsim_lcd_device {
+        char                    *name;
+        struct device           dev;
+        int                     id;
+        int                     bus_id;
+        int                     irq;
+
+        struct mipi_dsim_device *master;
+        void                    *platform_data;
+};
+
+/*
+ * driver structure for mipi-dsi based lcd panel.
+ *
+ * this structure should be registered by lcd panel driver.
+ * mipi-dsi driver seeks lcd panel registered through name field
+ * and calls these callback functions in appropriate time.
+ *
+ * @name: name of the driver to use with this device, or an
+ *      alias for that name.
+ * @id: id of driver to be registered.
+ *      this id would be used for finding device object registered.
+ */
+struct mipi_dsim_lcd_driver {
+        char                    *name;
+        int                     id;
+
+        void    (*power_on)(struct mipi_dsim_lcd_device *dsim_dev, int enable);
+        void    (*set_sequence)(struct mipi_dsim_lcd_device *dsim_dev);
+        int     (*probe)(struct mipi_dsim_lcd_device *dsim_dev);
+        int     (*remove)(struct mipi_dsim_lcd_device *dsim_dev);
+        void    (*shutdown)(struct mipi_dsim_lcd_device *dsim_dev);
+        int     (*suspend)(struct mipi_dsim_lcd_device *dsim_dev);
+        int     (*resume)(struct mipi_dsim_lcd_device *dsim_dev);
+};
+
+/*
+ * register mipi_dsim_lcd_device to mipi-dsi master.
+ */
+int exynos_mipi_dsi_register_lcd_device(struct mipi_dsim_lcd_device
+                                                *lcd_dev);
+/**
+ * register mipi_dsim_lcd_driver object defined by lcd panel driver
+ * to mipi-dsi driver.
+ */
+int exynos_mipi_dsi_register_lcd_driver(struct mipi_dsim_lcd_driver
+                                                *lcd_drv);
+#endif /* _EXYNOS_MIPI_DSIM_H */
diff --git a/include/video/sh_mipi_dsi.h b/include/video/sh_mipi_dsi.h
index 434d56b4a1a5..06c67fbc4eee 100644
--- a/include/video/sh_mipi_dsi.h
+++ b/include/video/sh_mipi_dsi.h
@@ -51,6 +51,7 @@ struct sh_mipi_dsi_info {
         int                             lane;
         unsigned long                   flags;
         u32                             clksrc;
+        u32                             phyctrl; /* for extra setting */
         unsigned int                    vsynw_offset;
         int     (*set_dot_clock)(struct platform_device *pdev,
                                  void __iomem *base,
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index b56932927d0a..728f9de9c258 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -31,8 +31,6 @@ struct clk;
 #define HDMI_SND_SRC_HBR        (3 << 0)
 
 struct sh_mobile_hdmi_info {
-        struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
-        struct device                   *lcd_dev;
         unsigned int                     flags;
         long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
                                     unsigned long *parent_freq);
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index fe30b759c51e..7571b27a0ba1 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -147,29 +147,23 @@ struct sh_mobile_lcdc_sys_bus_ops {
         unsigned long (*read_data)(void *handle);
 };
 
-struct module;
-struct sh_mobile_lcdc_board_cfg {
-        struct module *owner;
-        void *board_data;
-        int (*setup_sys)(void *board_data, void *sys_ops_handle,
+struct sh_mobile_lcdc_panel_cfg {
+        unsigned long width;            /* Panel width in mm */
+        unsigned long height;           /* Panel height in mm */
+        int (*setup_sys)(void *sys_ops_handle,
                          struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
-        void (*start_transfer)(void *board_data, void *sys_ops_handle,
+        void (*start_transfer)(void *sys_ops_handle,
                                struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
-        void (*display_on)(void *board_data, struct fb_info *info);
-        void (*display_off)(void *board_data);
-        int (*set_brightness)(void *board_data, int brightness);
-        int (*get_brightness)(void *board_data);
-};
-
-struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */
-        unsigned long width;
-        unsigned long height;
+        void (*display_on)(void);
+        void (*display_off)(void);
 };
 
 /* backlight info */
 struct sh_mobile_lcdc_bl_info {
         const char *name;
         int max_brightness;
+        int (*set_brightness)(int brightness);
+        int (*get_brightness)(void);
 };
 
 struct sh_mobile_lcdc_chan_cfg {
@@ -179,13 +173,14 @@ struct sh_mobile_lcdc_chan_cfg {
         int interface_type; /* selects RGBn or SYSn I/F, see above */
         int clock_divider;
         unsigned long flags; /* LCDC_FLAGS_... */
-        const struct fb_videomode *lcd_cfg;
-        int num_cfg;
-        struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg;
-        struct sh_mobile_lcdc_board_cfg board_cfg;
+        const struct fb_videomode *lcd_modes;
+        int num_modes;
+        struct sh_mobile_lcdc_panel_cfg panel_cfg;
         struct sh_mobile_lcdc_bl_info bl_info;
         struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */
-        struct sh_mobile_meram_cfg *meram_cfg;
+        const struct sh_mobile_meram_cfg *meram_cfg;
+
+        struct platform_device *tx_dev; /* HDMI/DSI transmitter device */
 };
 
 struct sh_mobile_lcdc_info {
diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index af602d602b28..29b2fd3b147e 100644
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -17,52 +17,47 @@ enum {
 struct sh_mobile_meram_priv;
 struct sh_mobile_meram_ops;
 
+/*
+ * struct sh_mobile_meram_info - MERAM platform data
+ * @reserved_icbs: Bitmask of reserved ICBs (for instance used through UIO)
+ */
 struct sh_mobile_meram_info {
         int                             addr_mode;
+        u32                             reserved_icbs;
         struct sh_mobile_meram_ops      *ops;
         struct sh_mobile_meram_priv     *priv;
         struct platform_device          *pdev;
 };
 
 /* icb config */
-struct sh_mobile_meram_icb {
-        int marker_icb;         /* ICB # for Marker ICB */
-        int cache_icb;          /* ICB # for Cache ICB */
-        int meram_offset;       /* MERAM Buffer Offset to use */
-        int meram_size;         /* MERAM Buffer Size to use */
-
-        int cache_unit;         /* bytes to cache per ICB */
+struct sh_mobile_meram_icb_cfg {
+        unsigned int meram_size;        /* MERAM Buffer Size to use */
 };
 
 struct sh_mobile_meram_cfg {
-        struct sh_mobile_meram_icb      icb[2];
-        int                             pixelformat;
-        int                             current_reg;
+        struct sh_mobile_meram_icb_cfg icb[2];
 };
 
 struct module;
 struct sh_mobile_meram_ops {
         struct module   *module;
         /* register usage of meram */
-        int (*meram_register)(struct sh_mobile_meram_info *meram_dev,
-                              struct sh_mobile_meram_cfg *cfg,
-                              int xres, int yres, int pixelformat,
-                              unsigned long base_addr_y,
-                              unsigned long base_addr_c,
-                              unsigned long *icb_addr_y,
-                              unsigned long *icb_addr_c, int *pitch);
+        void *(*meram_register)(struct sh_mobile_meram_info *meram_dev,
+                                const struct sh_mobile_meram_cfg *cfg,
+                                unsigned int xres, unsigned int yres,
+                                unsigned int pixelformat,
+                                unsigned int *pitch);
 
         /* unregister usage of meram */
-        int (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
-                                struct sh_mobile_meram_cfg *cfg);
+        void (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
+                                 void *data);
 
         /* update meram settings */
-        int (*meram_update)(struct sh_mobile_meram_info *meram_dev,
-                            struct sh_mobile_meram_cfg *cfg,
-                            unsigned long base_addr_y,
-                            unsigned long base_addr_c,
-                            unsigned long *icb_addr_y,
-                            unsigned long *icb_addr_c);
+        void (*meram_update)(struct sh_mobile_meram_info *meram_dev, void *data,
+                             unsigned long base_addr_y,
+                             unsigned long base_addr_c,
+                             unsigned long *icb_addr_y,
+                             unsigned long *icb_addr_c);
 };
 
 #endif /* __VIDEO_SH_MOBILE_MERAM_H__  */
diff --git a/include/video/udlfb.h b/include/video/udlfb.h
index c41f308c9636..f9466fa54ba4 100644
--- a/include/video/udlfb.h
+++ b/include/video/udlfb.h
@@ -41,6 +41,7 @@ struct dlfb_data {
         char *backing_buffer;
         int fb_count;
         bool virtualized; /* true when physical usb device not present */
+        struct delayed_work init_framebuffer_work;
         struct delayed_work free_framebuffer_work;
         atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */
         atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */