Merge tag 'v3.5-rc2'

Merge v3.5-rc2 to get latest device tree and dynamic debug changes.

75 files changed, 2967 insertions, 561 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a290be51a1f4..0217f7415ef5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2210,7 +2210,7 @@ config FB_XILINX
 
 config FB_COBALT
         tristate "Cobalt server LCD frame buffer support"
-        depends on FB && MIPS_COBALT
+        depends on FB && (MIPS_COBALT || MIPS_SEAD3)
 
 config FB_SH7760
         bool "SH7760/SH7763/SH7720/SH7721 LCDC support"
@@ -2382,6 +2382,39 @@ config FB_BROADSHEET
           and could also have been called by other names when coupled with
           a bridge adapter.
 
+config FB_AUO_K190X
+        tristate "AUO-K190X EPD controller support"
+        depends on FB
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        select FB_DEFERRED_IO
+        help
+          Provides support for epaper controllers from the K190X series
+          of AUO. These controllers can be used to drive epaper displays
+          from Sipix.
+
+          This option enables the common support, shared by the individual
+          controller drivers. You will also have to enable the driver
+          for the controller type used in your device.
+
+config FB_AUO_K1900
+        tristate "AUO-K1900 EPD controller support"
+        depends on FB && FB_AUO_K190X
+        help
+          This driver implements support for the AUO K1900 epd-controller.
+          This controller can drive Sipix epaper displays but can only do
+          serial updates, reducing the number of possible frames per second.
+
+config FB_AUO_K1901
+        tristate "AUO-K1901 EPD controller support"
+        depends on FB && FB_AUO_K190X
+        help
+          This driver implements support for the AUO K1901 epd-controller.
+          This controller can drive Sipix epaper displays and supports
+          concurrent updates, making higher frames per second possible.
+
 config FB_JZ4740
         tristate "JZ4740 LCD framebuffer support"
         depends on FB && MACH_JZ4740
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9356add945b3..ee8dafb69e36 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -118,6 +118,9 @@ obj-$(CONFIG_FB_PMAGB_B)	  += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
 obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_BROADSHEET)       += broadsheetfb.o
+obj-$(CONFIG_FB_AUO_K190X)        += auo_k190x.o
+obj-$(CONFIG_FB_AUO_K1900)        += auo_k1900fb.o
+obj-$(CONFIG_FB_AUO_K1901)        += auo_k1901fb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_SH7760)           += sh7760fb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index ffbce4525468..fe3b6ec87122 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -536,7 +536,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
         for (page = (unsigned long)fbdev->fb_mem;
              page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len);
              page += PAGE_SIZE) {
-#if CONFIG_DMA_NONCOHERENT
+#ifdef CONFIG_DMA_NONCOHERENT
                 SetPageReserved(virt_to_page(CAC_ADDR((void *)page)));
 #else
                 SetPageReserved(virt_to_page(page));
diff --git a/drivers/video/auo_k1900fb.c b/drivers/video/auo_k1900fb.c
new file mode 100644
index 000000000000..c36cf961dcb2
--- /dev/null
+++ b/drivers/video/auo_k1900fb.c
@@ -0,0 +1,198 @@
+/*
+ * auok190xfb.c -- FB driver for AUO-K1900 controllers
+ *
+ * Copyright (C) 2011, 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on broadsheetfb.c
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver is written to be used with the AUO-K1900 display controller.
+ *
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions.
+ *
+ * The controller supports different update modes:
+ * mode0+1 16 step gray (4bit)
+ * mode2 4 step gray (2bit) - FIXME: add strange refresh
+ * mode3 2 step gray (1bit) - FIXME: add strange refresh
+ * mode4 handwriting mode (strange behaviour)
+ * mode5 automatic selection of update mode
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+/*
+ * AUO-K1900 specific commands
+ */
+
+#define AUOK1900_CMD_PARTIALDISP        0x1001
+#define AUOK1900_CMD_ROTATION           0x1006
+#define AUOK1900_CMD_LUT_STOP           0x1009
+
+#define AUOK1900_INIT_TEMP_AVERAGE      (1 << 13)
+#define AUOK1900_INIT_ROTATE(_x)        ((_x & 0x3) << 10)
+#define AUOK1900_INIT_RESOLUTION(_res)  ((_res & 0x7) << 2)
+
+static void auok1900_init(struct auok190xfb_par *par)
+{
+        struct auok190x_board *board = par->board;
+        u16 init_param = 0;
+
+        init_param |= AUOK1900_INIT_TEMP_AVERAGE;
+        init_param |= AUOK1900_INIT_ROTATE(par->rotation);
+        init_param |= AUOK190X_INIT_INVERSE_WHITE;
+        init_param |= AUOK190X_INIT_FORMAT0;
+        init_param |= AUOK1900_INIT_RESOLUTION(par->resolution);
+        init_param |= AUOK190X_INIT_SHIFT_RIGHT;
+
+        auok190x_send_cmdargs(par, AUOK190X_CMD_INIT, 1, &init_param);
+
+        /* let the controller finish */
+        board->wait_for_rdy(par);
+}
+
+static void auok1900_update_region(struct auok190xfb_par *par, int mode,
+                                                u16 y1, u16 y2)
+{
+        struct device *dev = par->info->device;
+        unsigned char *buf = (unsigned char *)par->info->screen_base;
+        int xres = par->info->var.xres;
+        u16 args[4];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        /* y1 and y2 must be a multiple of 2 so drop the lowest bit */
+        y1 &= 0xfffe;
+        y2 &= 0xfffe;
+
+        dev_dbg(dev, "update (x,y,w,h,mode)=(%d,%d,%d,%d,%d)\n",
+                1, y1+1, xres, y2-y1, mode);
+
+        /* to FIX handle different partial update modes */
+        args[0] = mode | 1;
+        args[1] = y1 + 1;
+        args[2] = xres;
+        args[3] = y2 - y1;
+        buf += y1 * xres;
+        auok190x_send_cmdargs_pixels(par, AUOK1900_CMD_PARTIALDISP, 4, args,
+                                     ((y2 - y1) * xres)/2, (u16 *) buf);
+        auok190x_send_command(par, AUOK190X_CMD_DATA_STOP);
+
+        par->update_cnt++;
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+static void auok1900fb_dpy_update_pages(struct auok190xfb_par *par,
+                                                u16 y1, u16 y2)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(1);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1900_update_region(par, mode, y1, y2);
+}
+
+static void auok1900fb_dpy_update(struct auok190xfb_par *par)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(0);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1900_update_region(par, mode, 0, par->info->var.yres);
+        par->update_cnt = 0;
+}
+
+static bool auok1900fb_need_refresh(struct auok190xfb_par *par)
+{
+        return (par->update_cnt > 10);
+}
+
+static int __devinit auok1900fb_probe(struct platform_device *pdev)
+{
+        struct auok190x_init_data init;
+        struct auok190x_board *board;
+
+        /* pick up board specific routines */
+        board = pdev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* fill temporary init struct for common init */
+        init.id = "auo_k1900fb";
+        init.board = board;
+        init.update_partial = auok1900fb_dpy_update_pages;
+        init.update_all = auok1900fb_dpy_update;
+        init.need_refresh = auok1900fb_need_refresh;
+        init.init = auok1900_init;
+
+        return auok190x_common_probe(pdev, &init);
+}
+
+static int __devexit auok1900fb_remove(struct platform_device *pdev)
+{
+        return auok190x_common_remove(pdev);
+}
+
+static struct platform_driver auok1900fb_driver = {
+        .probe  = auok1900fb_probe,
+        .remove = __devexit_p(auok1900fb_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "auo_k1900fb",
+                .pm = &auok190x_pm,
+        },
+};
+module_platform_driver(auok1900fb_driver);
+
+MODULE_DESCRIPTION("framebuffer driver for the AUO-K1900 EPD controller");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k1901fb.c b/drivers/video/auo_k1901fb.c
new file mode 100644
index 000000000000..1c054c18616e
--- /dev/null
+++ b/drivers/video/auo_k1901fb.c
@@ -0,0 +1,251 @@
+/*
+ * auok190xfb.c -- FB driver for AUO-K1901 controllers
+ *
+ * Copyright (C) 2011, 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on broadsheetfb.c
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver is written to be used with the AUO-K1901 display controller.
+ *
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions.
+ *
+ * The controller supports different update modes:
+ * mode0+1 16 step gray (4bit)
+ * mode2+3 4 step gray (2bit)
+ * mode4+5 2 step gray (1bit)
+ * - mode4 is described as "without LUT"
+ * mode7 automatic selection of update mode
+ *
+ * The most interesting difference to the K1900 is the ability to do screen
+ * updates in an asynchronous fashion. Where the K1900 needs to wait for the
+ * current update to complete, the K1901 can process later updates already.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+/*
+ * AUO-K1901 specific commands
+ */
+
+#define AUOK1901_CMD_LUT_INTERFACE      0x0005
+#define AUOK1901_CMD_DMA_START          0x1001
+#define AUOK1901_CMD_CURSOR_START       0x1007
+#define AUOK1901_CMD_CURSOR_STOP        AUOK190X_CMD_DATA_STOP
+#define AUOK1901_CMD_DDMA_START         0x1009
+
+#define AUOK1901_INIT_GATE_PULSE_LOW    (0 << 14)
+#define AUOK1901_INIT_GATE_PULSE_HIGH   (1 << 14)
+#define AUOK1901_INIT_SINGLE_GATE       (0 << 13)
+#define AUOK1901_INIT_DOUBLE_GATE       (1 << 13)
+
+/* Bits to pixels
+ *   Mode       15-12   11-8    7-4     3-0
+ *   format2    2       T       1       T
+ *   format3    1       T       2       T
+ *   format4    T       2       T       1
+ *   format5    T       1       T       2
+ *
+ *   halftone modes:
+ *   format6    2       2       1       1
+ *   format7    1       1       2       2
+ */
+#define AUOK1901_INIT_FORMAT2           (1 << 7)
+#define AUOK1901_INIT_FORMAT3           ((1 << 7) | (1 << 6))
+#define AUOK1901_INIT_FORMAT4           (1 << 8)
+#define AUOK1901_INIT_FORMAT5           ((1 << 8) | (1 << 6))
+#define AUOK1901_INIT_FORMAT6           ((1 << 8) | (1 << 7))
+#define AUOK1901_INIT_FORMAT7           ((1 << 8) | (1 << 7) | (1 << 6))
+
+/* res[4] to bit 10
+ * res[3-0] to bits 5-2
+ */
+#define AUOK1901_INIT_RESOLUTION(_res)  (((_res & (1 << 4)) << 6) \
+                                         | ((_res & 0xf) << 2))
+
+/*
+ * portrait / landscape orientation in AUOK1901_CMD_DMA_START
+ */
+#define AUOK1901_DMA_ROTATE90(_rot)             ((_rot & 1) << 13)
+
+/*
+ * equivalent to 1 << 11, needs the ~ to have same rotation like K1900
+ */
+#define AUOK1901_DDMA_ROTATE180(_rot)           ((~_rot & 2) << 10)
+
+static void auok1901_init(struct auok190xfb_par *par)
+{
+        struct auok190x_board *board = par->board;
+        u16 init_param = 0;
+
+        init_param |= AUOK190X_INIT_INVERSE_WHITE;
+        init_param |= AUOK190X_INIT_FORMAT0;
+        init_param |= AUOK1901_INIT_RESOLUTION(par->resolution);
+        init_param |= AUOK190X_INIT_SHIFT_LEFT;
+
+        auok190x_send_cmdargs(par, AUOK190X_CMD_INIT, 1, &init_param);
+
+        /* let the controller finish */
+        board->wait_for_rdy(par);
+}
+
+static void auok1901_update_region(struct auok190xfb_par *par, int mode,
+                                                u16 y1, u16 y2)
+{
+        struct device *dev = par->info->device;
+        unsigned char *buf = (unsigned char *)par->info->screen_base;
+        int xres = par->info->var.xres;
+        u16 args[5];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        /* y1 and y2 must be a multiple of 2 so drop the lowest bit */
+        y1 &= 0xfffe;
+        y2 &= 0xfffe;
+
+        dev_dbg(dev, "update (x,y,w,h,mode)=(%d,%d,%d,%d,%d)\n",
+                1, y1+1, xres, y2-y1, mode);
+
+        /* K1901: first transfer the region data */
+        args[0] = AUOK1901_DMA_ROTATE90(par->rotation) | 1;
+        args[1] = y1 + 1;
+        args[2] = xres;
+        args[3] = y2 - y1;
+        buf += y1 * xres;
+        auok190x_send_cmdargs_pixels_nowait(par, AUOK1901_CMD_DMA_START, 4,
+                                            args, ((y2 - y1) * xres)/2,
+                                            (u16 *) buf);
+        auok190x_send_command_nowait(par, AUOK190X_CMD_DATA_STOP);
+
+        /* K1901: second tell the controller to update the region with mode */
+        args[0] = mode | AUOK1901_DDMA_ROTATE180(par->rotation);
+        args[1] = 1;
+        args[2] = y1 + 1;
+        args[3] = xres;
+        args[4] = y2 - y1;
+        auok190x_send_cmdargs_nowait(par, AUOK1901_CMD_DDMA_START, 5, args);
+
+        par->update_cnt++;
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+static void auok1901fb_dpy_update_pages(struct auok190xfb_par *par,
+                                                u16 y1, u16 y2)
+{
+        int mode;
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(1);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1901_update_region(par, mode, y1, y2);
+}
+
+static void auok1901fb_dpy_update(struct auok190xfb_par *par)
+{
+        int mode;
+
+        /* When doing full updates, wait for the controller to be ready
+         * This will hopefully catch some hangs of the K1901
+         */
+        par->board->wait_for_rdy(par);
+
+        if (par->update_mode < 0) {
+                mode = AUOK190X_UPDATE_MODE(0);
+                par->last_mode = -1;
+        } else {
+                mode = AUOK190X_UPDATE_MODE(par->update_mode);
+                par->last_mode = par->update_mode;
+        }
+
+        if (par->flash)
+                mode |= AUOK190X_UPDATE_NONFLASH;
+
+        auok1901_update_region(par, mode, 0, par->info->var.yres);
+        par->update_cnt = 0;
+}
+
+static bool auok1901fb_need_refresh(struct auok190xfb_par *par)
+{
+        return (par->update_cnt > 10);
+}
+
+static int __devinit auok1901fb_probe(struct platform_device *pdev)
+{
+        struct auok190x_init_data init;
+        struct auok190x_board *board;
+
+        /* pick up board specific routines */
+        board = pdev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* fill temporary init struct for common init */
+        init.id = "auo_k1901fb";
+        init.board = board;
+        init.update_partial = auok1901fb_dpy_update_pages;
+        init.update_all = auok1901fb_dpy_update;
+        init.need_refresh = auok1901fb_need_refresh;
+        init.init = auok1901_init;
+
+        return auok190x_common_probe(pdev, &init);
+}
+
+static int __devexit auok1901fb_remove(struct platform_device *pdev)
+{
+        return auok190x_common_remove(pdev);
+}
+
+static struct platform_driver auok1901fb_driver = {
+        .probe  = auok1901fb_probe,
+        .remove = __devexit_p(auok1901fb_remove),
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "auo_k1901fb",
+                .pm = &auok190x_pm,
+        },
+};
+module_platform_driver(auok1901fb_driver);
+
+MODULE_DESCRIPTION("framebuffer driver for the AUO-K1901 EPD controller");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c
new file mode 100644
index 000000000000..77da6a2f43dc
--- /dev/null
+++ b/drivers/video/auo_k190x.c
@@ -0,0 +1,1046 @@
+/*
+ * Common code for AUO-K190X framebuffer drivers
+ *
+ * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/gpio.h>
+#include <linux/pm_runtime.h>
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include <linux/regulator/consumer.h>
+
+#include <video/auo_k190xfb.h>
+
+#include "auo_k190x.h"
+
+struct panel_info {
+        int w;
+        int h;
+};
+
+/* table of panel specific parameters to be indexed into by the board drivers */
+static struct panel_info panel_table[] = {
+        /* standard 6" */
+        [AUOK190X_RESOLUTION_800_600] = {
+                .w = 800,
+                .h = 600,
+        },
+        /* standard 9" */
+        [AUOK190X_RESOLUTION_1024_768] = {
+                .w = 1024,
+                .h = 768,
+        },
+};
+
+/*
+ * private I80 interface to the board driver
+ */
+
+static void auok190x_issue_data(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_WR, 0);
+        par->board->set_hdb(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_WR, 1);
+}
+
+static void auok190x_issue_cmd(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_DC, 0);
+        auok190x_issue_data(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_DC, 1);
+}
+
+static int auok190x_issue_pixels(struct auok190xfb_par *par, int size,
+                                 u16 *data)
+{
+        struct device *dev = par->info->device;
+        int i;
+        u16 tmp;
+
+        if (size & 3) {
+                dev_err(dev, "issue_pixels: size %d must be a multiple of 4\n",
+                        size);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < (size >> 1); i++) {
+                par->board->set_ctl(par, AUOK190X_I80_WR, 0);
+
+                /* simple reduction of 8bit staticgray to 4bit gray
+                 * combines 4 * 4bit pixel values into a 16bit value
+                 */
+                tmp  = (data[2*i] & 0xF0) >> 4;
+                tmp |= (data[2*i] & 0xF000) >> 8;
+                tmp |= (data[2*i+1] & 0xF0) << 4;
+                tmp |= (data[2*i+1] & 0xF000);
+
+                par->board->set_hdb(par, tmp);
+                par->board->set_ctl(par, AUOK190X_I80_WR, 1);
+        }
+
+        return 0;
+}
+
+static u16 auok190x_read_data(struct auok190xfb_par *par)
+{
+        u16 data;
+
+        par->board->set_ctl(par, AUOK190X_I80_OE, 0);
+        data = par->board->get_hdb(par);
+        par->board->set_ctl(par, AUOK190X_I80_OE, 1);
+
+        return data;
+}
+
+/*
+ * Command interface for the controller drivers
+ */
+
+void auok190x_send_command_nowait(struct auok190xfb_par *par, u16 data)
+{
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, data);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_command_nowait);
+
+void auok190x_send_cmdargs_nowait(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv)
+{
+        int i;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                auok190x_issue_data(par, argv[i]);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_nowait);
+
+int auok190x_send_command(struct auok190xfb_par *par, u16 data)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_command_nowait(par, data);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_command);
+
+int auok190x_send_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                           int argc, u16 *argv)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_cmdargs_nowait(par, cmd, argc, argv);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs);
+
+int auok190x_read_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                           int argc, u16 *argv)
+{
+        int i, ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                argv[i] = auok190x_read_data(par);
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_read_cmdargs);
+
+void auok190x_send_cmdargs_pixels_nowait(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv, int size, u16 *data)
+{
+        int i;
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 0);
+
+        auok190x_issue_cmd(par, cmd);
+
+        for (i = 0; i < argc; i++)
+                auok190x_issue_data(par, argv[i]);
+
+        auok190x_issue_pixels(par, size, data);
+
+        par->board->set_ctl(par, AUOK190X_I80_CS, 1);
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_pixels_nowait);
+
+int auok190x_send_cmdargs_pixels(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv, int size, u16 *data)
+{
+        int ret;
+
+        ret = par->board->wait_for_rdy(par);
+        if (ret)
+                return ret;
+
+        auok190x_send_cmdargs_pixels_nowait(par, cmd, argc, argv, size, data);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_send_cmdargs_pixels);
+
+/*
+ * fbdefio callbacks - common on both controllers.
+ */
+
+static void auok190xfb_dpy_first_io(struct fb_info *info)
+{
+        /* tell runtime-pm that we wish to use the device in a short time */
+        pm_runtime_get(info->device);
+}
+
+/* this is called back from the deferred io workqueue */
+static void auok190xfb_dpy_deferred_io(struct fb_info *info,
+                                struct list_head *pagelist)
+{
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct auok190xfb_par *par = info->par;
+        u16 yres = info->var.yres;
+        u16 xres = info->var.xres;
+        u16 y1 = 0, h = 0;
+        int prev_index = -1;
+        struct page *cur;
+        int h_inc;
+        int threshold;
+
+        if (!list_empty(pagelist))
+                /* the device resume should've been requested through first_io,
+                 * if the resume did not finish until now, wait for it.
+                 */
+                pm_runtime_barrier(info->device);
+        else
+                /* We reached this via the fsync or some other way.
+                 * In either case the first_io function did not run,
+                 * so we runtime_resume the device here synchronously.
+                 */
+                pm_runtime_get_sync(info->device);
+
+        /* Do a full screen update every n updates to prevent
+         * excessive darkening of the Sipix display.
+         * If we do this, there is no need to walk the pages.
+         */
+        if (par->need_refresh(par)) {
+                par->update_all(par);
+                goto out;
+        }
+
+        /* height increment is fixed per page */
+        h_inc = DIV_ROUND_UP(PAGE_SIZE , xres);
+
+        /* calculate number of pages from pixel height */
+        threshold = par->consecutive_threshold / h_inc;
+        if (threshold < 1)
+                threshold = 1;
+
+        /* walk the written page list and swizzle the data */
+        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+                if (prev_index < 0) {
+                        /* just starting so assign first page */
+                        y1 = (cur->index << PAGE_SHIFT) / xres;
+                        h = h_inc;
+                } else if ((cur->index - prev_index) <= threshold) {
+                        /* page is within our threshold for single updates */
+                        h += h_inc * (cur->index - prev_index);
+                } else {
+                        /* page not consecutive, issue previous update first */
+                        par->update_partial(par, y1, y1 + h);
+
+                        /* start over with our non consecutive page */
+                        y1 = (cur->index << PAGE_SHIFT) / xres;
+                        h = h_inc;
+                }
+                prev_index = cur->index;
+        }
+
+        /* if we still have any pages to update we do so now */
+        if (h >= yres)
+                /* its a full screen update, just do it */
+                par->update_all(par);
+        else
+                par->update_partial(par, y1, min((u16) (y1 + h), yres));
+
+out:
+        pm_runtime_mark_last_busy(info->device);
+        pm_runtime_put_autosuspend(info->device);
+}
+
+/*
+ * framebuffer operations
+ */
+
+/*
+ * this is the slow path from userspace. they can seek and write to
+ * the fb. it's inefficient to do anything less than a full screen draw
+ */
+static ssize_t auok190xfb_write(struct fb_info *info, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        struct auok190xfb_par *par = info->par;
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->fix.smem_len;
+
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
+        }
+
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
+
+                count = total_size - p;
+        }
+
+        dst = (void *)(info->screen_base + p);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        par->update_all(par);
+
+        return (err) ? err : count;
+}
+
+static void auok190xfb_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_fillrect(info, rect);
+
+        par->update_all(par);
+}
+
+static void auok190xfb_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_copyarea(info, area);
+
+        par->update_all(par);
+}
+
+static void auok190xfb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        struct auok190xfb_par *par = info->par;
+
+        sys_imageblit(info, image);
+
+        par->update_all(par);
+}
+
+static int auok190xfb_check_var(struct fb_var_screeninfo *var,
+                                   struct fb_info *info)
+{
+        if (info->var.xres != var->xres || info->var.yres != var->yres ||
+            info->var.xres_virtual != var->xres_virtual ||
+            info->var.yres_virtual != var->yres_virtual) {
+                pr_info("%s: Resolution not supported: X%u x Y%u\n",
+                         __func__, var->xres, var->yres);
+                return -EINVAL;
+        }
+
+        /*
+         *  Memory limit
+         */
+
+        if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
+                pr_info("%s: Memory Limit requested yres_virtual = %u\n",
+                         __func__, var->yres_virtual);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static struct fb_ops auok190xfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_read        = fb_sys_read,
+        .fb_write       = auok190xfb_write,
+        .fb_fillrect    = auok190xfb_fillrect,
+        .fb_copyarea    = auok190xfb_copyarea,
+        .fb_imageblit   = auok190xfb_imageblit,
+        .fb_check_var   = auok190xfb_check_var,
+};
+
+/*
+ * Controller-functions common to both K1900 and K1901
+ */
+
+static int auok190x_read_temperature(struct auok190xfb_par *par)
+{
+        struct device *dev = par->info->device;
+        u16 data[4];
+        int temp;
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        auok190x_read_cmdargs(par, AUOK190X_CMD_READ_VERSION, 4, data);
+
+        mutex_unlock(&(par->io_lock));
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+
+        /* sanitize and split of half-degrees for now */
+        temp = ((data[0] & AUOK190X_VERSION_TEMP_MASK) >> 1);
+
+        /* handle positive and negative temperatures */
+        if (temp >= 201)
+                return (255 - temp + 1) * (-1);
+        else
+                return temp;
+}
+
+static void auok190x_identify(struct auok190xfb_par *par)
+{
+        struct device *dev = par->info->device;
+        u16 data[4];
+
+        pm_runtime_get_sync(dev);
+
+        mutex_lock(&(par->io_lock));
+
+        auok190x_read_cmdargs(par, AUOK190X_CMD_READ_VERSION, 4, data);
+
+        mutex_unlock(&(par->io_lock));
+
+        par->epd_type = data[1] & AUOK190X_VERSION_TEMP_MASK;
+
+        par->panel_size_int = AUOK190X_VERSION_SIZE_INT(data[2]);
+        par->panel_size_float = AUOK190X_VERSION_SIZE_FLOAT(data[2]);
+        par->panel_model = AUOK190X_VERSION_MODEL(data[2]);
+
+        par->tcon_version = AUOK190X_VERSION_TCON(data[3]);
+        par->lut_version = AUOK190X_VERSION_LUT(data[3]);
+
+        dev_dbg(dev, "panel %d.%din, model 0x%x, EPD 0x%x TCON-rev 0x%x, LUT-rev 0x%x",
+                par->panel_size_int, par->panel_size_float, par->panel_model,
+                par->epd_type, par->tcon_version, par->lut_version);
+
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_put_autosuspend(dev);
+}
+
+/*
+ * Sysfs functions
+ */
+
+static ssize_t update_mode_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+
+        return sprintf(buf, "%d\n", par->update_mode);
+}
+
+static ssize_t update_mode_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int mode, ret;
+
+        ret = kstrtoint(buf, 10, &mode);
+        if (ret)
+                return ret;
+
+        par->update_mode = mode;
+
+        /* if we enter a better mode, do a full update */
+        if (par->last_mode > 1 && mode < par->last_mode)
+                par->update_all(par);
+
+        return count;
+}
+
+static ssize_t flash_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+
+        return sprintf(buf, "%d\n", par->flash);
+}
+
+static ssize_t flash_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int flash, ret;
+
+        ret = kstrtoint(buf, 10, &flash);
+        if (ret)
+                return ret;
+
+        if (flash > 0)
+                par->flash = 1;
+        else
+                par->flash = 0;
+
+        return count;
+}
+
+static ssize_t temp_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct auok190xfb_par *par = info->par;
+        int temp;
+
+        temp = auok190x_read_temperature(par);
+        return sprintf(buf, "%d\n", temp);
+}
+
+static DEVICE_ATTR(update_mode, 0644, update_mode_show, update_mode_store);
+static DEVICE_ATTR(flash, 0644, flash_show, flash_store);
+static DEVICE_ATTR(temp, 0644, temp_show, NULL);
+
+static struct attribute *auok190x_attributes[] = {
+        &dev_attr_update_mode.attr,
+        &dev_attr_flash.attr,
+        &dev_attr_temp.attr,
+        NULL
+};
+
+static const struct attribute_group auok190x_attr_group = {
+        .attrs          = auok190x_attributes,
+};
+
+static int auok190x_power(struct auok190xfb_par *par, bool on)
+{
+        struct auok190x_board *board = par->board;
+        int ret;
+
+        if (on) {
+                /* We should maintain POWER up for at least 80ms before set
+                 * RST_N and SLP_N to high (TCON spec 20100803_v35 p59)
+                 */
+                ret = regulator_enable(par->regulator);
+                if (ret)
+                        return ret;
+
+                msleep(200);
+                gpio_set_value(board->gpio_nrst, 1);
+                gpio_set_value(board->gpio_nsleep, 1);
+                msleep(200);
+        } else {
+                regulator_disable(par->regulator);
+                gpio_set_value(board->gpio_nrst, 0);
+                gpio_set_value(board->gpio_nsleep, 0);
+        }
+
+        return 0;
+}
+
+/*
+ * Recovery - powercycle the controller
+ */
+
+static void auok190x_recover(struct auok190xfb_par *par)
+{
+        auok190x_power(par, 0);
+        msleep(100);
+        auok190x_power(par, 1);
+
+        par->init(par);
+
+        /* wait for init to complete */
+        par->board->wait_for_rdy(par);
+}
+
+/*
+ * Power-management
+ */
+
+#ifdef CONFIG_PM
+static int auok190x_runtime_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+        u16 standby_param;
+
+        /* take and keep the lock until we are resumed, as the controller
+         * will never reach the non-busy state when in standby mode
+         */
+        mutex_lock(&(par->io_lock));
+
+        if (par->standby) {
+                dev_warn(dev, "already in standby, runtime-pm pairing mismatch\n");
+                mutex_unlock(&(par->io_lock));
+                return 0;
+        }
+
+        /* according to runtime_pm.txt runtime_suspend only means, that the
+         * device will not process data and will not communicate with the CPU
+         * As we hold the lock, this stays true even without standby
+         */
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "runtime suspend without standby\n");
+                goto finish;
+        } else if (board->quirks & AUOK190X_QUIRK_STANDBYPARAM) {
+                /* for some TCON versions STANDBY expects a parameter (0) but
+                 * it seems the real tcon version has to be determined yet.
+                 */
+                dev_dbg(dev, "runtime suspend with additional empty param\n");
+                standby_param = 0;
+                auok190x_send_cmdargs(par, AUOK190X_CMD_STANDBY, 1,
+                                      &standby_param);
+        } else {
+                dev_dbg(dev, "runtime suspend without param\n");
+                auok190x_send_command(par, AUOK190X_CMD_STANDBY);
+        }
+
+        msleep(64);
+
+finish:
+        par->standby = 1;
+
+        return 0;
+}
+
+static int auok190x_runtime_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        if (!par->standby) {
+                dev_warn(dev, "not in standby, runtime-pm pairing mismatch\n");
+                return 0;
+        }
+
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "runtime resume without standby\n");
+        } else {
+                /* when in standby, controller is always busy
+                 * and only accepts the wakeup command
+                 */
+                dev_dbg(dev, "runtime resume from standby\n");
+                auok190x_send_command_nowait(par, AUOK190X_CMD_WAKEUP);
+
+                msleep(160);
+
+                /* wait for the controller to be ready and release the lock */
+                board->wait_for_rdy(par);
+        }
+
+        par->standby = 0;
+
+        mutex_unlock(&(par->io_lock));
+
+        return 0;
+}
+
+static int auok190x_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+        int ret;
+
+        dev_dbg(dev, "suspend\n");
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                /* suspend via powering off the ic */
+                dev_dbg(dev, "suspend with broken standby\n");
+
+                auok190x_power(par, 0);
+        } else {
+                dev_dbg(dev, "suspend using sleep\n");
+
+                /* the sleep state can only be entered from the standby state.
+                 * pm_runtime_get_noresume gets called before the suspend call.
+                 * So the devices usage count is >0 but it is not necessarily
+                 * active.
+                 */
+                if (!pm_runtime_status_suspended(dev)) {
+                        ret = auok190x_runtime_suspend(dev);
+                        if (ret < 0) {
+                                dev_err(dev, "auok190x_runtime_suspend failed with %d\n",
+                                        ret);
+                                return ret;
+                        }
+                        par->manual_standby = 1;
+                }
+
+                gpio_direction_output(board->gpio_nsleep, 0);
+        }
+
+        msleep(100);
+
+        return 0;
+}
+
+static int auok190x_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        dev_dbg(dev, "resume\n");
+        if (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN) {
+                dev_dbg(dev, "resume with broken standby\n");
+
+                auok190x_power(par, 1);
+
+                par->init(par);
+        } else {
+                dev_dbg(dev, "resume from sleep\n");
+
+                /* device should be in runtime suspend when we were suspended
+                 * and pm_runtime_put_sync gets called after this function.
+                 * So there is no need to touch the standby mode here at all.
+                 */
+                gpio_direction_output(board->gpio_nsleep, 1);
+                msleep(100);
+
+                /* an additional init call seems to be necessary after sleep */
+                auok190x_runtime_resume(dev);
+                par->init(par);
+
+                /* if we were runtime-suspended before, suspend again*/
+                if (!par->manual_standby)
+                        auok190x_runtime_suspend(dev);
+                else
+                        par->manual_standby = 0;
+        }
+
+        return 0;
+}
+#endif
+
+const struct dev_pm_ops auok190x_pm = {
+        SET_RUNTIME_PM_OPS(auok190x_runtime_suspend, auok190x_runtime_resume,
+                           NULL)
+        SET_SYSTEM_SLEEP_PM_OPS(auok190x_suspend, auok190x_resume)
+};
+EXPORT_SYMBOL_GPL(auok190x_pm);
+
+/*
+ * Common probe and remove code
+ */
+
+int __devinit auok190x_common_probe(struct platform_device *pdev,
+                                    struct auok190x_init_data *init)
+{
+        struct auok190x_board *board = init->board;
+        struct auok190xfb_par *par;
+        struct fb_info *info;
+        struct panel_info *panel;
+        int videomemorysize, ret;
+        unsigned char *videomemory;
+
+        /* check board contents */
+        if (!board->init || !board->cleanup || !board->wait_for_rdy
+            || !board->set_ctl || !board->set_hdb || !board->get_hdb
+            || !board->setup_irq)
+                return -EINVAL;
+
+        info = framebuffer_alloc(sizeof(struct auok190xfb_par), &pdev->dev);
+        if (!info)
+                return -ENOMEM;
+
+        par = info->par;
+        par->info = info;
+        par->board = board;
+        par->recover = auok190x_recover;
+        par->update_partial = init->update_partial;
+        par->update_all = init->update_all;
+        par->need_refresh = init->need_refresh;
+        par->init = init->init;
+
+        /* init update modes */
+        par->update_cnt = 0;
+        par->update_mode = -1;
+        par->last_mode = -1;
+        par->flash = 0;
+
+        par->regulator = regulator_get(info->device, "vdd");
+        if (IS_ERR(par->regulator)) {
+                ret = PTR_ERR(par->regulator);
+                dev_err(info->device, "Failed to get regulator: %d\n", ret);
+                goto err_reg;
+        }
+
+        ret = board->init(par);
+        if (ret) {
+                dev_err(info->device, "board init failed, %d\n", ret);
+                goto err_board;
+        }
+
+        ret = gpio_request(board->gpio_nsleep, "AUOK190x sleep");
+        if (ret) {
+                dev_err(info->device, "could not request sleep gpio, %d\n",
+                        ret);
+                goto err_gpio1;
+        }
+
+        ret = gpio_direction_output(board->gpio_nsleep, 0);
+        if (ret) {
+                dev_err(info->device, "could not set sleep gpio, %d\n", ret);
+                goto err_gpio2;
+        }
+
+        ret = gpio_request(board->gpio_nrst, "AUOK190x reset");
+        if (ret) {
+                dev_err(info->device, "could not request reset gpio, %d\n",
+                        ret);
+                goto err_gpio2;
+        }
+
+        ret = gpio_direction_output(board->gpio_nrst, 0);
+        if (ret) {
+                dev_err(info->device, "could not set reset gpio, %d\n", ret);
+                goto err_gpio3;
+        }
+
+        ret = auok190x_power(par, 1);
+        if (ret) {
+                dev_err(info->device, "could not power on the device, %d\n",
+                        ret);
+                goto err_gpio3;
+        }
+
+        mutex_init(&par->io_lock);
+
+        init_waitqueue_head(&par->waitq);
+
+        ret = par->board->setup_irq(par->info);
+        if (ret) {
+                dev_err(info->device, "could not setup ready-irq, %d\n", ret);
+                goto err_irq;
+        }
+
+        /* wait for init to complete */
+        par->board->wait_for_rdy(par);
+
+        /*
+         * From here on the controller can talk to us
+         */
+
+        /* initialise fix, var, resolution and rotation */
+
+        strlcpy(info->fix.id, init->id, 16);
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        info->fix.visual = FB_VISUAL_STATIC_PSEUDOCOLOR;
+        info->fix.xpanstep = 0;
+        info->fix.ypanstep = 0;
+        info->fix.ywrapstep = 0;
+        info->fix.accel = FB_ACCEL_NONE;
+
+        info->var.bits_per_pixel = 8;
+        info->var.grayscale = 1;
+        info->var.red.length = 8;
+        info->var.green.length = 8;
+        info->var.blue.length = 8;
+
+        panel = &panel_table[board->resolution];
+
+        /* if 90 degree rotation, switch width and height */
+        if (board->rotation & 1) {
+                info->var.xres = panel->h;
+                info->var.yres = panel->w;
+                info->var.xres_virtual = panel->h;
+                info->var.yres_virtual = panel->w;
+                info->fix.line_length = panel->h;
+        } else {
+                info->var.xres = panel->w;
+                info->var.yres = panel->h;
+                info->var.xres_virtual = panel->w;
+                info->var.yres_virtual = panel->h;
+                info->fix.line_length = panel->w;
+        }
+
+        par->resolution = board->resolution;
+        par->rotation = board->rotation;
+
+        /* videomemory handling */
+
+        videomemorysize = roundup((panel->w * panel->h), PAGE_SIZE);
+        videomemory = vmalloc(videomemorysize);
+        if (!videomemory) {
+                ret = -ENOMEM;
+                goto err_irq;
+        }
+
+        memset(videomemory, 0, videomemorysize);
+        info->screen_base = (char *)videomemory;
+        info->fix.smem_len = videomemorysize;
+
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+        info->fbops = &auok190xfb_ops;
+
+        /* deferred io init */
+
+        info->fbdefio = devm_kzalloc(info->device,
+                                     sizeof(struct fb_deferred_io),
+                                     GFP_KERNEL);
+        if (!info->fbdefio) {
+                dev_err(info->device, "Failed to allocate memory\n");
+                ret = -ENOMEM;
+                goto err_defio;
+        }
+
+        dev_dbg(info->device, "targetting %d frames per second\n", board->fps);
+        info->fbdefio->delay = HZ / board->fps;
+        info->fbdefio->first_io = auok190xfb_dpy_first_io,
+        info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io,
+        fb_deferred_io_init(info);
+
+        /* color map */
+
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret < 0) {
+                dev_err(info->device, "Failed to allocate colormap\n");
+                goto err_cmap;
+        }
+
+        /* controller init */
+
+        par->consecutive_threshold = 100;
+        par->init(par);
+        auok190x_identify(par);
+
+        platform_set_drvdata(pdev, info);
+
+        ret = register_framebuffer(info);
+        if (ret < 0)
+                goto err_regfb;
+
+        ret = sysfs_create_group(&info->device->kobj, &auok190x_attr_group);
+        if (ret)
+                goto err_sysfs;
+
+        dev_info(info->device, "fb%d: %dx%d using %dK of video memory\n",
+                 info->node, info->var.xres, info->var.yres,
+                 videomemorysize >> 10);
+
+        /* increase autosuspend_delay when we use alternative methods
+         * for runtime_pm
+         */
+        par->autosuspend_delay = (board->quirks & AUOK190X_QUIRK_STANDBYBROKEN)
+                                        ? 1000 : 200;
+
+        pm_runtime_set_active(info->device);
+        pm_runtime_enable(info->device);
+        pm_runtime_set_autosuspend_delay(info->device, par->autosuspend_delay);
+        pm_runtime_use_autosuspend(info->device);
+
+        return 0;
+
+err_sysfs:
+        unregister_framebuffer(info);
+err_regfb:
+        fb_dealloc_cmap(&info->cmap);
+err_cmap:
+        fb_deferred_io_cleanup(info);
+        kfree(info->fbdefio);
+err_defio:
+        vfree((void *)info->screen_base);
+err_irq:
+        auok190x_power(par, 0);
+err_gpio3:
+        gpio_free(board->gpio_nrst);
+err_gpio2:
+        gpio_free(board->gpio_nsleep);
+err_gpio1:
+        board->cleanup(par);
+err_board:
+        regulator_put(par->regulator);
+err_reg:
+        framebuffer_release(info);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(auok190x_common_probe);
+
+int  __devexit auok190x_common_remove(struct platform_device *pdev)
+{
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct auok190xfb_par *par = info->par;
+        struct auok190x_board *board = par->board;
+
+        pm_runtime_disable(info->device);
+
+        sysfs_remove_group(&info->device->kobj, &auok190x_attr_group);
+
+        unregister_framebuffer(info);
+
+        fb_dealloc_cmap(&info->cmap);
+
+        fb_deferred_io_cleanup(info);
+        kfree(info->fbdefio);
+
+        vfree((void *)info->screen_base);
+
+        auok190x_power(par, 0);
+
+        gpio_free(board->gpio_nrst);
+        gpio_free(board->gpio_nsleep);
+
+        board->cleanup(par);
+
+        regulator_put(par->regulator);
+
+        framebuffer_release(info);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(auok190x_common_remove);
+
+MODULE_DESCRIPTION("Common code for AUO-K190X controllers");
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/auo_k190x.h b/drivers/video/auo_k190x.h
new file mode 100644
index 000000000000..e35af1f51b28
--- /dev/null
+++ b/drivers/video/auo_k190x.h
@@ -0,0 +1,129 @@
+/*
+ * Private common definitions for AUO-K190X framebuffer drivers
+ *
+ * Copyright (C) 2012 Heiko Stuebner <heiko@sntech.de>
+ *
+ * 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.
+ */
+
+/*
+ * I80 interface specific defines
+ */
+
+#define AUOK190X_I80_CS                 0x01
+#define AUOK190X_I80_DC                 0x02
+#define AUOK190X_I80_WR                 0x03
+#define AUOK190X_I80_OE                 0x04
+
+/*
+ * AUOK190x commands, common to both controllers
+ */
+
+#define AUOK190X_CMD_INIT               0x0000
+#define AUOK190X_CMD_STANDBY            0x0001
+#define AUOK190X_CMD_WAKEUP             0x0002
+#define AUOK190X_CMD_TCON_RESET         0x0003
+#define AUOK190X_CMD_DATA_STOP          0x1002
+#define AUOK190X_CMD_LUT_START          0x1003
+#define AUOK190X_CMD_DISP_REFRESH       0x1004
+#define AUOK190X_CMD_DISP_RESET         0x1005
+#define AUOK190X_CMD_PRE_DISPLAY_START  0x100D
+#define AUOK190X_CMD_PRE_DISPLAY_STOP   0x100F
+#define AUOK190X_CMD_FLASH_W            0x2000
+#define AUOK190X_CMD_FLASH_E            0x2001
+#define AUOK190X_CMD_FLASH_STS          0x2002
+#define AUOK190X_CMD_FRAMERATE          0x3000
+#define AUOK190X_CMD_READ_VERSION       0x4000
+#define AUOK190X_CMD_READ_STATUS        0x4001
+#define AUOK190X_CMD_READ_LUT           0x4003
+#define AUOK190X_CMD_DRIVERTIMING       0x5000
+#define AUOK190X_CMD_LBALANCE           0x5001
+#define AUOK190X_CMD_AGINGMODE          0x6000
+#define AUOK190X_CMD_AGINGEXIT          0x6001
+
+/*
+ * Common settings for AUOK190X_CMD_INIT
+ */
+
+#define AUOK190X_INIT_DATA_FILTER       (0 << 12)
+#define AUOK190X_INIT_DATA_BYPASS       (1 << 12)
+#define AUOK190X_INIT_INVERSE_WHITE     (0 << 9)
+#define AUOK190X_INIT_INVERSE_BLACK     (1 << 9)
+#define AUOK190X_INIT_SCAN_DOWN         (0 << 1)
+#define AUOK190X_INIT_SCAN_UP           (1 << 1)
+#define AUOK190X_INIT_SHIFT_LEFT        (0 << 0)
+#define AUOK190X_INIT_SHIFT_RIGHT       (1 << 0)
+
+/* Common bits to pixels
+ *   Mode       15-12   11-8    7-4     3-0
+ *   format0    4       3       2       1
+ *   format1    3       4       1       2
+ */
+
+#define AUOK190X_INIT_FORMAT0           0
+#define AUOK190X_INIT_FORMAT1           (1 << 6)
+
+/*
+ * settings for AUOK190X_CMD_RESET
+ */
+
+#define AUOK190X_RESET_TCON             (0 << 0)
+#define AUOK190X_RESET_NORMAL           (1 << 0)
+#define AUOK190X_RESET_PON              (1 << 1)
+
+/*
+ * AUOK190X_CMD_VERSION
+ */
+
+#define AUOK190X_VERSION_TEMP_MASK              (0x1ff)
+#define AUOK190X_VERSION_EPD_MASK               (0xff)
+#define AUOK190X_VERSION_SIZE_INT(_val)         ((_val & 0xfc00) >> 10)
+#define AUOK190X_VERSION_SIZE_FLOAT(_val)       ((_val & 0x3c0) >> 6)
+#define AUOK190X_VERSION_MODEL(_val)            (_val & 0x3f)
+#define AUOK190X_VERSION_LUT(_val)              (_val & 0xff)
+#define AUOK190X_VERSION_TCON(_val)             ((_val & 0xff00) >> 8)
+
+/*
+ * update modes for CMD_PARTIALDISP on K1900 and CMD_DDMA on K1901
+ */
+
+#define AUOK190X_UPDATE_MODE(_res)              ((_res & 0x7) << 12)
+#define AUOK190X_UPDATE_NONFLASH                (1 << 15)
+
+/*
+ * track panel specific parameters for common init
+ */
+
+struct auok190x_init_data {
+        char *id;
+        struct auok190x_board *board;
+
+        void (*update_partial)(struct auok190xfb_par *par, u16 y1, u16 y2);
+        void (*update_all)(struct auok190xfb_par *par);
+        bool (*need_refresh)(struct auok190xfb_par *par);
+        void (*init)(struct auok190xfb_par *par);
+};
+
+
+extern void auok190x_send_command_nowait(struct auok190xfb_par *par, u16 data);
+extern int auok190x_send_command(struct auok190xfb_par *par, u16 data);
+extern void auok190x_send_cmdargs_nowait(struct auok190xfb_par *par, u16 cmd,
+                                         int argc, u16 *argv);
+extern int auok190x_send_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv);
+extern void auok190x_send_cmdargs_pixels_nowait(struct auok190xfb_par *par,
+                                                u16 cmd, int argc, u16 *argv,
+                                                int size, u16 *data);
+extern int auok190x_send_cmdargs_pixels(struct auok190xfb_par *par, u16 cmd,
+                                        int argc, u16 *argv, int size,
+                                        u16 *data);
+extern int auok190x_read_cmdargs(struct auok190xfb_par *par, u16 cmd,
+                                  int argc, u16 *argv);
+
+extern int auok190x_common_probe(struct platform_device *pdev,
+                                 struct auok190x_init_data *init);
+extern int auok190x_common_remove(struct platform_device *pdev);
+
+extern const struct dev_pm_ops auok190x_pm;
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index af16884491ed..fa2b03750316 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -184,6 +184,18 @@ config BACKLIGHT_GENERIC
           known as the Corgi backlight driver. If you have a Sharp Zaurus
           SL-C7xx, SL-Cxx00 or SL-6000x say y.
 
+config BACKLIGHT_LM3533
+        tristate "Backlight Driver for LM3533"
+        depends on BACKLIGHT_CLASS_DEVICE
+        depends on MFD_LM3533
+        help
+          Say Y to enable the backlight driver for National Semiconductor / TI
+          LM3533 Lighting Power chips.
+
+          The backlights can be controlled directly, through PWM input, or by
+          the ambient-light-sensor interface. The chip supports 256 brightness
+          levels.
+
 config BACKLIGHT_LOCOMO
         tristate "Sharp LOCOMO LCD/Backlight Driver"
         depends on SHARP_LOCOMO
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 36855ae887d6..a2ac9cfbaf6b 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_BACKLIGHT_EP93XX)	+= ep93xx_bl.o
 obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)   += jornada720_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
+obj-$(CONFIG_BACKLIGHT_LM3533)  += lm3533_bl.o
 obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
 obj-$(CONFIG_BACKLIGHT_LP855X)  += lp855x_bl.o
 obj-$(CONFIG_BACKLIGHT_OMAP1)   += omap1_bl.o
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index 4911ea7989c8..df5db99af23d 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -160,7 +160,7 @@ static ssize_t adp5520_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -214,7 +214,7 @@ static ssize_t adp5520_bl_daylight_max_store(struct device *dev,
         struct adp5520_bl *data = dev_get_drvdata(dev);
         int ret;
 
-        ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 550dbf0bb896..77d1fdba597f 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -222,7 +222,8 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
         struct led_info *cur_led;
         int ret, i;
 
-        led = kzalloc(sizeof(*led) * pdata->num_leds, GFP_KERNEL);
+        led = devm_kzalloc(&client->dev, sizeof(*led) * pdata->num_leds,
+                                GFP_KERNEL);
         if (led == NULL) {
                 dev_err(&client->dev, "failed to alloc memory\n");
                 return -ENOMEM;
@@ -236,7 +237,7 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
 
         if (ret) {
                 dev_err(&client->dev, "failed to write\n");
-                goto err_free;
+                return ret;
         }
 
         for (i = 0; i < pdata->num_leds; ++i) {
@@ -291,9 +292,6 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
                 cancel_work_sync(&led[i].work);
         }
 
- err_free:
-        kfree(led);
-
         return ret;
 }
 
@@ -309,7 +307,6 @@ static int __devexit adp8860_led_remove(struct i2c_client *client)
                 cancel_work_sync(&data->led[i].work);
         }
 
-        kfree(data->led);
         return 0;
 }
 #else
@@ -451,7 +448,7 @@ static ssize_t adp8860_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -501,7 +498,7 @@ static ssize_t adp8860_bl_l1_daylight_max_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct adp8860_bl *data = dev_get_drvdata(dev);
-        int ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret)
                 return ret;
 
@@ -608,7 +605,7 @@ static ssize_t adp8860_bl_ambient_light_zone_store(struct device *dev,
         uint8_t reg_val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -675,13 +672,13 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                 return -EINVAL;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
         ret = adp8860_read(client, ADP8860_MFDVID, &reg_val);
         if (ret < 0)
-                goto out2;
+                return ret;
 
         switch (ADP8860_MANID(reg_val)) {
         case ADP8863_MANUFID:
@@ -694,8 +691,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                 break;
         default:
                 dev_err(&client->dev, "failed to probe\n");
-                ret = -ENODEV;
-                goto out2;
+                return -ENODEV;
         }
 
         /* It's confirmed that the DEVID field is actually a REVID */
@@ -717,8 +713,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
                         &client->dev, data, &adp8860_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
-                ret = PTR_ERR(bl);
-                goto out2;
+                return PTR_ERR(bl);
         }
 
         bl->props.brightness = ADP8860_MAX_BRIGHTNESS;
@@ -756,8 +751,6 @@ out:
                         &adp8860_bl_attr_group);
 out1:
         backlight_device_unregister(bl);
-out2:
-        kfree(data);
 
         return ret;
 }
@@ -776,7 +769,6 @@ static int __devexit adp8860_remove(struct i2c_client *client)
                         &adp8860_bl_attr_group);
 
         backlight_device_unregister(data->bl);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 9be58c6f18f1..edf7f91c8e61 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -244,8 +244,8 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
         struct led_info *cur_led;
         int ret, i;
 
-
-        led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
+        led = devm_kzalloc(&client->dev, pdata->num_leds * sizeof(*led),
+                                GFP_KERNEL);
         if (led == NULL) {
                 dev_err(&client->dev, "failed to alloc memory\n");
                 return -ENOMEM;
@@ -253,17 +253,17 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
 
         ret = adp8870_write(client, ADP8870_ISCLAW, pdata->led_fade_law);
         if (ret)
-                goto err_free;
+                return ret;
 
         ret = adp8870_write(client, ADP8870_ISCT1,
                         (pdata->led_on_time & 0x3) << 6);
         if (ret)
-                goto err_free;
+                return ret;
 
         ret = adp8870_write(client, ADP8870_ISCF,
                         FADE_VAL(pdata->led_fade_in, pdata->led_fade_out));
         if (ret)
-                goto err_free;
+                return ret;
 
         for (i = 0; i < pdata->num_leds; ++i) {
                 cur_led = &pdata->leds[i];
@@ -317,9 +317,6 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
                 cancel_work_sync(&led[i].work);
         }
 
- err_free:
-        kfree(led);
-
         return ret;
 }
 
@@ -335,7 +332,6 @@ static int __devexit adp8870_led_remove(struct i2c_client *client)
                 cancel_work_sync(&data->led[i].work);
         }
 
-        kfree(data->led);
         return 0;
 }
 #else
@@ -572,7 +568,7 @@ static ssize_t adp8870_store(struct device *dev, const char *buf,
         unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -652,7 +648,7 @@ static ssize_t adp8870_bl_l1_daylight_max_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t count)
 {
         struct adp8870_bl *data = dev_get_drvdata(dev);
-        int ret = strict_strtoul(buf, 10, &data->cached_daylight_max);
+        int ret = kstrtoul(buf, 10, &data->cached_daylight_max);
         if (ret)
                 return ret;
 
@@ -794,7 +790,7 @@ static ssize_t adp8870_bl_ambient_light_zone_store(struct device *dev,
         uint8_t reg_val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -874,7 +870,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (data == NULL)
                 return -ENOMEM;
 
@@ -894,8 +890,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                         &client->dev, data, &adp8870_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&client->dev, "failed to register backlight\n");
-                ret = PTR_ERR(bl);
-                goto out2;
+                return PTR_ERR(bl);
         }
 
         data->bl = bl;
@@ -930,8 +925,6 @@ out:
                         &adp8870_bl_attr_group);
 out1:
         backlight_device_unregister(bl);
-out2:
-        kfree(data);
 
         return ret;
 }
@@ -950,7 +943,6 @@ static int __devexit adp8870_remove(struct i2c_client *client)
                         &adp8870_bl_attr_group);
 
         backlight_device_unregister(data->bl);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/ams369fg06.c b/drivers/video/backlight/ams369fg06.c
index 7bdadc790117..3729238e7096 100644
--- a/drivers/video/backlight/ams369fg06.c
+++ b/drivers/video/backlight/ams369fg06.c
@@ -482,7 +482,7 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct ams369fg06), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ams369fg06), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -492,7 +492,7 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -501,15 +501,13 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
         lcd->lcd_pd = spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         ld = lcd_device_register("ams369fg06", &spi->dev, lcd,
                 &ams369fg06_lcd_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_lcd;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
 
         lcd->ld = ld;
 
@@ -547,8 +545,6 @@ static int __devinit ams369fg06_probe(struct spi_device *spi)
 
 out_lcd_unregister:
         lcd_device_unregister(ld);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -559,7 +555,6 @@ static int __devexit ams369fg06_remove(struct spi_device *spi)
         ams369fg06_power(lcd, FB_BLANK_POWERDOWN);
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd);
 
         return 0;
 }
@@ -619,7 +614,6 @@ static void ams369fg06_shutdown(struct spi_device *spi)
 static struct spi_driver ams369fg06_driver = {
         .driver = {
                 .name   = "ams369fg06",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ams369fg06_probe,
diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c
index a523b255e124..9dc73ac3709a 100644
--- a/drivers/video/backlight/apple_bl.c
+++ b/drivers/video/backlight/apple_bl.c
@@ -16,6 +16,8 @@
  *  get at the firmware code in order to figure out what it's actually doing.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -25,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/atomic.h>
+#include <linux/apple_bl.h>
 
 static struct backlight_device *apple_backlight_device;
 
@@ -39,8 +42,6 @@ struct hw_data {
 
 static const struct hw_data *hw_data;
 
-#define DRIVER "apple_backlight: "
-
 /* Module parameters. */
 static int debug;
 module_param_named(debug, debug, int, 0644);
@@ -60,8 +61,7 @@ static int intel_chipset_send_intensity(struct backlight_device *bd)
         int intensity = bd->props.brightness;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                       intensity);
+                pr_debug("setting brightness to %d\n", intensity);
 
         intel_chipset_set_brightness(intensity);
         return 0;
@@ -76,8 +76,7 @@ static int intel_chipset_get_intensity(struct backlight_device *bd)
         intensity = inb(0xb3) >> 4;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                       intensity);
+                pr_debug("read brightness of %d\n", intensity);
 
         return intensity;
 }
@@ -107,8 +106,7 @@ static int nvidia_chipset_send_intensity(struct backlight_device *bd)
         int intensity = bd->props.brightness;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "setting brightness to %d\n",
-                       intensity);
+                pr_debug("setting brightness to %d\n", intensity);
 
         nvidia_chipset_set_brightness(intensity);
         return 0;
@@ -123,8 +121,7 @@ static int nvidia_chipset_get_intensity(struct backlight_device *bd)
         intensity = inb(0x52f) >> 4;
 
         if (debug)
-                printk(KERN_DEBUG DRIVER "read brightness of %d\n",
-                       intensity);
+                pr_debug("read brightness of %d\n", intensity);
 
         return intensity;
 }
@@ -149,7 +146,7 @@ static int __devinit apple_bl_add(struct acpi_device *dev)
         host = pci_get_bus_and_slot(0, 0);
 
         if (!host) {
-                printk(KERN_ERR DRIVER "unable to find PCI host\n");
+                pr_err("unable to find PCI host\n");
                 return -ENODEV;
         }
 
@@ -161,7 +158,7 @@ static int __devinit apple_bl_add(struct acpi_device *dev)
         pci_dev_put(host);
 
         if (!hw_data) {
-                printk(KERN_ERR DRIVER "unknown hardware\n");
+                pr_err("unknown hardware\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index bf5b1ece7160..297db2fa91f5 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -5,6 +5,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -123,7 +125,7 @@ static ssize_t backlight_store_power(struct device *dev,
         rc = -ENXIO;
         mutex_lock(&bd->ops_lock);
         if (bd->ops) {
-                pr_debug("backlight: set power to %lu\n", power);
+                pr_debug("set power to %lu\n", power);
                 if (bd->props.power != power) {
                         bd->props.power = power;
                         backlight_update_status(bd);
@@ -161,8 +163,7 @@ static ssize_t backlight_store_brightness(struct device *dev,
                 if (brightness > bd->props.max_brightness)
                         rc = -EINVAL;
                 else {
-                        pr_debug("backlight: set brightness to %lu\n",
-                                 brightness);
+                        pr_debug("set brightness to %lu\n", brightness);
                         bd->props.brightness = brightness;
                         backlight_update_status(bd);
                         rc = count;
@@ -378,8 +379,8 @@ static int __init backlight_class_init(void)
 {
         backlight_class = class_create(THIS_MODULE, "backlight");
         if (IS_ERR(backlight_class)) {
-                printk(KERN_WARNING "Unable to create backlight class; errno = %ld\n",
-                                PTR_ERR(backlight_class));
+                pr_warn("Unable to create backlight class; errno = %ld\n",
+                        PTR_ERR(backlight_class));
                 return PTR_ERR(backlight_class);
         }
 
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 6dab13fe562e..23d732677ba1 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -544,7 +544,7 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        lcd = kzalloc(sizeof(struct corgi_lcd), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct corgi_lcd), GFP_KERNEL);
         if (!lcd) {
                 dev_err(&spi->dev, "failed to allocate memory\n");
                 return -ENOMEM;
@@ -554,10 +554,9 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
 
         lcd->lcd_dev = lcd_device_register("corgi_lcd", &spi->dev,
                                         lcd, &corgi_lcd_ops);
-        if (IS_ERR(lcd->lcd_dev)) {
-                ret = PTR_ERR(lcd->lcd_dev);
-                goto err_free_lcd;
-        }
+        if (IS_ERR(lcd->lcd_dev))
+                return PTR_ERR(lcd->lcd_dev);
+
         lcd->power = FB_BLANK_POWERDOWN;
         lcd->mode = (pdata) ? pdata->init_mode : CORGI_LCD_MODE_VGA;
 
@@ -591,8 +590,6 @@ err_unregister_bl:
         backlight_device_unregister(lcd->bl_dev);
 err_unregister_lcd:
         lcd_device_unregister(lcd->lcd_dev);
-err_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -613,7 +610,6 @@ static int __devexit corgi_lcd_remove(struct spi_device *spi)
 
         corgi_lcd_set_power(lcd->lcd_dev, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->lcd_dev);
-        kfree(lcd);
 
         return 0;
 }
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index 22489eb5f3e0..37bae801e23b 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -27,6 +27,8 @@
  *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -180,14 +182,13 @@ static int cr_backlight_probe(struct platform_device *pdev)
         lpc_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                         CRVML_DEVICE_LPC, NULL);
         if (!lpc_dev) {
-                printk("INTEL CARILLO RANCH LPC not found.\n");
+                pr_err("INTEL CARILLO RANCH LPC not found.\n");
                 return -ENODEV;
         }
 
         pci_read_config_byte(lpc_dev, CRVML_REG_GPIOEN, &dev_en);
         if (!(dev_en & CRVML_GPIOEN_BIT)) {
-                printk(KERN_ERR
-                       "Carillo Ranch GPIO device was not enabled.\n");
+                pr_err("Carillo Ranch GPIO device was not enabled.\n");
                 pci_dev_put(lpc_dev);
                 return -ENODEV;
         }
@@ -270,7 +271,7 @@ static int __init cr_backlight_init(void)
                 return PTR_ERR(crp);
         }
 
-        printk("Carillo Ranch Backlight Driver Initialized.\n");
+        pr_info("Carillo Ranch Backlight Driver Initialized.\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 30e19681a30b..573c7ece0fde 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -136,6 +136,7 @@ static int da903x_backlight_probe(struct platform_device *pdev)
                 da903x_write(data->da903x_dev, DA9034_WLED_CONTROL2,
                                 DA9034_WLED_ISET(pdata->output_current));
 
+        memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_brightness;
         bl = backlight_device_register(pdev->name, data->da903x_dev, data,
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 9ce6170c1860..8c660fcd250d 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -106,7 +108,7 @@ static int genericbl_probe(struct platform_device *pdev)
 
         generic_backlight_device = bd;
 
-        printk("Generic Backlight Driver Initialized.\n");
+        pr_info("Generic Backlight Driver Initialized.\n");
         return 0;
 }
 
@@ -120,7 +122,7 @@ static int genericbl_remove(struct platform_device *pdev)
 
         backlight_device_unregister(bd);
 
-        printk("Generic Backlight Driver Unloaded\n");
+        pr_info("Generic Backlight Driver Unloaded\n");
         return 0;
 }
 
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index 5118a9f029ab..6c9399341bcf 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -220,7 +220,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
 
         /* allocate and initialse our state */
 
-        ili = kzalloc(sizeof(struct ili9320), GFP_KERNEL);
+        ili = devm_kzalloc(&spi->dev, sizeof(struct ili9320), GFP_KERNEL);
         if (ili == NULL) {
                 dev_err(dev, "no memory for device\n");
                 return -ENOMEM;
@@ -240,8 +240,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
         lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);
         if (IS_ERR(lcd)) {
                 dev_err(dev, "failed to register lcd device\n");
-                ret = PTR_ERR(lcd);
-                goto err_free;
+                return PTR_ERR(lcd);
         }
 
         ili->lcd = lcd;
@@ -259,9 +258,6 @@ int __devinit ili9320_probe_spi(struct spi_device *spi,
  err_unregister:
         lcd_device_unregister(lcd);
 
- err_free:
-        kfree(ili);
-
         return ret;
 }
 
@@ -272,7 +268,6 @@ int __devexit ili9320_remove(struct ili9320 *ili)
         ili9320_power(ili, FB_BLANK_POWERDOWN);
 
         lcd_device_unregister(ili->lcd);
-        kfree(ili);
 
         return 0;
 }
diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 2f8af5d786ab..16f593b64427 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/backlight.h>
 #include <linux/device.h>
 #include <linux/fb.h>
@@ -38,7 +40,7 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
         ret = jornada_ssp_byte(GETBRIGHTNESS);
 
         if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) {
-                printk(KERN_ERR "bl : get brightness timeout\n");
+                pr_err("get brightness timeout\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         } else /* exchange txdummy for value */
@@ -59,7 +61,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
         if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
                 ret = jornada_ssp_byte(BRIGHTNESSOFF);
                 if (ret != TXDUMMY) {
-                        printk(KERN_INFO "bl : brightness off timeout\n");
+                        pr_info("brightness off timeout\n");
                         /* turn off backlight */
                         PPSR &= ~PPC_LDD1;
                         PPDR |= PPC_LDD1;
@@ -70,7 +72,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
 
                 /* send command to our mcu */
                 if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
-                        printk(KERN_INFO "bl : failed to set brightness\n");
+                        pr_info("failed to set brightness\n");
                         ret = -ETIMEDOUT;
                         goto out;
                 }
@@ -81,7 +83,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                    but due to physical layout it is equal to 0, so we simply
                    invert the value (MAX VALUE - NEW VALUE). */
                 if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) {
-                        printk(KERN_ERR "bl : set brightness failed\n");
+                        pr_err("set brightness failed\n");
                         ret = -ETIMEDOUT;
                 }
 
@@ -113,7 +115,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
         if (IS_ERR(bd)) {
                 ret = PTR_ERR(bd);
-                printk(KERN_ERR "bl : failed to register device, err=%x\n", ret);
+                pr_err("failed to register device, err=%x\n", ret);
                 return ret;
         }
 
@@ -125,7 +127,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
         jornada_bl_update_status(bd);
 
         platform_set_drvdata(pdev, bd);
-        printk(KERN_INFO "HP Jornada 700 series backlight driver\n");
+        pr_info("HP Jornada 700 series backlight driver\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index 22d231a17e3c..635b30523fd5 100644
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/fb.h>
 #include <linux/kernel.h>
@@ -44,7 +46,7 @@ static int jornada_lcd_get_contrast(struct lcd_device *dev)
         jornada_ssp_start();
 
         if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) {
-                printk(KERN_ERR "lcd: get contrast failed\n");
+                pr_err("get contrast failed\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         } else {
@@ -65,7 +67,7 @@ static int jornada_lcd_set_contrast(struct lcd_device *dev, int value)
 
         /* push the new value */
         if (jornada_ssp_byte(value) != TXDUMMY) {
-                printk(KERN_ERR "lcd : set contrast failed\n");
+                pr_err("set contrast failed\n");
                 jornada_ssp_end();
                 return -ETIMEDOUT;
         }
@@ -103,7 +105,7 @@ static int jornada_lcd_probe(struct platform_device *pdev)
 
         if (IS_ERR(lcd_device)) {
                 ret = PTR_ERR(lcd_device);
-                printk(KERN_ERR "lcd : failed to register device\n");
+                pr_err("failed to register device\n");
                 return ret;
         }
 
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
index 6022b67285ec..40f606a86093 100644
--- a/drivers/video/backlight/l4f00242t03.c
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -11,6 +11,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -159,7 +161,8 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        priv = kzalloc(sizeof(struct l4f00242t03_priv), GFP_KERNEL);
+        priv = devm_kzalloc(&spi->dev, sizeof(struct l4f00242t03_priv),
+                                GFP_KERNEL);
 
         if (priv == NULL) {
                 dev_err(&spi->dev, "No memory for this device.\n");
@@ -177,7 +180,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
         if (ret) {
                 dev_err(&spi->dev,
                         "Unable to get the lcd l4f00242t03 reset gpio.\n");
-                goto err;
+                return ret;
         }
 
         ret = gpio_request_one(pdata->data_enable_gpio, GPIOF_OUT_INIT_LOW,
@@ -185,7 +188,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
         if (ret) {
                 dev_err(&spi->dev,
                         "Unable to get the lcd l4f00242t03 data en gpio.\n");
-                goto err2;
+                goto err;
         }
 
         priv->io_reg = regulator_get(&spi->dev, "vdd");
@@ -193,7 +196,7 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 ret = PTR_ERR(priv->io_reg);
                 dev_err(&spi->dev, "%s: Unable to get the IO regulator\n",
                        __func__);
-                goto err3;
+                goto err2;
         }
 
         priv->core_reg = regulator_get(&spi->dev, "vcore");
@@ -201,14 +204,14 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
                 ret = PTR_ERR(priv->core_reg);
                 dev_err(&spi->dev, "%s: Unable to get the core regulator\n",
                        __func__);
-                goto err4;
+                goto err3;
         }
 
         priv->ld = lcd_device_register("l4f00242t03",
                                         &spi->dev, priv, &l4f_ops);
         if (IS_ERR(priv->ld)) {
                 ret = PTR_ERR(priv->ld);
-                goto err5;
+                goto err4;
         }
 
         /* Init the LCD */
@@ -220,16 +223,14 @@ static int __devinit l4f00242t03_probe(struct spi_device *spi)
 
         return 0;
 
-err5:
-        regulator_put(priv->core_reg);
 err4:
-        regulator_put(priv->io_reg);
+        regulator_put(priv->core_reg);
 err3:
-        gpio_free(pdata->data_enable_gpio);
+        regulator_put(priv->io_reg);
 err2:
-        gpio_free(pdata->reset_gpio);
+        gpio_free(pdata->data_enable_gpio);
 err:
-        kfree(priv);
+        gpio_free(pdata->reset_gpio);
 
         return ret;
 }
@@ -250,8 +251,6 @@ static int __devexit l4f00242t03_remove(struct spi_device *spi)
         regulator_put(priv->io_reg);
         regulator_put(priv->core_reg);
 
-        kfree(priv);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 79c1b0d609a8..a5d0d024bb92 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -5,6 +5,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -32,6 +34,8 @@ static int fb_notifier_callback(struct notifier_block *self,
         case FB_EVENT_BLANK:
         case FB_EVENT_MODE_CHANGE:
         case FB_EVENT_MODE_CHANGE_ALL:
+        case FB_EARLY_EVENT_BLANK:
+        case FB_R_EARLY_EVENT_BLANK:
                 break;
         default:
                 return 0;
@@ -46,6 +50,14 @@ static int fb_notifier_callback(struct notifier_block *self,
                 if (event == FB_EVENT_BLANK) {
                         if (ld->ops->set_power)
                                 ld->ops->set_power(ld, *(int *)evdata->data);
+                } else if (event == FB_EARLY_EVENT_BLANK) {
+                        if (ld->ops->early_set_power)
+                                ld->ops->early_set_power(ld,
+                                                *(int *)evdata->data);
+                } else if (event == FB_R_EARLY_EVENT_BLANK) {
+                        if (ld->ops->r_early_set_power)
+                                ld->ops->r_early_set_power(ld,
+                                                *(int *)evdata->data);
                 } else {
                         if (ld->ops->set_mode)
                                 ld->ops->set_mode(ld, evdata->data);
@@ -106,7 +118,7 @@ static ssize_t lcd_store_power(struct device *dev,
 
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_power) {
-                pr_debug("lcd: set power to %lu\n", power);
+                pr_debug("set power to %lu\n", power);
                 ld->ops->set_power(ld, power);
                 rc = count;
         }
@@ -142,7 +154,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
 
         mutex_lock(&ld->ops_lock);
         if (ld->ops && ld->ops->set_contrast) {
-                pr_debug("lcd: set contrast to %lu\n", contrast);
+                pr_debug("set contrast to %lu\n", contrast);
                 ld->ops->set_contrast(ld, contrast);
                 rc = count;
         }
@@ -253,8 +265,8 @@ static int __init lcd_class_init(void)
 {
         lcd_class = class_create(THIS_MODULE, "lcd");
         if (IS_ERR(lcd_class)) {
-                printk(KERN_WARNING "Unable to create backlight class; errno = %ld\n",
-                                PTR_ERR(lcd_class));
+                pr_warn("Unable to create backlight class; errno = %ld\n",
+                        PTR_ERR(lcd_class));
                 return PTR_ERR(lcd_class);
         }
 
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c
index efd352be21ae..58f517fb7d40 100644
--- a/drivers/video/backlight/ld9040.c
+++ b/drivers/video/backlight/ld9040.c
@@ -707,7 +707,7 @@ static int ld9040_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ld9040), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -717,7 +717,7 @@ static int ld9040_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -726,7 +726,7 @@ static int ld9040_probe(struct spi_device *spi)
         lcd->lcd_pd = spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         mutex_init(&lcd->lock);
@@ -734,13 +734,13 @@ static int ld9040_probe(struct spi_device *spi)
         ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies);
         if (ret) {
                 dev_err(lcd->dev, "Failed to get regulators: %d\n", ret);
-                goto out_free_lcd;
+                return ret;
         }
 
         ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
         if (IS_ERR(ld)) {
                 ret = PTR_ERR(ld);
-                goto out_free_lcd;
+                goto out_free_regulator;
         }
 
         lcd->ld = ld;
@@ -782,10 +782,9 @@ static int ld9040_probe(struct spi_device *spi)
 
 out_unregister_lcd:
         lcd_device_unregister(lcd->ld);
-out_free_lcd:
+out_free_regulator:
         regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
 
-        kfree(lcd);
         return ret;
 }
 
@@ -797,7 +796,6 @@ static int __devexit ld9040_remove(struct spi_device *spi)
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
         regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
-        kfree(lcd);
 
         return 0;
 }
@@ -846,7 +844,6 @@ static void ld9040_shutdown(struct spi_device *spi)
 static struct spi_driver ld9040_driver = {
         .driver = {
                 .name   = "ld9040",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ld9040_probe,
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
new file mode 100644
index 000000000000..bebeb63607db
--- /dev/null
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -0,0 +1,423 @@
+/*
+ * lm3533-bl.c -- LM3533 Backlight driver
+ *
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * Author: Johan Hovold <jhovold@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under  the terms of the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/slab.h>
+
+#include <linux/mfd/lm3533.h>
+
+
+#define LM3533_HVCTRLBANK_COUNT         2
+#define LM3533_BL_MAX_BRIGHTNESS        255
+
+#define LM3533_REG_CTRLBANK_AB_BCONF    0x1a
+
+
+struct lm3533_bl {
+        struct lm3533 *lm3533;
+        struct lm3533_ctrlbank cb;
+        struct backlight_device *bd;
+        int id;
+};
+
+
+static inline int lm3533_bl_get_ctrlbank_id(struct lm3533_bl *bl)
+{
+        return bl->id;
+}
+
+static int lm3533_bl_update_status(struct backlight_device *bd)
+{
+        struct lm3533_bl *bl = bl_get_data(bd);
+        int brightness = bd->props.brightness;
+
+        if (bd->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+        if (bd->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        return lm3533_ctrlbank_set_brightness(&bl->cb, (u8)brightness);
+}
+
+static int lm3533_bl_get_brightness(struct backlight_device *bd)
+{
+        struct lm3533_bl *bl = bl_get_data(bd);
+        u8 val;
+        int ret;
+
+        ret = lm3533_ctrlbank_get_brightness(&bl->cb, &val);
+        if (ret)
+                return ret;
+
+        return val;
+}
+
+static const struct backlight_ops lm3533_bl_ops = {
+        .get_brightness = lm3533_bl_get_brightness,
+        .update_status  = lm3533_bl_update_status,
+};
+
+static ssize_t show_id(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+
+        return scnprintf(buf, PAGE_SIZE, "%d\n", bl->id);
+}
+
+static ssize_t show_als_channel(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        unsigned channel = lm3533_bl_get_ctrlbank_id(bl);
+
+        return scnprintf(buf, PAGE_SIZE, "%u\n", channel);
+}
+
+static ssize_t show_als_en(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        int ctrlbank = lm3533_bl_get_ctrlbank_id(bl);
+        u8 val;
+        u8 mask;
+        bool enable;
+        int ret;
+
+        ret = lm3533_read(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, &val);
+        if (ret)
+                return ret;
+
+        mask = 1 << (2 * ctrlbank);
+        enable = val & mask;
+
+        return scnprintf(buf, PAGE_SIZE, "%d\n", enable);
+}
+
+static ssize_t store_als_en(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        int ctrlbank = lm3533_bl_get_ctrlbank_id(bl);
+        int enable;
+        u8 val;
+        u8 mask;
+        int ret;
+
+        if (kstrtoint(buf, 0, &enable))
+                return -EINVAL;
+
+        mask = 1 << (2 * ctrlbank);
+
+        if (enable)
+                val = mask;
+        else
+                val = 0;
+
+        ret = lm3533_update(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, val,
+                                                                        mask);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static ssize_t show_linear(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        u8 mask;
+        int linear;
+        int ret;
+
+        ret = lm3533_read(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, &val);
+        if (ret)
+                return ret;
+
+        mask = 1 << (2 * lm3533_bl_get_ctrlbank_id(bl) + 1);
+
+        if (val & mask)
+                linear = 1;
+        else
+                linear = 0;
+
+        return scnprintf(buf, PAGE_SIZE, "%x\n", linear);
+}
+
+static ssize_t store_linear(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        unsigned long linear;
+        u8 mask;
+        u8 val;
+        int ret;
+
+        if (kstrtoul(buf, 0, &linear))
+                return -EINVAL;
+
+        mask = 1 << (2 * lm3533_bl_get_ctrlbank_id(bl) + 1);
+
+        if (linear)
+                val = mask;
+        else
+                val = 0;
+
+        ret = lm3533_update(bl->lm3533, LM3533_REG_CTRLBANK_AB_BCONF, val,
+                                                                        mask);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static ssize_t show_pwm(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        int ret;
+
+        ret = lm3533_ctrlbank_get_pwm(&bl->cb, &val);
+        if (ret)
+                return ret;
+
+        return scnprintf(buf, PAGE_SIZE, "%u\n", val);
+}
+
+static ssize_t store_pwm(struct device *dev,
+                                        struct device_attribute *attr,
+                                        const char *buf, size_t len)
+{
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        u8 val;
+        int ret;
+
+        if (kstrtou8(buf, 0, &val))
+                return -EINVAL;
+
+        ret = lm3533_ctrlbank_set_pwm(&bl->cb, val);
+        if (ret)
+                return ret;
+
+        return len;
+}
+
+static LM3533_ATTR_RO(als_channel);
+static LM3533_ATTR_RW(als_en);
+static LM3533_ATTR_RO(id);
+static LM3533_ATTR_RW(linear);
+static LM3533_ATTR_RW(pwm);
+
+static struct attribute *lm3533_bl_attributes[] = {
+        &dev_attr_als_channel.attr,
+        &dev_attr_als_en.attr,
+        &dev_attr_id.attr,
+        &dev_attr_linear.attr,
+        &dev_attr_pwm.attr,
+        NULL,
+};
+
+static umode_t lm3533_bl_attr_is_visible(struct kobject *kobj,
+                                             struct attribute *attr, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct lm3533_bl *bl = dev_get_drvdata(dev);
+        umode_t mode = attr->mode;
+
+        if (attr == &dev_attr_als_channel.attr ||
+                                        attr == &dev_attr_als_en.attr) {
+                if (!bl->lm3533->have_als)
+                        mode = 0;
+        }
+
+        return mode;
+};
+
+static struct attribute_group lm3533_bl_attribute_group = {
+        .is_visible     = lm3533_bl_attr_is_visible,
+        .attrs          = lm3533_bl_attributes
+};
+
+static int __devinit lm3533_bl_setup(struct lm3533_bl *bl,
+                                        struct lm3533_bl_platform_data *pdata)
+{
+        int ret;
+
+        ret = lm3533_ctrlbank_set_max_current(&bl->cb, pdata->max_current);
+        if (ret)
+                return ret;
+
+        return lm3533_ctrlbank_set_pwm(&bl->cb, pdata->pwm);
+}
+
+static int __devinit lm3533_bl_probe(struct platform_device *pdev)
+{
+        struct lm3533 *lm3533;
+        struct lm3533_bl_platform_data *pdata;
+        struct lm3533_bl *bl;
+        struct backlight_device *bd;
+        struct backlight_properties props;
+        int ret;
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        lm3533 = dev_get_drvdata(pdev->dev.parent);
+        if (!lm3533)
+                return -EINVAL;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+
+        if (pdev->id < 0 || pdev->id >= LM3533_HVCTRLBANK_COUNT) {
+                dev_err(&pdev->dev, "illegal backlight id %d\n", pdev->id);
+                return -EINVAL;
+        }
+
+        bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+        if (!bl) {
+                dev_err(&pdev->dev,
+                                "failed to allocate memory for backlight\n");
+                return -ENOMEM;
+        }
+
+        bl->lm3533 = lm3533;
+        bl->id = pdev->id;
+
+        bl->cb.lm3533 = lm3533;
+        bl->cb.id = lm3533_bl_get_ctrlbank_id(bl);
+        bl->cb.dev = NULL;                      /* until registered */
+
+        memset(&props, 0, sizeof(props));
+        props.type = BACKLIGHT_RAW;
+        props.max_brightness = LM3533_BL_MAX_BRIGHTNESS;
+        props.brightness = pdata->default_brightness;
+        bd = backlight_device_register(pdata->name, pdev->dev.parent, bl,
+                                                &lm3533_bl_ops, &props);
+        if (IS_ERR(bd)) {
+                dev_err(&pdev->dev, "failed to register backlight device\n");
+                ret = PTR_ERR(bd);
+                goto err_free;
+        }
+
+        bl->bd = bd;
+        bl->cb.dev = &bl->bd->dev;
+
+        platform_set_drvdata(pdev, bl);
+
+        ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to create sysfs attributes\n");
+                goto err_unregister;
+        }
+
+        backlight_update_status(bd);
+
+        ret = lm3533_bl_setup(bl, pdata);
+        if (ret)
+                goto err_sysfs_remove;
+
+        ret = lm3533_ctrlbank_enable(&bl->cb);
+        if (ret)
+                goto err_sysfs_remove;
+
+        return 0;
+
+err_sysfs_remove:
+        sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
+err_unregister:
+        backlight_device_unregister(bd);
+err_free:
+        kfree(bl);
+
+        return ret;
+}
+
+static int __devexit lm3533_bl_remove(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+        struct backlight_device *bd = bl->bd;
+
+        dev_dbg(&bd->dev, "%s\n", __func__);
+
+        bd->props.power = FB_BLANK_POWERDOWN;
+        bd->props.brightness = 0;
+
+        lm3533_ctrlbank_disable(&bl->cb);
+        sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
+        backlight_device_unregister(bd);
+        kfree(bl);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int lm3533_bl_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        return lm3533_ctrlbank_disable(&bl->cb);
+}
+
+static int lm3533_bl_resume(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        return lm3533_ctrlbank_enable(&bl->cb);
+}
+#else
+#define lm3533_bl_suspend       NULL
+#define lm3533_bl_resume        NULL
+#endif
+
+static void lm3533_bl_shutdown(struct platform_device *pdev)
+{
+        struct lm3533_bl *bl = platform_get_drvdata(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        lm3533_ctrlbank_disable(&bl->cb);
+}
+
+static struct platform_driver lm3533_bl_driver = {
+        .driver = {
+                .name   = "lm3533-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = lm3533_bl_probe,
+        .remove         = __devexit_p(lm3533_bl_remove),
+        .shutdown       = lm3533_bl_shutdown,
+        .suspend        = lm3533_bl_suspend,
+        .resume         = lm3533_bl_resume,
+};
+module_platform_driver(lm3533_bl_driver);
+
+MODULE_AUTHOR("Johan Hovold <jhovold@gmail.com>");
+MODULE_DESCRIPTION("LM3533 Backlight driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lm3533-backlight");
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 4161f9e3982a..a9f2c36966f1 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
                         goto err;
         }
 
-        st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
+        st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
+                                GFP_KERNEL);
         if (st == NULL) {
                 dev_err(&spi->dev, "No memory for device state\n");
                 ret = -ENOMEM;
@@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
         ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
         if (IS_ERR(ld)) {
                 ret = PTR_ERR(ld);
-                goto err2;
+                goto err;
         }
 
         st->spi = spi;
@@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
 
         return 0;
 
-err2:
-        kfree(st);
 err:
         if (pdata != NULL)
                 gpio_free(pdata->reset_gpio);
@@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi)
         if (pdata != NULL)
                 gpio_free(pdata->reset_gpio);
 
-        kfree(st);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index 333949ff3265..6c0f1ac0d32a 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -232,23 +232,20 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
         struct lcd_device *ld;
         int ret;
 
-        lcd = kzalloc(sizeof(struct ltv350qv), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct ltv350qv), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
         lcd->spi = spi;
         lcd->power = FB_BLANK_POWERDOWN;
-        lcd->buffer = kzalloc(8, GFP_KERNEL);
-        if (!lcd->buffer) {
-                ret = -ENOMEM;
-                goto out_free_lcd;
-        }
+        lcd->buffer = devm_kzalloc(&spi->dev, 8, GFP_KERNEL);
+        if (!lcd->buffer)
+                return -ENOMEM;
 
         ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_buffer;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
+
         lcd->ld = ld;
 
         ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
@@ -261,10 +258,6 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
 
 out_unregister:
         lcd_device_unregister(ld);
-out_free_buffer:
-        kfree(lcd->buffer);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -274,8 +267,6 @@ static int __devexit ltv350qv_remove(struct spi_device *spi)
 
         ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd->buffer);
-        kfree(lcd);
 
         return 0;
 }
@@ -310,7 +301,6 @@ static void ltv350qv_shutdown(struct spi_device *spi)
 static struct spi_driver ltv350qv_driver = {
         .driver = {
                 .name           = "ltv350qv",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index 0175bfb08a1c..bfdc5fbeaa11 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -168,7 +170,7 @@ static int omapbl_probe(struct platform_device *pdev)
         dev->props.brightness = pdata->default_intensity;
         omapbl_update_status(dev);
 
-        printk(KERN_INFO "OMAP LCD backlight initialised\n");
+        pr_info("OMAP LCD backlight initialised\n");
 
         return 0;
 }
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index c65853cb9740..c092159f4383 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -111,6 +111,7 @@ static int __devinit pcf50633_bl_probe(struct platform_device *pdev)
         if (!pcf_bl)
                 return -ENOMEM;
 
+        memset(&bl_props, 0, sizeof(bl_props));
         bl_props.type = BACKLIGHT_RAW;
         bl_props.max_brightness = 0x3f;
         bl_props.power = FB_BLANK_UNBLANK;
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 6af183d6465e..69b35f02929e 100644
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -68,13 +70,13 @@ static int progearbl_probe(struct platform_device *pdev)
 
         pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
         if (!pmu_dev) {
-                printk("ALI M7101 PMU not found.\n");
+                pr_err("ALI M7101 PMU not found.\n");
                 return -ENODEV;
         }
 
         sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
         if (!sb_dev) {
-                printk("ALI 1533 SB not found.\n");
+                pr_err("ALI 1533 SB not found.\n");
                 ret = -ENODEV;
                 goto put_pmu;
         }
diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index e264f55b2574..6437ae474cf2 100644
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -741,7 +741,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         struct backlight_device *bd = NULL;
         struct backlight_properties props;
 
-        lcd = kzalloc(sizeof(struct s6e63m0), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct s6e63m0), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -751,7 +751,7 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         ret = spi_setup(spi);
         if (ret < 0) {
                 dev_err(&spi->dev, "spi setup failed.\n");
-                goto out_free_lcd;
+                return ret;
         }
 
         lcd->spi = spi;
@@ -760,14 +760,12 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
         lcd->lcd_pd = (struct lcd_platform_data *)spi->dev.platform_data;
         if (!lcd->lcd_pd) {
                 dev_err(&spi->dev, "platform data is NULL.\n");
-                goto out_free_lcd;
+                return -EFAULT;
         }
 
         ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops);
-        if (IS_ERR(ld)) {
-                ret = PTR_ERR(ld);
-                goto out_free_lcd;
-        }
+        if (IS_ERR(ld))
+                return PTR_ERR(ld);
 
         lcd->ld = ld;
 
@@ -824,8 +822,6 @@ static int __devinit s6e63m0_probe(struct spi_device *spi)
 
 out_lcd_unregister:
         lcd_device_unregister(ld);
-out_free_lcd:
-        kfree(lcd);
         return ret;
 }
 
@@ -838,7 +834,6 @@ static int __devexit s6e63m0_remove(struct spi_device *spi)
         device_remove_file(&spi->dev, &dev_attr_gamma_mode);
         backlight_device_unregister(lcd->bd);
         lcd_device_unregister(lcd->ld);
-        kfree(lcd);
 
         return 0;
 }
@@ -899,7 +894,6 @@ static void s6e63m0_shutdown(struct spi_device *spi)
 static struct spi_driver s6e63m0_driver = {
         .driver = {
                 .name   = "s6e63m0",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = s6e63m0_probe,
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index 2368b8e5f89e..02444d042cd5 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -349,7 +349,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
         if (err)
                 return err;
 
-        lcd = kzalloc(sizeof(struct tdo24m), GFP_KERNEL);
+        lcd = devm_kzalloc(&spi->dev, sizeof(struct tdo24m), GFP_KERNEL);
         if (!lcd)
                 return -ENOMEM;
 
@@ -357,11 +357,9 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
         lcd->power = FB_BLANK_POWERDOWN;
         lcd->mode = MODE_VGA;   /* default to VGA */
 
-        lcd->buf = kmalloc(TDO24M_SPI_BUFF_SIZE, GFP_KERNEL);
-        if (lcd->buf == NULL) {
-                kfree(lcd);
+        lcd->buf = devm_kzalloc(&spi->dev, TDO24M_SPI_BUFF_SIZE, GFP_KERNEL);
+        if (lcd->buf == NULL)
                 return -ENOMEM;
-        }
 
         m = &lcd->msg;
         x = &lcd->xfer;
@@ -383,15 +381,13 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
                 break;
         default:
                 dev_err(&spi->dev, "Unsupported model");
-                goto out_free;
+                return -EINVAL;
         }
 
         lcd->lcd_dev = lcd_device_register("tdo24m", &spi->dev,
                                         lcd, &tdo24m_ops);
-        if (IS_ERR(lcd->lcd_dev)) {
-                err = PTR_ERR(lcd->lcd_dev);
-                goto out_free;
-        }
+        if (IS_ERR(lcd->lcd_dev))
+                return PTR_ERR(lcd->lcd_dev);
 
         dev_set_drvdata(&spi->dev, lcd);
         err = tdo24m_power(lcd, FB_BLANK_UNBLANK);
@@ -402,9 +398,6 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
 
 out_unregister:
         lcd_device_unregister(lcd->lcd_dev);
-out_free:
-        kfree(lcd->buf);
-        kfree(lcd);
         return err;
 }
 
@@ -414,8 +407,6 @@ static int __devexit tdo24m_remove(struct spi_device *spi)
 
         tdo24m_power(lcd, FB_BLANK_POWERDOWN);
         lcd_device_unregister(lcd->lcd_dev);
-        kfree(lcd->buf);
-        kfree(lcd);
 
         return 0;
 }
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 2b241abced43..0d54e607e82d 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -82,8 +82,11 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
         struct backlight_properties props;
-        struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
+        struct tosa_bl_data *data;
         int ret = 0;
+
+        data = devm_kzalloc(&client->dev, sizeof(struct tosa_bl_data),
+                                GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -92,7 +95,7 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
         ret = gpio_request(TOSA_GPIO_BL_C20MA, "backlight");
         if (ret) {
                 dev_dbg(&data->bl->dev, "Unable to request gpio!\n");
-                goto err_gpio_bl;
+                return ret;
         }
         ret = gpio_direction_output(TOSA_GPIO_BL_C20MA, 0);
         if (ret)
@@ -122,8 +125,6 @@ err_reg:
         data->bl = NULL;
 err_gpio_dir:
         gpio_free(TOSA_GPIO_BL_C20MA);
-err_gpio_bl:
-        kfree(data);
         return ret;
 }
 
@@ -136,8 +137,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client)
 
         gpio_free(TOSA_GPIO_BL_C20MA);
 
-        kfree(data);
-
         return 0;
 }
 
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 2231aec23918..47823b8efff0 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -174,7 +174,8 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
         int ret;
         struct tosa_lcd_data *data;
 
-        data = kzalloc(sizeof(struct tosa_lcd_data), GFP_KERNEL);
+        data = devm_kzalloc(&spi->dev, sizeof(struct tosa_lcd_data),
+                                GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -187,7 +188,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
 
         ret = spi_setup(spi);
         if (ret < 0)
-                goto err_spi;
+                return ret;
 
         data->spi = spi;
         dev_set_drvdata(&spi->dev, data);
@@ -224,8 +225,6 @@ err_gpio_dir:
         gpio_free(TOSA_GPIO_TG_ON);
 err_gpio_tg:
         dev_set_drvdata(&spi->dev, NULL);
-err_spi:
-        kfree(data);
         return ret;
 }
 
@@ -242,7 +241,6 @@ static int __devexit tosa_lcd_remove(struct spi_device *spi)
 
         gpio_free(TOSA_GPIO_TG_ON);
         dev_set_drvdata(&spi->dev, NULL);
-        kfree(data);
 
         return 0;
 }
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 5d365deb5f82..9e5517a3a52b 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -194,6 +194,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         data->current_brightness = 0;
         data->isink_reg = isink_reg;
 
+        memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = max_isel;
         bl = backlight_device_register("wm831x", &pdev->dev, data,
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
index 86922ac84412..353c02fe8a95 100644
--- a/drivers/video/bfin-lq035q1-fb.c
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/fb.h>
+#include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 1a268a294478..33ea874c87d2 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -414,14 +414,14 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
                 if (ret) {
                         dev_err(&client->dev, "PPI0_FS3 GPIO request failed\n");
                         ret = -EBUSY;
-                        goto out_8;
+                        goto free_fbdev;
                 }
         }
 
         if (peripheral_request_list(ppi_pins, DRIVER_NAME)) {
                 dev_err(&client->dev, "requesting PPI peripheral failed\n");
                 ret = -EFAULT;
-                goto out_8;
+                goto free_gpio;
         }
 
         fbdev->fb_mem =
@@ -432,7 +432,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
                 dev_err(&client->dev, "couldn't allocate dma buffer (%d bytes)\n",
                        (u32) fbdev->fb_len);
                 ret = -ENOMEM;
-                goto out_7;
+                goto free_ppi_pins;
         }
 
         fbdev->info.screen_base = (void *)fbdev->fb_mem;
@@ -464,27 +464,27 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
         if (!fbdev->info.pseudo_palette) {
                 dev_err(&client->dev, "failed to allocate pseudo_palette\n");
                 ret = -ENOMEM;
-                goto out_6;
+                goto free_fb_mem;
         }
 
         if (fb_alloc_cmap(&fbdev->info.cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0) < 0) {
                 dev_err(&client->dev, "failed to allocate colormap (%d entries)\n",
                            BFIN_LCD_NBR_PALETTE_ENTRIES);
                 ret = -EFAULT;
-                goto out_5;
+                goto free_palette;
         }
 
         if (request_dma(CH_PPI, "BF5xx_PPI_DMA") < 0) {
                 dev_err(&client->dev, "unable to request PPI DMA\n");
                 ret = -EFAULT;
-                goto out_4;
+                goto free_cmap;
         }
 
         if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, 0,
                         "PPI ERROR", fbdev) < 0) {
                 dev_err(&client->dev, "unable to request PPI ERROR IRQ\n");
                 ret = -EFAULT;
-                goto out_3;
+                goto free_ch_ppi;
         }
 
         fbdev->open = 0;
@@ -494,14 +494,14 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
 
         if (ret) {
                 dev_err(&client->dev, "i2c attach: init error\n");
-                goto out_1;
+                goto free_irq_ppi;
         }
 
 
         if (register_framebuffer(&fbdev->info) < 0) {
                 dev_err(&client->dev, "unable to register framebuffer\n");
                 ret = -EFAULT;
-                goto out_1;
+                goto free_irq_ppi;
         }
 
         dev_info(&client->dev, "fb%d: %s frame buffer device\n",
@@ -512,7 +512,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
         if (!entry) {
                 dev_err(&client->dev, "unable to create /proc entry\n");
                 ret = -EFAULT;
-                goto out_0;
+                goto free_fb;
         }
 
         entry->read_proc = adv7393_read_proc;
@@ -521,22 +521,25 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
 
         return 0;
 
- out_0:
+free_fb:
         unregister_framebuffer(&fbdev->info);
- out_1:
+free_irq_ppi:
         free_irq(IRQ_PPI_ERROR, fbdev);
- out_3:
+free_ch_ppi:
         free_dma(CH_PPI);
- out_4:
-        dma_free_coherent(NULL, fbdev->fb_len, fbdev->fb_mem,
-                          fbdev->dma_handle);
- out_5:
+free_cmap:
         fb_dealloc_cmap(&fbdev->info.cmap);
- out_6:
+free_palette:
         kfree(fbdev->info.pseudo_palette);
- out_7:
+free_fb_mem:
+        dma_free_coherent(NULL, fbdev->fb_len, fbdev->fb_mem,
+                          fbdev->dma_handle);
+free_ppi_pins:
         peripheral_free_list(ppi_pins);
- out_8:
+free_gpio:
+        if (ANOMALY_05000400)
+                gpio_free(P_IDENT(P_PPI0_FS3));
+free_fbdev:
         kfree(fbdev);
 
         return ret;
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 99b354b8e257..f994c8b8f10a 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -33,7 +33,6 @@
 #include <asm/mach-types.h>
 #include <linux/uaccess.h>
 
-#include <asm/hardware/clps7111.h>
 #include <mach/syspld.h>
 
 struct fb_info  *cfb;
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index f56699d8122a..eae46f6457e2 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -1,7 +1,8 @@
 /*
- *  Cobalt server LCD frame buffer driver.
+ *  Cobalt/SEAD3 LCD frame buffer driver.
  *
  *  Copyright (C) 2008  Yoichi Yuasa <yuasa@linux-mips.org>
+ *  Copyright (C) 2012  MIPS Technologies, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,6 +63,7 @@
 #define LCD_CUR_POS(x)          ((x) & LCD_CUR_POS_MASK)
 #define LCD_TEXT_POS(x)         ((x) | LCD_TEXT_MODE)
 
+#ifdef CONFIG_MIPS_COBALT
 static inline void lcd_write_control(struct fb_info *info, u8 control)
 {
         writel((u32)control << 24, info->screen_base);
@@ -81,6 +83,47 @@ static inline u8 lcd_read_data(struct fb_info *info)
 {
         return readl(info->screen_base + LCD_DATA_REG_OFFSET) >> 24;
 }
+#else
+
+#define LCD_CTL                 0x00
+#define LCD_DATA                0x08
+#define CPLD_STATUS             0x10
+#define CPLD_DATA               0x18
+
+static inline void cpld_wait(struct fb_info *info)
+{
+        do {
+        } while (readl(info->screen_base + CPLD_STATUS) & 1);
+}
+
+static inline void lcd_write_control(struct fb_info *info, u8 control)
+{
+        cpld_wait(info);
+        writel(control, info->screen_base + LCD_CTL);
+}
+
+static inline u8 lcd_read_control(struct fb_info *info)
+{
+        cpld_wait(info);
+        readl(info->screen_base + LCD_CTL);
+        cpld_wait(info);
+        return readl(info->screen_base + CPLD_DATA) & 0xff;
+}
+
+static inline void lcd_write_data(struct fb_info *info, u8 data)
+{
+        cpld_wait(info);
+        writel(data, info->screen_base + LCD_DATA);
+}
+
+static inline u8 lcd_read_data(struct fb_info *info)
+{
+        cpld_wait(info);
+        readl(info->screen_base + LCD_DATA);
+        cpld_wait(info);
+        return readl(info->screen_base + CPLD_DATA) & 0xff;
+}
+#endif
 
 static int lcd_busy_wait(struct fb_info *info)
 {
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 6468a297e341..39571f9e0162 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -22,7 +22,9 @@
 #include <linux/font.h>
 
 #include <asm/hardware.h>
+#include <asm/page.h>
 #include <asm/parisc-device.h>
+#include <asm/pdc.h>
 #include <asm/cacheflush.h>
 #include <asm/grfioctl.h>
 
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index 784139aed079..b4a632ada401 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -18,6 +18,8 @@
 
 static bool request_mem_succeeded = false;
 
+static struct pci_dev *default_vga;
+
 static struct fb_var_screeninfo efifb_defined __devinitdata = {
         .activate               = FB_ACTIVATE_NOW,
         .height                 = -1,
@@ -298,35 +300,72 @@ static struct fb_ops efifb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
+struct pci_dev *vga_default_device(void)
+{
+        return default_vga;
+}
+
+EXPORT_SYMBOL_GPL(vga_default_device);
+
+void vga_set_default_device(struct pci_dev *pdev)
+{
+        default_vga = pdev;
+}
+
 static int __init efifb_setup(char *options)
 {
         char *this_opt;
         int i;
+        struct pci_dev *dev = NULL;
+
+        if (options && *options) {
+                while ((this_opt = strsep(&options, ",")) != NULL) {
+                        if (!*this_opt) continue;
+
+                        for (i = 0; i < M_UNKNOWN; i++) {
+                                if (!strcmp(this_opt, dmi_list[i].optname) &&
+                                    dmi_list[i].base != 0) {
+                                        screen_info.lfb_base = dmi_list[i].base;
+                                        screen_info.lfb_linelength = dmi_list[i].stride;
+                                        screen_info.lfb_width = dmi_list[i].width;
+                                        screen_info.lfb_height = dmi_list[i].height;
+                                }
+                        }
+                        if (!strncmp(this_opt, "base:", 5))
+                                screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
+                        else if (!strncmp(this_opt, "stride:", 7))
+                                screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;
+                        else if (!strncmp(this_opt, "height:", 7))
+                                screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);
+                        else if (!strncmp(this_opt, "width:", 6))
+                                screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
+                }
+        }
 
-        if (!options || !*options)
-                return 0;
+        for_each_pci_dev(dev) {
+                int i;
 
-        while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
+                if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+                        continue;
 
-                for (i = 0; i < M_UNKNOWN; i++) {
-                        if (!strcmp(this_opt, dmi_list[i].optname) &&
-                                        dmi_list[i].base != 0) {
-                                screen_info.lfb_base = dmi_list[i].base;
-                                screen_info.lfb_linelength = dmi_list[i].stride;
-                                screen_info.lfb_width = dmi_list[i].width;
-                                screen_info.lfb_height = dmi_list[i].height;
-                        }
+                for (i=0; i < DEVICE_COUNT_RESOURCE; i++) {
+                        resource_size_t start, end;
+
+                        if (!(pci_resource_flags(dev, i) & IORESOURCE_MEM))
+                                continue;
+
+                        start = pci_resource_start(dev, i);
+                        end  = pci_resource_end(dev, i);
+
+                        if (!start || !end)
+                                continue;
+
+                        if (screen_info.lfb_base >= start &&
+                            (screen_info.lfb_base + screen_info.lfb_size) < end)
+                                default_vga = dev;
                 }
-                if (!strncmp(this_opt, "base:", 5))
-                        screen_info.lfb_base = simple_strtoul(this_opt+5, NULL, 0);
-                else if (!strncmp(this_opt, "stride:", 7))
-                        screen_info.lfb_linelength = simple_strtoul(this_opt+7, NULL, 0) * 4;
-                else if (!strncmp(this_opt, "height:", 7))
-                        screen_info.lfb_height = simple_strtoul(this_opt+7, NULL, 0);
-                else if (!strncmp(this_opt, "width:", 6))
-                        screen_info.lfb_width = simple_strtoul(this_opt+6, NULL, 0);
         }
+
         return 0;
 }
 
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index f8babbeee275..345d96230978 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -507,16 +507,16 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
 
         err = fb_alloc_cmap(&info->cmap, 256, 0);
         if (err)
-                goto failed;
+                goto failed_cmap;
 
         err = ep93xxfb_alloc_videomem(info);
         if (err)
-                goto failed;
+                goto failed_videomem;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 err = -ENXIO;
-                goto failed;
+                goto failed_resource;
         }
 
         /*
@@ -532,7 +532,7 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         fbi->mmio_base = ioremap(res->start, resource_size(res));
         if (!fbi->mmio_base) {
                 err = -ENXIO;
-                goto failed;
+                goto failed_resource;
         }
 
         strcpy(info->fix.id, pdev->name);
@@ -553,24 +553,24 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         if (err == 0) {
                 dev_err(info->dev, "No suitable video mode found\n");
                 err = -EINVAL;
-                goto failed;
+                goto failed_mode;
         }
 
         if (mach_info->setup) {
                 err = mach_info->setup(pdev);
                 if (err)
-                        return err;
+                        goto failed_mode;
         }
 
         err = ep93xxfb_check_var(&info->var, info);
         if (err)
-                goto failed;
+                goto failed_check;
 
         fbi->clk = clk_get(info->dev, NULL);
         if (IS_ERR(fbi->clk)) {
                 err = PTR_ERR(fbi->clk);
                 fbi->clk = NULL;
-                goto failed;
+                goto failed_check;
         }
 
         ep93xxfb_set_par(info);
@@ -585,15 +585,17 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         return 0;
 
 failed:
-        if (fbi->clk)
-                clk_put(fbi->clk);
-        if (fbi->mmio_base)
-                iounmap(fbi->mmio_base);
-        ep93xxfb_dealloc_videomem(info);
-        if (&info->cmap)
-                fb_dealloc_cmap(&info->cmap);
+        clk_put(fbi->clk);
+failed_check:
         if (fbi->mach_info->teardown)
                 fbi->mach_info->teardown(pdev);
+failed_mode:
+        iounmap(fbi->mmio_base);
+failed_resource:
+        ep93xxfb_dealloc_videomem(info);
+failed_videomem:
+        fb_dealloc_cmap(&info->cmap);
+failed_cmap:
         kfree(info);
         platform_set_drvdata(pdev, NULL);
 
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 2a4481cf260c..a36b2d28280e 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -21,14 +21,14 @@
 
 #include <video/exynos_dp.h>
 
-#include <plat/cpu.h>
-
 #include "exynos_dp_core.h"
 
 static int exynos_dp_init_dp(struct exynos_dp_device *dp)
 {
         exynos_dp_reset(dp);
 
+        exynos_dp_swreset(dp);
+
         /* SW defined function Normal operation */
         exynos_dp_enable_sw_function(dp);
 
@@ -478,7 +478,7 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
         int lane_count;
         u8 buf[5];
 
-        u8 *adjust_request;
+        u8 adjust_request[2];
         u8 voltage_swing;
         u8 pre_emphasis;
         u8 training_lane;
@@ -493,8 +493,8 @@ static int exynos_dp_process_clock_recovery(struct exynos_dp_device *dp)
                 /* set training pattern 2 for EQ */
                 exynos_dp_set_training_pattern(dp, TRAINING_PTN2);
 
-                adjust_request = link_status + (DPCD_ADDR_ADJUST_REQUEST_LANE0_1
-                                                - DPCD_ADDR_LANE0_1_STATUS);
+                adjust_request[0] = link_status[4];
+                adjust_request[1] = link_status[5];
 
                 exynos_dp_get_adjust_train(dp, adjust_request);
 
@@ -566,7 +566,7 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
         u8 buf[5];
         u32 reg;
 
-        u8 *adjust_request;
+        u8 adjust_request[2];
 
         udelay(400);
 
@@ -575,8 +575,8 @@ static int exynos_dp_process_equalizer_training(struct exynos_dp_device *dp)
         lane_count = dp->link_train.lane_count;
 
         if (exynos_dp_clock_recovery_ok(link_status, lane_count) == 0) {
-                adjust_request = link_status + (DPCD_ADDR_ADJUST_REQUEST_LANE0_1
-                                                - DPCD_ADDR_LANE0_1_STATUS);
+                adjust_request[0] = link_status[4];
+                adjust_request[1] = link_status[5];
 
                 if (exynos_dp_channel_eq_ok(link_status, lane_count) == 0) {
                         /* traing pattern Set to Normal */
@@ -770,7 +770,7 @@ static int exynos_dp_config_video(struct exynos_dp_device *dp,
                         return -ETIMEDOUT;
                 }
 
-                mdelay(100);
+                udelay(1);
         }
 
         /* Set to use the register calculated M/N video */
@@ -804,7 +804,7 @@ static int exynos_dp_config_video(struct exynos_dp_device *dp,
                         return -ETIMEDOUT;
                 }
 
-                mdelay(100);
+                mdelay(1);
         }
 
         if (retval != 0)
@@ -860,7 +860,8 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        dp = kzalloc(sizeof(struct exynos_dp_device), GFP_KERNEL);
+        dp = devm_kzalloc(&pdev->dev, sizeof(struct exynos_dp_device),
+                                GFP_KERNEL);
         if (!dp) {
                 dev_err(&pdev->dev, "no memory for device data\n");
                 return -ENOMEM;
@@ -871,8 +872,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         dp->clock = clk_get(&pdev->dev, "dp");
         if (IS_ERR(dp->clock)) {
                 dev_err(&pdev->dev, "failed to get clock\n");
-                ret = PTR_ERR(dp->clock);
-                goto err_dp;
+                return PTR_ERR(dp->clock);
         }
 
         clk_enable(dp->clock);
@@ -884,35 +884,25 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                 goto err_clock;
         }
 
-        res = request_mem_region(res->start, resource_size(res),
-                                dev_name(&pdev->dev));
-        if (!res) {
-                dev_err(&pdev->dev, "failed to request registers region\n");
-                ret = -EINVAL;
-                goto err_clock;
-        }
-
-        dp->res = res;
-
-        dp->reg_base = ioremap(res->start, resource_size(res));
+        dp->reg_base = devm_request_and_ioremap(&pdev->dev, res);
         if (!dp->reg_base) {
                 dev_err(&pdev->dev, "failed to ioremap\n");
                 ret = -ENOMEM;
-                goto err_req_region;
+                goto err_clock;
         }
 
         dp->irq = platform_get_irq(pdev, 0);
         if (!dp->irq) {
                 dev_err(&pdev->dev, "failed to get irq\n");
                 ret = -ENODEV;
-                goto err_ioremap;
+                goto err_clock;
         }
 
-        ret = request_irq(dp->irq, exynos_dp_irq_handler, 0,
-                        "exynos-dp", dp);
+        ret = devm_request_irq(&pdev->dev, dp->irq, exynos_dp_irq_handler, 0,
+                                "exynos-dp", dp);
         if (ret) {
                 dev_err(&pdev->dev, "failed to request irq\n");
-                goto err_ioremap;
+                goto err_clock;
         }
 
         dp->video_info = pdata->video_info;
@@ -924,7 +914,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         ret = exynos_dp_detect_hpd(dp);
         if (ret) {
                 dev_err(&pdev->dev, "unable to detect hpd\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         exynos_dp_handle_edid(dp);
@@ -933,7 +923,7 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
                                 dp->video_info->link_rate);
         if (ret) {
                 dev_err(&pdev->dev, "unable to do link train\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         exynos_dp_enable_scramble(dp, 1);
@@ -947,23 +937,15 @@ static int __devinit exynos_dp_probe(struct platform_device *pdev)
         ret = exynos_dp_config_video(dp, dp->video_info);
         if (ret) {
                 dev_err(&pdev->dev, "unable to config video\n");
-                goto err_irq;
+                goto err_clock;
         }
 
         platform_set_drvdata(pdev, dp);
 
         return 0;
 
-err_irq:
-        free_irq(dp->irq, dp);
-err_ioremap:
-        iounmap(dp->reg_base);
-err_req_region:
-        release_mem_region(res->start, resource_size(res));
 err_clock:
         clk_put(dp->clock);
-err_dp:
-        kfree(dp);
 
         return ret;
 }
@@ -976,16 +958,9 @@ static int __devexit exynos_dp_remove(struct platform_device *pdev)
         if (pdata && pdata->phy_exit)
                 pdata->phy_exit();
 
-        free_irq(dp->irq, dp);
-        iounmap(dp->reg_base);
-
         clk_disable(dp->clock);
         clk_put(dp->clock);
 
-        release_mem_region(dp->res->start, resource_size(dp->res));
-
-        kfree(dp);
-
         return 0;
 }
 
diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h
index 90ceaca0fa24..1e0f998e0c9f 100644
--- a/drivers/video/exynos/exynos_dp_core.h
+++ b/drivers/video/exynos/exynos_dp_core.h
@@ -26,7 +26,6 @@ struct link_train {
 
 struct exynos_dp_device {
         struct device           *dev;
-        struct resource         *res;
         struct clk              *clock;
         unsigned int            irq;
         void __iomem            *reg_base;
@@ -39,8 +38,10 @@ struct exynos_dp_device {
 void exynos_dp_enable_video_mute(struct exynos_dp_device *dp, bool enable);
 void exynos_dp_stop_video(struct exynos_dp_device *dp);
 void exynos_dp_lane_swap(struct exynos_dp_device *dp, bool enable);
+void exynos_dp_init_analog_param(struct exynos_dp_device *dp);
 void exynos_dp_init_interrupt(struct exynos_dp_device *dp);
 void exynos_dp_reset(struct exynos_dp_device *dp);
+void exynos_dp_swreset(struct exynos_dp_device *dp);
 void exynos_dp_config_interrupt(struct exynos_dp_device *dp);
 u32 exynos_dp_get_pll_lock_status(struct exynos_dp_device *dp);
 void exynos_dp_set_pll_power_down(struct exynos_dp_device *dp, bool enable);
diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c
index 6548afa0e3d2..6ce76d56c3a1 100644
--- a/drivers/video/exynos/exynos_dp_reg.c
+++ b/drivers/video/exynos/exynos_dp_reg.c
@@ -16,8 +16,6 @@
 
 #include <video/exynos_dp.h>
 
-#include <plat/cpu.h>
-
 #include "exynos_dp_core.h"
 #include "exynos_dp_reg.h"
 
@@ -65,6 +63,28 @@ void exynos_dp_lane_swap(struct exynos_dp_device *dp, bool enable)
         writel(reg, dp->reg_base + EXYNOS_DP_LANE_MAP);
 }
 
+void exynos_dp_init_analog_param(struct exynos_dp_device *dp)
+{
+        u32 reg;
+
+        reg = TX_TERMINAL_CTRL_50_OHM;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_1);
+
+        reg = SEL_24M | TX_DVDD_BIT_1_0625V;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_2);
+
+        reg = DRIVE_DVDD_BIT_1_0625V | VCO_BIT_600_MICRO;
+        writel(reg, dp->reg_base + EXYNOS_DP_ANALOG_CTL_3);
+
+        reg = PD_RING_OSC | AUX_TERMINAL_CTRL_50_OHM |
+                TX_CUR1_2X | TX_CUR_8_MA;
+        writel(reg, dp->reg_base + EXYNOS_DP_PLL_FILTER_CTL_1);
+
+        reg = CH3_AMP_400_MV | CH2_AMP_400_MV |
+                CH1_AMP_400_MV | CH0_AMP_400_MV;
+        writel(reg, dp->reg_base + EXYNOS_DP_TX_AMP_TUNING_CTL);
+}
+
 void exynos_dp_init_interrupt(struct exynos_dp_device *dp)
 {
         /* Set interrupt pin assertion polarity as high */
@@ -89,8 +109,6 @@ void exynos_dp_reset(struct exynos_dp_device *dp)
 {
         u32 reg;
 
-        writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET);
-
         exynos_dp_stop_video(dp);
         exynos_dp_enable_video_mute(dp, 0);
 
@@ -131,9 +149,15 @@ void exynos_dp_reset(struct exynos_dp_device *dp)
 
         writel(0x00000101, dp->reg_base + EXYNOS_DP_SOC_GENERAL_CTL);
 
+        exynos_dp_init_analog_param(dp);
         exynos_dp_init_interrupt(dp);
 }
 
+void exynos_dp_swreset(struct exynos_dp_device *dp)
+{
+        writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET);
+}
+
 void exynos_dp_config_interrupt(struct exynos_dp_device *dp)
 {
         u32 reg;
@@ -271,6 +295,7 @@ void exynos_dp_set_analog_power_down(struct exynos_dp_device *dp,
 void exynos_dp_init_analog_func(struct exynos_dp_device *dp)
 {
         u32 reg;
+        int timeout_loop = 0;
 
         exynos_dp_set_analog_power_down(dp, POWER_ALL, 0);
 
@@ -282,9 +307,19 @@ void exynos_dp_init_analog_func(struct exynos_dp_device *dp)
         writel(reg, dp->reg_base + EXYNOS_DP_DEBUG_CTL);
 
         /* Power up PLL */
-        if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED)
+        if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
                 exynos_dp_set_pll_power_down(dp, 0);
 
+                while (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) {
+                        timeout_loop++;
+                        if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {
+                                dev_err(dp->dev, "failed to get pll lock status\n");
+                                return;
+                        }
+                        usleep_range(10, 20);
+                }
+        }
+
         /* Enable Serdes FIFO function and Link symbol clock domain module */
         reg = readl(dp->reg_base + EXYNOS_DP_FUNC_EN_2);
         reg &= ~(SERDES_FIFO_FUNC_EN_N | LS_CLK_DOMAIN_FUNC_EN_N
diff --git a/drivers/video/exynos/exynos_dp_reg.h b/drivers/video/exynos/exynos_dp_reg.h
index 42f608e2a43e..125b27cd57ae 100644
--- a/drivers/video/exynos/exynos_dp_reg.h
+++ b/drivers/video/exynos/exynos_dp_reg.h
@@ -24,6 +24,12 @@
 
 #define EXYNOS_DP_LANE_MAP                      0x35C
 
+#define EXYNOS_DP_ANALOG_CTL_1                  0x370
+#define EXYNOS_DP_ANALOG_CTL_2                  0x374
+#define EXYNOS_DP_ANALOG_CTL_3                  0x378
+#define EXYNOS_DP_PLL_FILTER_CTL_1              0x37C
+#define EXYNOS_DP_TX_AMP_TUNING_CTL             0x380
+
 #define EXYNOS_DP_AUX_HW_RETRY_CTL              0x390
 
 #define EXYNOS_DP_COMMON_INT_STA_1              0x3C4
@@ -166,6 +172,29 @@
 #define LANE0_MAP_LOGIC_LANE_2                  (0x2 << 0)
 #define LANE0_MAP_LOGIC_LANE_3                  (0x3 << 0)
 
+/* EXYNOS_DP_ANALOG_CTL_1 */
+#define TX_TERMINAL_CTRL_50_OHM                 (0x1 << 4)
+
+/* EXYNOS_DP_ANALOG_CTL_2 */
+#define SEL_24M                                 (0x1 << 3)
+#define TX_DVDD_BIT_1_0625V                     (0x4 << 0)
+
+/* EXYNOS_DP_ANALOG_CTL_3 */
+#define DRIVE_DVDD_BIT_1_0625V                  (0x4 << 5)
+#define VCO_BIT_600_MICRO                       (0x5 << 0)
+
+/* EXYNOS_DP_PLL_FILTER_CTL_1 */
+#define PD_RING_OSC                             (0x1 << 6)
+#define AUX_TERMINAL_CTRL_50_OHM                (0x2 << 4)
+#define TX_CUR1_2X                              (0x1 << 2)
+#define TX_CUR_8_MA                             (0x2 << 0)
+
+/* EXYNOS_DP_TX_AMP_TUNING_CTL */
+#define CH3_AMP_400_MV                          (0x0 << 24)
+#define CH2_AMP_400_MV                          (0x0 << 16)
+#define CH1_AMP_400_MV                          (0x0 << 8)
+#define CH0_AMP_400_MV                          (0x0 << 0)
+
 /* EXYNOS_DP_AUX_HW_RETRY_CTL */
 #define AUX_BIT_PERIOD_EXPECTED_DELAY(x)        (((x) & 0x7) << 8)
 #define AUX_HW_RETRY_INTERVAL_MASK              (0x3 << 3)
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c
index 557091dc0e97..6c1f5c314a42 100644
--- a/drivers/video/exynos/exynos_mipi_dsi.c
+++ b/drivers/video/exynos/exynos_mipi_dsi.c
@@ -58,7 +58,7 @@ static struct mipi_dsim_platform_data *to_dsim_plat(struct platform_device
 }
 
 static struct regulator_bulk_data supplies[] = {
-        { .supply = "vdd10", },
+        { .supply = "vdd11", },
         { .supply = "vdd18", },
 };
 
@@ -102,6 +102,8 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim)
         /* set display timing. */
         exynos_mipi_dsi_set_display_mode(dsim, dsim->dsim_config);
 
+        exynos_mipi_dsi_init_interrupt(dsim);
+
         /*
          * data from Display controller(FIMD) is transferred in video mode
          * but in case of command mode, all settigs is updated to registers.
@@ -413,27 +415,30 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
                 goto err_platform_get_irq;
         }
 
+        init_completion(&dsim_wr_comp);
+        init_completion(&dsim_rd_comp);
+        platform_set_drvdata(pdev, dsim);
+
         ret = request_irq(dsim->irq, exynos_mipi_dsi_interrupt_handler,
-                        IRQF_SHARED, pdev->name, dsim);
+                        IRQF_SHARED, dev_name(&pdev->dev), dsim);
         if (ret != 0) {
                 dev_err(&pdev->dev, "failed to request dsim irq\n");
                 ret = -EINVAL;
                 goto err_bind;
         }
 
-        init_completion(&dsim_wr_comp);
-        init_completion(&dsim_rd_comp);
-
-        /* enable interrupt */
+        /* enable interrupts */
         exynos_mipi_dsi_init_interrupt(dsim);
 
         /* initialize mipi-dsi client(lcd panel). */
         if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->probe)
                 dsim_ddi->dsim_lcd_drv->probe(dsim_ddi->dsim_lcd_dev);
 
-        /* in case that mipi got enabled at bootloader. */
-        if (dsim_pd->enabled)
-                goto out;
+        /* in case mipi-dsi has been enabled by bootloader */
+        if (dsim_pd->enabled) {
+                exynos_mipi_regulator_enable(dsim);
+                goto done;
+        }
 
         /* lcd panel power on. */
         if (dsim_ddi->dsim_lcd_drv && dsim_ddi->dsim_lcd_drv->power_on)
@@ -453,12 +458,11 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
 
         dsim->suspended = false;
 
-out:
+done:
         platform_set_drvdata(pdev, dsim);
 
-        dev_dbg(&pdev->dev, "mipi-dsi driver(%s mode) has been probed.\n",
-                (dsim_config->e_interface == DSIM_COMMAND) ?
-                        "CPU" : "RGB");
+        dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__,
+                dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");
 
         return 0;
 
@@ -515,10 +519,10 @@ static int __devexit exynos_mipi_dsi_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int exynos_mipi_dsi_suspend(struct platform_device *pdev,
-                pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int exynos_mipi_dsi_suspend(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
         struct mipi_dsim_lcd_driver *client_drv = dsim->dsim_lcd_drv;
         struct mipi_dsim_lcd_device *client_dev = dsim->dsim_lcd_dev;
@@ -544,8 +548,9 @@ static int exynos_mipi_dsi_suspend(struct platform_device *pdev,
         return 0;
 }
 
-static int exynos_mipi_dsi_resume(struct platform_device *pdev)
+static int exynos_mipi_dsi_resume(struct device *dev)
 {
+        struct platform_device *pdev = to_platform_device(dev);
         struct mipi_dsim_device *dsim = platform_get_drvdata(pdev);
         struct mipi_dsim_lcd_driver *client_drv = dsim->dsim_lcd_drv;
         struct mipi_dsim_lcd_device *client_dev = dsim->dsim_lcd_dev;
@@ -577,19 +582,19 @@ static int exynos_mipi_dsi_resume(struct platform_device *pdev)
 
         return 0;
 }
-#else
-#define exynos_mipi_dsi_suspend NULL
-#define exynos_mipi_dsi_resume NULL
 #endif
 
+static const struct dev_pm_ops exynos_mipi_dsi_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(exynos_mipi_dsi_suspend, exynos_mipi_dsi_resume)
+};
+
 static struct platform_driver exynos_mipi_dsi_driver = {
         .probe = exynos_mipi_dsi_probe,
         .remove = __devexit_p(exynos_mipi_dsi_remove),
-        .suspend = exynos_mipi_dsi_suspend,
-        .resume = exynos_mipi_dsi_resume,
         .driver = {
                    .name = "exynos-mipi-dsim",
                    .owner = THIS_MODULE,
+                   .pm = &exynos_mipi_dsi_pm_ops,
         },
 };
 
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 14909c1d3832..47b533a183be 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -76,33 +76,25 @@ static unsigned int dpll_table[15] = {
 
 irqreturn_t exynos_mipi_dsi_interrupt_handler(int irq, void *dev_id)
 {
-        unsigned int intsrc = 0;
-        unsigned int intmsk = 0;
-        struct mipi_dsim_device *dsim = NULL;
-
-        dsim = dev_id;
-        if (!dsim) {
-                dev_dbg(dsim->dev, KERN_ERR "%s:error: wrong parameter\n",
-                                                        __func__);
-                return IRQ_HANDLED;
+        struct mipi_dsim_device *dsim = dev_id;
+        unsigned int intsrc, intmsk;
+
+        if (dsim == NULL) {
+                dev_err(dsim->dev, "%s: wrong parameter\n", __func__);
+                return IRQ_NONE;
         }
 
         intsrc = exynos_mipi_dsi_read_interrupt(dsim);
         intmsk = exynos_mipi_dsi_read_interrupt_mask(dsim);
+        intmsk = ~intmsk & intsrc;
 
-        intmsk = ~(intmsk) & intsrc;
-
-        switch (intmsk) {
-        case INTMSK_RX_DONE:
+        if (intsrc & INTMSK_RX_DONE) {
                 complete(&dsim_rd_comp);
                 dev_dbg(dsim->dev, "MIPI INTMSK_RX_DONE\n");
-                break;
-        case INTMSK_FIFO_EMPTY:
+        }
+        if (intsrc & INTMSK_FIFO_EMPTY) {
                 complete(&dsim_wr_comp);
                 dev_dbg(dsim->dev, "MIPI INTMSK_FIFO_EMPTY\n");
-                break;
-        default:
-                break;
         }
 
         exynos_mipi_dsi_clear_interrupt(dsim, intmsk);
@@ -738,11 +730,11 @@ int exynos_mipi_dsi_set_display_mode(struct mipi_dsim_device *dsim,
                 if (dsim_config->auto_vertical_cnt == 0) {
                         exynos_mipi_dsi_set_main_disp_vporch(dsim,
                                 dsim_config->cmd_allow,
-                                timing->upper_margin,
-                                timing->lower_margin);
+                                timing->lower_margin,
+                                timing->upper_margin);
                         exynos_mipi_dsi_set_main_disp_hporch(dsim,
-                                timing->left_margin,
-                                timing->right_margin);
+                                timing->right_margin,
+                                timing->left_margin);
                         exynos_mipi_dsi_set_main_disp_sync_area(dsim,
                                 timing->vsync_len,
                                 timing->hsync_len);
diff --git a/drivers/video/exynos/s6e8ax0.c b/drivers/video/exynos/s6e8ax0.c
index 4aa9ac6218bf..05d080b63bc0 100644
--- a/drivers/video/exynos/s6e8ax0.c
+++ b/drivers/video/exynos/s6e8ax0.c
@@ -293,9 +293,20 @@ static void s6e8ax0_panel_cond(struct s6e8ax0 *lcd)
                 0x6e, 0x00, 0x00, 0x00, 0x02, 0x08, 0x08, 0x23, 0x23, 0xc0,
                 0xc8, 0x08, 0x48, 0xc1, 0x00, 0xc1, 0xff, 0xff, 0xc8
         };
+        static const unsigned char data_to_send_panel_reverse[] = {
+                0xf8, 0x19, 0x35, 0x00, 0x00, 0x00, 0x93, 0x00, 0x3c, 0x7d,
+                0x08, 0x27, 0x7d, 0x3f, 0x00, 0x00, 0x00, 0x20, 0x04, 0x08,
+                0x6e, 0x00, 0x00, 0x00, 0x02, 0x08, 0x08, 0x23, 0x23, 0xc0,
+                0xc1, 0x01, 0x41, 0xc1, 0x00, 0xc1, 0xf6, 0xf6, 0xc1
+        };
 
-        ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
-                data_to_send, ARRAY_SIZE(data_to_send));
+        if (lcd->dsim_dev->panel_reverse)
+                ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
+                                data_to_send_panel_reverse,
+                                ARRAY_SIZE(data_to_send_panel_reverse));
+        else
+                ops->cmd_write(lcd_to_master(lcd), MIPI_DSI_DCS_LONG_WRITE,
+                                data_to_send, ARRAY_SIZE(data_to_send));
 }
 
 static void s6e8ax0_display_cond(struct s6e8ax0 *lcd)
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index c27e153d8882..1ddeb11659d4 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -23,7 +23,7 @@
 #include <linux/rmap.h>
 #include <linux/pagemap.h>
 
-struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
+static struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
 {
         void *screen_base = (void __force *) info->screen_base;
         struct page *page;
@@ -107,6 +107,10 @@ static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
         /* protect against the workqueue changing the page list */
         mutex_lock(&fbdefio->lock);
 
+        /* first write in this cycle, notify the driver */
+        if (fbdefio->first_io && list_empty(&fbdefio->pagelist))
+                fbdefio->first_io(info);
+
         /*
          * We want the page to remain locked from ->page_mkwrite until
          * the PTE is marked dirty to avoid page_mkclean() being called
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index c6ce416ab587..0dff12a1daef 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1046,20 +1046,29 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 int
 fb_blank(struct fb_info *info, int blank)
 {       
-        int ret = -EINVAL;
+        struct fb_event event;
+        int ret = -EINVAL, early_ret;
 
         if (blank > FB_BLANK_POWERDOWN)
                 blank = FB_BLANK_POWERDOWN;
 
+        event.info = info;
+        event.data = &blank;
+
+        early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event);
+
         if (info->fbops->fb_blank)
                 ret = info->fbops->fb_blank(blank, info);
 
-        if (!ret) {
-                struct fb_event event;
-
-                event.info = info;
-                event.data = &blank;
+        if (!ret)
                 fb_notifier_call_chain(FB_EVENT_BLANK, &event);
+        else {
+                /*
+                 * if fb_blank is failed then revert effects of
+                 * the early blank event.
+                 */
+                if (!early_ret)
+                        fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event);
         }
 
         return ret;
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 67afa9c2289d..a55e3669d135 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -80,6 +80,8 @@ EXPORT_SYMBOL(framebuffer_alloc);
  */
 void framebuffer_release(struct fb_info *info)
 {
+        if (!info)
+                return;
         kfree(info->apertures);
         kfree(info);
 }
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 6af3f16754f0..458c00664ade 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -834,7 +834,6 @@ static void update_lcdc(struct fb_info *info)
         diu_ops.set_pixel_clock(var->pixclock);
 
         out_be32(&hw->syn_pol, 0);      /* SYNC SIGNALS POLARITY */
-        out_be32(&hw->thresholds, 0x00037800); /* The Thresholds */
         out_be32(&hw->int_status, 0);   /* INTERRUPT STATUS */
         out_be32(&hw->plut, 0x01F5F666);
 
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index f135dbead07d..caad3689b4e6 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -131,7 +131,9 @@ struct imxfb_rgb {
 struct imxfb_info {
         struct platform_device  *pdev;
         void __iomem            *regs;
-        struct clk              *clk;
+        struct clk              *clk_ipg;
+        struct clk              *clk_ahb;
+        struct clk              *clk_per;
 
         /*
          * These are the addresses we mapped
@@ -340,7 +342,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
         pr_debug("var->bits_per_pixel=%d\n", var->bits_per_pixel);
 
-        lcd_clk = clk_get_rate(fbi->clk);
+        lcd_clk = clk_get_rate(fbi->clk_per);
 
         tmp = var->pixclock * (unsigned long long)lcd_clk;
 
@@ -455,11 +457,17 @@ static int imxfb_bl_update_status(struct backlight_device *bl)
 
         fbi->pwmr = (fbi->pwmr & ~0xFF) | brightness;
 
-        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
-                clk_enable(fbi->clk);
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK) {
+                clk_prepare_enable(fbi->clk_ipg);
+                clk_prepare_enable(fbi->clk_ahb);
+                clk_prepare_enable(fbi->clk_per);
+        }
         writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
-                clk_disable(fbi->clk);
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK) {
+                clk_disable_unprepare(fbi->clk_per);
+                clk_disable_unprepare(fbi->clk_ahb);
+                clk_disable_unprepare(fbi->clk_ipg);
+        }
 
         return 0;
 }
@@ -522,7 +530,9 @@ static void imxfb_enable_controller(struct imxfb_info *fbi)
          */
         writel(RMCR_LCDC_EN_MX1, fbi->regs + LCDC_RMCR);
 
-        clk_enable(fbi->clk);
+        clk_prepare_enable(fbi->clk_ipg);
+        clk_prepare_enable(fbi->clk_ahb);
+        clk_prepare_enable(fbi->clk_per);
 
         if (fbi->backlight_power)
                 fbi->backlight_power(1);
@@ -539,7 +549,9 @@ static void imxfb_disable_controller(struct imxfb_info *fbi)
         if (fbi->lcd_power)
                 fbi->lcd_power(0);
 
-        clk_disable(fbi->clk);
+        clk_disable_unprepare(fbi->clk_per);
+        clk_disable_unprepare(fbi->clk_ipg);
+        clk_disable_unprepare(fbi->clk_ahb);
 
         writel(0, fbi->regs + LCDC_RMCR);
 }
@@ -770,10 +782,21 @@ static int __init imxfb_probe(struct platform_device *pdev)
                 goto failed_req;
         }
 
-        fbi->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(fbi->clk)) {
-                ret = PTR_ERR(fbi->clk);
-                dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
+        fbi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+        if (IS_ERR(fbi->clk_ipg)) {
+                ret = PTR_ERR(fbi->clk_ipg);
+                goto failed_getclock;
+        }
+
+        fbi->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
+        if (IS_ERR(fbi->clk_ahb)) {
+                ret = PTR_ERR(fbi->clk_ahb);
+                goto failed_getclock;
+        }
+
+        fbi->clk_per = devm_clk_get(&pdev->dev, "per");
+        if (IS_ERR(fbi->clk_per)) {
+                ret = PTR_ERR(fbi->clk_per);
                 goto failed_getclock;
         }
 
@@ -858,7 +881,6 @@ failed_platform_init:
 failed_map:
         iounmap(fbi->regs);
 failed_ioremap:
-        clk_put(fbi->clk);
 failed_getclock:
         release_mem_region(res->start, resource_size(res));
 failed_req:
@@ -895,8 +917,6 @@ static int __devexit imxfb_remove(struct platform_device *pdev)
 
         iounmap(fbi->regs);
         release_mem_region(res->start, resource_size(res));
-        clk_disable(fbi->clk);
-        clk_put(fbi->clk);
 
         platform_set_drvdata(pdev, NULL);
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 02fd2263610c..bdcbfbae2777 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -680,6 +680,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
                  + dinfo->fb.size);
         if (!dinfo->aperture.virtual) {
                 ERR_MSG("Cannot remap FB region.\n");
+                agp_backend_release(bridge);
                 cleanup(dinfo);
                 return -ENODEV;
         }
@@ -689,6 +690,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
                                               INTEL_REG_SIZE);
         if (!dinfo->mmio_base) {
                 ERR_MSG("Cannot remap MMIO region.\n");
+                agp_backend_release(bridge);
                 cleanup(dinfo);
                 return -ENODEV;
         }
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 31b8f67477b7..217678e0b983 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1243,6 +1243,7 @@ static int maven_probe(struct i2c_client *client,
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_WORD_DATA |
                                               I2C_FUNC_SMBUS_BYTE_DATA |
+                                              I2C_FUNC_NOSTART |
                                               I2C_FUNC_PROTOCOL_MANGLING))
                 goto ERROR0;
         if (!(data = kzalloc(sizeof(*data), GFP_KERNEL))) {
diff --git a/drivers/video/mb862xx/mb862xx-i2c.c b/drivers/video/mb862xx/mb862xx-i2c.c
index 273769bb8deb..c87e17afb3e2 100644
--- a/drivers/video/mb862xx/mb862xx-i2c.c
+++ b/drivers/video/mb862xx/mb862xx-i2c.c
@@ -68,7 +68,7 @@ static int mb862xx_i2c_read_byte(struct i2c_adapter *adap, u8 *byte, int last)
         return 1;
 }
 
-void mb862xx_i2c_stop(struct i2c_adapter *adap)
+static void mb862xx_i2c_stop(struct i2c_adapter *adap)
 {
         struct mb862xxfb_par *par = adap->algo_data;
 
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index 11a7a333701d..00ce1f34b496 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -579,7 +579,7 @@ static ssize_t mb862xxfb_show_dispregs(struct device *dev,
 
 static DEVICE_ATTR(dispregs, 0444, mb862xxfb_show_dispregs, NULL);
 
-irqreturn_t mb862xx_intr(int irq, void *dev_id)
+static irqreturn_t mb862xx_intr(int irq, void *dev_id)
 {
         struct mb862xxfb_par *par = (struct mb862xxfb_par *) dev_id;
         unsigned long reg_ist, mask;
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 55bf6196b7a0..ab0a8e527333 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -950,7 +950,7 @@ static int __devinit mbxfb_probe(struct platform_device *dev)
 
         mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
                                              res_size(mfbi->fb_req));
-        if (!mfbi->reg_virt_addr) {
+        if (!mfbi->fb_virt_addr) {
                 dev_err(&dev->dev, "failed to ioremap frame buffer\n");
                 ret = -EINVAL;
                 goto err4;
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 4a89f889852d..abbe691047bd 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -45,6 +45,7 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
+#include <linux/pinctrl/consumer.h>
 #include <mach/mxsfb.h>
 
 #define REG_SET 4
@@ -756,6 +757,7 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
         struct mxsfb_info *host;
         struct fb_info *fb_info;
         struct fb_modelist *modelist;
+        struct pinctrl *pinctrl;
         int i, ret;
 
         if (!pdata) {
@@ -793,6 +795,12 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
 
         host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto error_getpin;
+        }
+
         host->clk = clk_get(&host->pdev->dev, NULL);
         if (IS_ERR(host->clk)) {
                 ret = PTR_ERR(host->clk);
@@ -848,6 +856,7 @@ error_init_fb:
 error_pseudo_pallette:
         clk_put(host->clk);
 error_getclock:
+error_getpin:
         iounmap(host->base);
 error_ioremap:
         framebuffer_release(fb_info);
@@ -880,6 +889,18 @@ static int __devexit mxsfb_remove(struct platform_device *pdev)
         return 0;
 }
 
+static void mxsfb_shutdown(struct platform_device *pdev)
+{
+        struct fb_info *fb_info = platform_get_drvdata(pdev);
+        struct mxsfb_info *host = to_imxfb_host(fb_info);
+
+        /*
+         * Force stop the LCD controller as keeping it running during reboot
+         * might interfere with the BootROM's boot mode pads sampling.
+         */
+        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_CLR);
+}
+
 static struct platform_device_id mxsfb_devtype[] = {
         {
                 .name = "imx23-fb",
@@ -896,6 +917,7 @@ MODULE_DEVICE_TABLE(platform, mxsfb_devtype);
 static struct platform_driver mxsfb_driver = {
         .probe = mxsfb_probe,
         .remove = __devexit_p(mxsfb_remove),
+        .shutdown = mxsfb_shutdown,
         .id_table = mxsfb_devtype,
         .driver = {
                    .name = DRIVER_NAME,
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index c98f2c16f744..ad741c3d1ae1 100644
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -532,6 +532,7 @@ static int acx_panel_probe(struct omap_dss_device *dssdev)
 
         /*------- Backlight control --------*/
 
+        memset(&props, 0, sizeof(props));
         props.fb_blank = FB_BLANK_UNBLANK;
         props.power = FB_BLANK_UNBLANK;
         props.type = BACKLIGHT_RAW;
diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
index 1d71c08a818f..0b4ae0cebeda 100644
--- a/drivers/video/pxa3xx-gcu.c
+++ b/drivers/video/pxa3xx-gcu.c
@@ -316,12 +316,9 @@ pxa3xx_gcu_wait_idle(struct pxa3xx_gcu_priv *priv)
                 ret = wait_event_interruptible_timeout(priv->wait_idle,
                                         !priv->shared->hw_running, HZ*4);
 
-                if (ret < 0)
+                if (ret != 0)
                         break;
 
-                if (ret > 0)
-                        continue;
-
                 if (gc_readl(priv, REG_GCRBEXHR) == rbexhr &&
                     priv->shared->num_interrupts == num) {
                         QERROR("TIMEOUT");
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index f3105160bf98..5f9d8e69029e 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -47,7 +47,7 @@
 #ifdef CONFIG_FB_S3C_DEBUG_REGWRITE
 #undef writel
 #define writel(v, r) do { \
-        printk(KERN_DEBUG "%s: %08x => %p\n", __func__, (unsigned int)v, r); \
+        pr_debug("%s: %08x => %p\n", __func__, (unsigned int)v, r); \
         __raw_writel(v, r); \
 } while (0)
 #endif /* FB_S3C_DEBUG_REGWRITE */
@@ -495,7 +495,6 @@ static int s3c_fb_set_par(struct fb_info *info)
         u32 alpha = 0;
         u32 data;
         u32 pagewidth;
-        int clkdiv;
 
         dev_dbg(sfb->dev, "setting framebuffer parameters\n");
 
@@ -532,48 +531,9 @@ static int s3c_fb_set_par(struct fb_info *info)
         /* disable the window whilst we update it */
         writel(0, regs + WINCON(win_no));
 
-        /* use platform specified window as the basis for the lcd timings */
-
-        if (win_no == sfb->pdata->default_win) {
-                clkdiv = s3c_fb_calc_pixclk(sfb, var->pixclock);
-
-                data = sfb->pdata->vidcon0;
-                data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
-
-                if (clkdiv > 1)
-                        data |= VIDCON0_CLKVAL_F(clkdiv-1) | VIDCON0_CLKDIR;
-                else
-                        data &= ~VIDCON0_CLKDIR;        /* 1:1 clock */
-
-                /* write the timing data to the panel */
-
-                if (sfb->variant.is_2443)
-                        data |= (1 << 5);
-
-                writel(data, regs + VIDCON0);
-
+        if (!sfb->output_on)
                 s3c_fb_enable(sfb, 1);
 
-                data = VIDTCON0_VBPD(var->upper_margin - 1) |
-                       VIDTCON0_VFPD(var->lower_margin - 1) |
-                       VIDTCON0_VSPW(var->vsync_len - 1);
-
-                writel(data, regs + sfb->variant.vidtcon);
-
-                data = VIDTCON1_HBPD(var->left_margin - 1) |
-                       VIDTCON1_HFPD(var->right_margin - 1) |
-                       VIDTCON1_HSPW(var->hsync_len - 1);
-
-                /* VIDTCON1 */
-                writel(data, regs + sfb->variant.vidtcon + 4);
-
-                data = VIDTCON2_LINEVAL(var->yres - 1) |
-                       VIDTCON2_HOZVAL(var->xres - 1) |
-                       VIDTCON2_LINEVAL_E(var->yres - 1) |
-                       VIDTCON2_HOZVAL_E(var->xres - 1);
-                writel(data, regs + sfb->variant.vidtcon + 8);
-        }
-
         /* write the buffer address */
 
         /* start and end registers stride is 8 */
@@ -839,6 +799,7 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
         struct s3c_fb *sfb = win->parent;
         unsigned int index = win->index;
         u32 wincon;
+        u32 output_on = sfb->output_on;
 
         dev_dbg(sfb->dev, "blank mode %d\n", blank_mode);
 
@@ -877,34 +838,18 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
 
         shadow_protect_win(win, 1);
         writel(wincon, sfb->regs + sfb->variant.wincon + (index * 4));
-        shadow_protect_win(win, 0);
 
         /* Check the enabled state to see if we need to be running the
          * main LCD interface, as if there are no active windows then
          * it is highly likely that we also do not need to output
          * anything.
          */
-
-        /* We could do something like the following code, but the current
-         * system of using framebuffer events means that we cannot make
-         * the distinction between just window 0 being inactive and all
-         * the windows being down.
-         *
-         * s3c_fb_enable(sfb, sfb->enabled ? 1 : 0);
-        */
-
-        /* we're stuck with this until we can do something about overriding
-         * the power control using the blanking event for a single fb.
-         */
-        if (index == sfb->pdata->default_win) {
-                shadow_protect_win(win, 1);
-                s3c_fb_enable(sfb, blank_mode != FB_BLANK_POWERDOWN ? 1 : 0);
-                shadow_protect_win(win, 0);
-        }
+        s3c_fb_enable(sfb, sfb->enabled ? 1 : 0);
+        shadow_protect_win(win, 0);
 
         pm_runtime_put_sync(sfb->dev);
 
-        return 0;
+        return output_on == sfb->output_on;
 }
 
 /**
@@ -1111,7 +1056,7 @@ static struct fb_ops s3c_fb_ops = {
  *
  * Calculate the pixel clock when none has been given through platform data.
  */
-static void __devinit s3c_fb_missing_pixclock(struct fb_videomode *mode)
+static void s3c_fb_missing_pixclock(struct fb_videomode *mode)
 {
         u64 pixclk = 1000000000000ULL;
         u32 div;
@@ -1144,11 +1089,11 @@ static int __devinit s3c_fb_alloc_memory(struct s3c_fb *sfb,
 
         dev_dbg(sfb->dev, "allocating memory for display\n");
 
-        real_size = windata->win_mode.xres * windata->win_mode.yres;
+        real_size = windata->xres * windata->yres;
         virt_size = windata->virtual_x * windata->virtual_y;
 
         dev_dbg(sfb->dev, "real_size=%u (%u.%u), virt_size=%u (%u.%u)\n",
-                real_size, windata->win_mode.xres, windata->win_mode.yres,
+                real_size, windata->xres, windata->yres,
                 virt_size, windata->virtual_x, windata->virtual_y);
 
         size = (real_size > virt_size) ? real_size : virt_size;
@@ -1230,7 +1175,7 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
                                       struct s3c_fb_win **res)
 {
         struct fb_var_screeninfo *var;
-        struct fb_videomode *initmode;
+        struct fb_videomode initmode;
         struct s3c_fb_pd_win *windata;
         struct s3c_fb_win *win;
         struct fb_info *fbinfo;
@@ -1251,11 +1196,11 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
         }
 
         windata = sfb->pdata->win[win_no];
-        initmode = &windata->win_mode;
+        initmode = *sfb->pdata->vtiming;
 
         WARN_ON(windata->max_bpp == 0);
-        WARN_ON(windata->win_mode.xres == 0);
-        WARN_ON(windata->win_mode.yres == 0);
+        WARN_ON(windata->xres == 0);
+        WARN_ON(windata->yres == 0);
 
         win = fbinfo->par;
         *res = win;
@@ -1294,7 +1239,9 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
         }
 
         /* setup the initial video mode from the window */
-        fb_videomode_to_var(&fbinfo->var, initmode);
+        initmode.xres = windata->xres;
+        initmode.yres = windata->yres;
+        fb_videomode_to_var(&fbinfo->var, &initmode);
 
         fbinfo->fix.type        = FB_TYPE_PACKED_PIXELS;
         fbinfo->fix.accel       = FB_ACCEL_NONE;
@@ -1339,6 +1286,53 @@ static int __devinit s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
 }
 
 /**
+ * s3c_fb_set_rgb_timing() - set video timing for rgb interface.
+ * @sfb: The base resources for the hardware.
+ *
+ * Set horizontal and vertical lcd rgb interface timing.
+ */
+static void s3c_fb_set_rgb_timing(struct s3c_fb *sfb)
+{
+        struct fb_videomode *vmode = sfb->pdata->vtiming;
+        void __iomem *regs = sfb->regs;
+        int clkdiv;
+        u32 data;
+
+        if (!vmode->pixclock)
+                s3c_fb_missing_pixclock(vmode);
+
+        clkdiv = s3c_fb_calc_pixclk(sfb, vmode->pixclock);
+
+        data = sfb->pdata->vidcon0;
+        data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
+
+        if (clkdiv > 1)
+                data |= VIDCON0_CLKVAL_F(clkdiv-1) | VIDCON0_CLKDIR;
+        else
+                data &= ~VIDCON0_CLKDIR;        /* 1:1 clock */
+
+        if (sfb->variant.is_2443)
+                data |= (1 << 5);
+        writel(data, regs + VIDCON0);
+
+        data = VIDTCON0_VBPD(vmode->upper_margin - 1) |
+               VIDTCON0_VFPD(vmode->lower_margin - 1) |
+               VIDTCON0_VSPW(vmode->vsync_len - 1);
+        writel(data, regs + sfb->variant.vidtcon);
+
+        data = VIDTCON1_HBPD(vmode->left_margin - 1) |
+               VIDTCON1_HFPD(vmode->right_margin - 1) |
+               VIDTCON1_HSPW(vmode->hsync_len - 1);
+        writel(data, regs + sfb->variant.vidtcon + 4);
+
+        data = VIDTCON2_LINEVAL(vmode->yres - 1) |
+               VIDTCON2_HOZVAL(vmode->xres - 1) |
+               VIDTCON2_LINEVAL_E(vmode->yres - 1) |
+               VIDTCON2_HOZVAL_E(vmode->xres - 1);
+        writel(data, regs + sfb->variant.vidtcon + 8);
+}
+
+/**
  * s3c_fb_clear_win() - clear hardware window registers.
  * @sfb: The base resources for the hardware.
  * @win: The window to process.
@@ -1481,15 +1475,14 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
                 writel(0xffffff, regs + WKEYCON1);
         }
 
+        s3c_fb_set_rgb_timing(sfb);
+
         /* we have the register setup, start allocating framebuffers */
 
         for (win = 0; win < fbdrv->variant.nr_windows; win++) {
                 if (!pd->win[win])
                         continue;
 
-                if (!pd->win[win]->win_mode.pixclock)
-                        s3c_fb_missing_pixclock(&pd->win[win]->win_mode);
-
                 ret = s3c_fb_probe_win(sfb, win, fbdrv->win[win],
                                        &sfb->windows[win]);
                 if (ret < 0) {
@@ -1564,6 +1557,8 @@ static int s3c_fb_suspend(struct device *dev)
         struct s3c_fb_win *win;
         int win_no;
 
+        pm_runtime_get_sync(sfb->dev);
+
         for (win_no = S3C_FB_MAX_WIN - 1; win_no >= 0; win_no--) {
                 win = sfb->windows[win_no];
                 if (!win)
@@ -1577,6 +1572,9 @@ static int s3c_fb_suspend(struct device *dev)
                 clk_disable(sfb->lcd_clk);
 
         clk_disable(sfb->bus_clk);
+
+        pm_runtime_put_sync(sfb->dev);
+
         return 0;
 }
 
@@ -1589,6 +1587,8 @@ static int s3c_fb_resume(struct device *dev)
         int win_no;
         u32 reg;
 
+        pm_runtime_get_sync(sfb->dev);
+
         clk_enable(sfb->bus_clk);
 
         if (!sfb->variant.has_clksel)
@@ -1623,6 +1623,8 @@ static int s3c_fb_resume(struct device *dev)
                 shadow_protect_win(win, 0);
         }
 
+        s3c_fb_set_rgb_timing(sfb);
+
         /* restore framebuffers */
         for (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {
                 win = sfb->windows[win_no];
@@ -1633,6 +1635,8 @@ static int s3c_fb_resume(struct device *dev)
                 s3c_fb_set_par(win->fbinfo);
         }
 
+        pm_runtime_put_sync(sfb->dev);
+
         return 0;
 }
 #endif
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index eafb19da2c07..930e550e752a 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -31,6 +31,7 @@
 
 #include "sh_mobile_lcdcfb.h"
 
+/* HDMI Core Control Register (HTOP0) */
 #define HDMI_SYSTEM_CTRL                        0x00 /* System control */
 #define HDMI_L_R_DATA_SWAP_CTRL_RPKT            0x01 /* L/R data swap control,
                                                         bits 19..16 of 20-bit N for Audio Clock Regeneration packet */
@@ -201,6 +202,68 @@
 #define HDMI_REVISION_ID                        0xF1 /* Revision ID */
 #define HDMI_TEST_MODE                          0xFE /* Test mode */
 
+/* HDMI Control Register (HTOP1) */
+#define HDMI_HTOP1_TEST_MODE                    0x0000 /* Test mode */
+#define HDMI_HTOP1_VIDEO_INPUT                  0x0008 /* VideoInput */
+#define HDMI_HTOP1_CORE_RSTN                    0x000C /* CoreResetn */
+#define HDMI_HTOP1_PLLBW                        0x0018 /* PLLBW */
+#define HDMI_HTOP1_CLK_TO_PHY                   0x001C /* Clk to Phy */
+#define HDMI_HTOP1_VIDEO_INPUT2                 0x0020 /* VideoInput2 */
+#define HDMI_HTOP1_TISEMP0_1                    0x0024 /* tisemp0-1 */
+#define HDMI_HTOP1_TISEMP2_C                    0x0028 /* tisemp2-c */
+#define HDMI_HTOP1_TISIDRV                      0x002C /* tisidrv */
+#define HDMI_HTOP1_TISEN                        0x0034 /* tisen */
+#define HDMI_HTOP1_TISDREN                      0x0038 /* tisdren  */
+#define HDMI_HTOP1_CISRANGE                     0x003C /* cisrange  */
+#define HDMI_HTOP1_ENABLE_SELECTOR              0x0040 /* Enable Selector */
+#define HDMI_HTOP1_MACRO_RESET                  0x0044 /* Macro reset */
+#define HDMI_HTOP1_PLL_CALIBRATION              0x0048 /* PLL calibration */
+#define HDMI_HTOP1_RE_CALIBRATION               0x004C /* Re-calibration */
+#define HDMI_HTOP1_CURRENT                      0x0050 /* Current */
+#define HDMI_HTOP1_PLL_LOCK_DETECT              0x0054 /* PLL lock detect */
+#define HDMI_HTOP1_PHY_TEST_MODE                0x0058 /* PHY Test Mode */
+#define HDMI_HTOP1_CLK_SET                      0x0080 /* Clock Set */
+#define HDMI_HTOP1_DDC_FAIL_SAFE                0x0084 /* DDC fail safe */
+#define HDMI_HTOP1_PRBS                         0x0088 /* PRBS */
+#define HDMI_HTOP1_EDID_AINC_CONTROL            0x008C /* EDID ainc Control */
+#define HDMI_HTOP1_HTOP_DCL_MODE                0x00FC /* Deep Coloer Mode */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0           0x0100 /* Deep Color:FRC COEF0 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1           0x0104 /* Deep Color:FRC COEF1 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2           0x0108 /* Deep Color:FRC COEF2 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3           0x010C /* Deep Color:FRC COEF3 */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF0_C         0x0110 /* Deep Color:FRC COEF0C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF1_C         0x0114 /* Deep Color:FRC COEF1C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF2_C         0x0118 /* Deep Color:FRC COEF2C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_COEF3_C         0x011C /* Deep Color:FRC COEF3C */
+#define HDMI_HTOP1_HTOP_DCL_FRC_MODE            0x0120 /* Deep Color:FRC Mode */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START1         0x0124 /* Deep Color:Rect Start1 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE1          0x0128 /* Deep Color:Rect Size1 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START2         0x012C /* Deep Color:Rect Start2 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE2          0x0130 /* Deep Color:Rect Size2 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START3         0x0134 /* Deep Color:Rect Start3 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE3          0x0138 /* Deep Color:Rect Size3 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_START4         0x013C /* Deep Color:Rect Start4 */
+#define HDMI_HTOP1_HTOP_DCL_RECT_SIZE4          0x0140 /* Deep Color:Rect Size4 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1       0x0144 /* Deep Color:Fil Para Y1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2       0x0148 /* Deep Color:Fil Para Y1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1      0x014C /* Deep Color:Fil Para CB1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2      0x0150 /* Deep Color:Fil Para CB1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1      0x0154 /* Deep Color:Fil Para CR1_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2      0x0158 /* Deep Color:Fil Para CR1_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1       0x015C /* Deep Color:Fil Para Y2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2       0x0160 /* Deep Color:Fil Para Y2_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1      0x0164 /* Deep Color:Fil Para CB2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2      0x0168 /* Deep Color:Fil Para CB2_2 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1      0x016C /* Deep Color:Fil Para CR2_1 */
+#define HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2      0x0170 /* Deep Color:Fil Para CR2_2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1         0x0174 /* Deep Color:Cor Para Y1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1        0x0178 /* Deep Color:Cor Para CB1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1        0x017C /* Deep Color:Cor Para CR1 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2         0x0180 /* Deep Color:Cor Para Y2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2        0x0184 /* Deep Color:Cor Para CB2 */
+#define HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2        0x0188 /* Deep Color:Cor Para CR2 */
+#define HDMI_HTOP1_EDID_DATA_READ               0x0200 /* EDID Data Read 128Byte:0x03FC */
+
 enum hotplug_state {
         HDMI_HOTPLUG_DISCONNECTED,
         HDMI_HOTPLUG_CONNECTED,
@@ -211,6 +274,7 @@ struct sh_hdmi {
         struct sh_mobile_lcdc_entity entity;
 
         void __iomem *base;
+        void __iomem *htop1;
         enum hotplug_state hp_state;    /* hot-plug status */
         u8 preprogrammed_vic;           /* use a pre-programmed VIC or
                                            the external mode */
@@ -222,20 +286,66 @@ struct sh_hdmi {
         struct delayed_work edid_work;
         struct fb_videomode mode;
         struct fb_monspecs monspec;
+
+        /* register access functions */
+        void (*write)(struct sh_hdmi *hdmi, u8 data, u8 reg);
+        u8 (*read)(struct sh_hdmi *hdmi, u8 reg);
 };
 
 #define entity_to_sh_hdmi(e)    container_of(e, struct sh_hdmi, entity)
 
-static void hdmi_write(struct sh_hdmi *hdmi, u8 data, u8 reg)
+static void __hdmi_write8(struct sh_hdmi *hdmi, u8 data, u8 reg)
 {
         iowrite8(data, hdmi->base + reg);
 }
 
-static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
+static u8 __hdmi_read8(struct sh_hdmi *hdmi, u8 reg)
 {
         return ioread8(hdmi->base + reg);
 }
 
+static void __hdmi_write32(struct sh_hdmi *hdmi, u8 data, u8 reg)
+{
+        iowrite32((u32)data, hdmi->base + (reg * 4));
+        udelay(100);
+}
+
+static u8 __hdmi_read32(struct sh_hdmi *hdmi, u8 reg)
+{
+        return (u8)ioread32(hdmi->base + (reg * 4));
+}
+
+static void hdmi_write(struct sh_hdmi *hdmi, u8 data, u8 reg)
+{
+        hdmi->write(hdmi, data, reg);
+}
+
+static u8 hdmi_read(struct sh_hdmi *hdmi, u8 reg)
+{
+        return hdmi->read(hdmi, reg);
+}
+
+static void hdmi_bit_set(struct sh_hdmi *hdmi, u8 mask, u8 data, u8 reg)
+{
+        u8 val = hdmi_read(hdmi, reg);
+
+        val &= ~mask;
+        val |= (data & mask);
+
+        hdmi_write(hdmi, val, reg);
+}
+
+static void hdmi_htop1_write(struct sh_hdmi *hdmi, u32 data, u32 reg)
+{
+        iowrite32(data, hdmi->htop1 + reg);
+        udelay(100);
+}
+
+static u32 hdmi_htop1_read(struct sh_hdmi *hdmi, u32 reg)
+{
+        return ioread32(hdmi->htop1 + reg);
+}
+
 /*
  *      HDMI sound
  */
@@ -693,11 +803,11 @@ static void sh_hdmi_configure(struct sh_hdmi *hdmi)
         msleep(10);
 
         /* PS mode b->d, reset PLLA and PLLB */
-        hdmi_write(hdmi, 0x4C, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x4C, HDMI_SYSTEM_CTRL);
 
         udelay(10);
 
-        hdmi_write(hdmi, 0x40, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x40, HDMI_SYSTEM_CTRL);
 }
 
 static unsigned long sh_hdmi_rate_error(struct sh_hdmi *hdmi,
@@ -746,7 +856,9 @@ static int sh_hdmi_read_edid(struct sh_hdmi *hdmi, unsigned long *hdmi_rate,
         /* Read EDID */
         dev_dbg(hdmi->dev, "Read back EDID code:");
         for (i = 0; i < 128; i++) {
-                edid[i] = hdmi_read(hdmi, HDMI_EDID_KSV_FIFO_ACCESS_WINDOW);
+                edid[i] = (hdmi->htop1) ?
+                        (u8)hdmi_htop1_read(hdmi, HDMI_HTOP1_EDID_DATA_READ + (i * 4)) :
+                        hdmi_read(hdmi, HDMI_EDID_KSV_FIFO_ACCESS_WINDOW);
 #ifdef DEBUG
                 if ((i % 16) == 0) {
                         printk(KERN_CONT "\n");
@@ -917,13 +1029,13 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
         u8 status1, status2, mask1, mask2;
 
         /* mode_b and PLLA and PLLB reset */
-        hdmi_write(hdmi, 0x2C, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x2C, HDMI_SYSTEM_CTRL);
 
         /* How long shall reset be held? */
         udelay(10);
 
         /* mode_b and PLLA and PLLB reset release */
-        hdmi_write(hdmi, 0x20, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x20, HDMI_SYSTEM_CTRL);
 
         status1 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_1);
         status2 = hdmi_read(hdmi, HDMI_INTERRUPT_STATUS_2);
@@ -1001,7 +1113,7 @@ static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
          */
         if (hdmi->hp_state == HDMI_HOTPLUG_EDID_DONE) {
                 /* PS mode d->e. All functions are active */
-                hdmi_write(hdmi, 0x80, HDMI_SYSTEM_CTRL);
+                hdmi_bit_set(hdmi, 0xFC, 0x80, HDMI_SYSTEM_CTRL);
                 dev_dbg(hdmi->dev, "HDMI running\n");
         }
 
@@ -1016,7 +1128,7 @@ static void sh_hdmi_display_off(struct sh_mobile_lcdc_entity *entity)
 
         dev_dbg(hdmi->dev, "%s(%p)\n", __func__, hdmi);
         /* PS mode e->a */
-        hdmi_write(hdmi, 0x10, HDMI_SYSTEM_CTRL);
+        hdmi_bit_set(hdmi, 0xFC, 0x10, HDMI_SYSTEM_CTRL);
 }
 
 static const struct sh_mobile_lcdc_entity_ops sh_hdmi_ops = {
@@ -1110,10 +1222,58 @@ out:
         dev_dbg(hdmi->dev, "%s(%p): end\n", __func__, hdmi);
 }
 
+static void sh_hdmi_htop1_init(struct sh_hdmi *hdmi)
+{
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_MODE);
+        hdmi_htop1_write(hdmi, 0x0000000b, 0x0010);
+        hdmi_htop1_write(hdmi, 0x00006710, HDMI_HTOP1_HTOP_DCL_FRC_MODE);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR1_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_Y2_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CB2_2);
+        hdmi_htop1_write(hdmi, 0x01020406, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_1);
+        hdmi_htop1_write(hdmi, 0x07080806, HDMI_HTOP1_HTOP_DCL_FIL_PARA_CR2_2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_Y2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CB2);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_HTOP_DCL_COR_PARA_CR2);
+        hdmi_htop1_write(hdmi, 0x00000008, HDMI_HTOP1_CURRENT);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP0_1);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_TISEMP2_C);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PHY_TEST_MODE);
+        hdmi_htop1_write(hdmi, 0x00000081, HDMI_HTOP1_TISIDRV);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_PLLBW);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+        hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+        hdmi_htop1_write(hdmi, 0x00000016, HDMI_HTOP1_CISRANGE);
+        msleep(100);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_ENABLE_SELECTOR);
+        msleep(100);
+        hdmi_htop1_write(hdmi, 0x00000003, HDMI_HTOP1_ENABLE_SELECTOR);
+        hdmi_htop1_write(hdmi, 0x00000001, HDMI_HTOP1_MACRO_RESET);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISEN);
+        hdmi_htop1_write(hdmi, 0x0000000f, HDMI_HTOP1_TISDREN);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_CLK_TO_PHY);
+        hdmi_htop1_write(hdmi, 0x00000000, HDMI_HTOP1_VIDEO_INPUT2);
+        hdmi_htop1_write(hdmi, 0x0000000a, HDMI_HTOP1_CLK_SET);
+}
+
 static int __init sh_hdmi_probe(struct platform_device *pdev)
 {
         struct sh_mobile_hdmi_info *pdata = pdev->dev.platform_data;
         struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        struct resource *htop1_res;
         int irq = platform_get_irq(pdev, 0), ret;
         struct sh_hdmi *hdmi;
         long rate;
@@ -1121,6 +1281,15 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
         if (!res || !pdata || irq < 0)
                 return -ENODEV;
 
+        htop1_res = NULL;
+        if (pdata->flags & HDMI_HAS_HTOP1) {
+                htop1_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                if (!htop1_res) {
+                        dev_err(&pdev->dev, "htop1 needs register base\n");
+                        return -EINVAL;
+                }
+        }
+
         hdmi = kzalloc(sizeof(*hdmi), GFP_KERNEL);
         if (!hdmi) {
                 dev_err(&pdev->dev, "Cannot allocate device data\n");
@@ -1138,6 +1307,15 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
                 goto egetclk;
         }
 
+        /* select register access functions */
+        if (pdata->flags & HDMI_32BIT_REG) {
+                hdmi->write     = __hdmi_write32;
+                hdmi->read      = __hdmi_read32;
+        } else {
+                hdmi->write     = __hdmi_write8;
+                hdmi->read      = __hdmi_read8;
+        }
+
         /* An arbitrary relaxed pixclock just to get things started: from standard 480p */
         rate = clk_round_rate(hdmi->hdmi_clk, PICOS2KHZ(37037));
         if (rate > 0)
@@ -1176,6 +1354,24 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
         pm_runtime_get_sync(&pdev->dev);
 
+        /* init interrupt polarity */
+        if (pdata->flags & HDMI_OUTPUT_PUSH_PULL)
+                hdmi_bit_set(hdmi, 0x02, 0x02, HDMI_SYSTEM_CTRL);
+
+        if (pdata->flags & HDMI_OUTPUT_POLARITY_HI)
+                hdmi_bit_set(hdmi, 0x01, 0x01, HDMI_SYSTEM_CTRL);
+
+        /* enable htop1 register if needed */
+        if (htop1_res) {
+                hdmi->htop1 = ioremap(htop1_res->start, resource_size(htop1_res));
+                if (!hdmi->htop1) {
+                        dev_err(&pdev->dev, "control register region already claimed\n");
+                        ret = -ENOMEM;
+                        goto emap_htop1;
+                }
+                sh_hdmi_htop1_init(hdmi);
+        }
+
         /* Product and revision IDs are 0 in sh-mobile version */
         dev_info(&pdev->dev, "Detected HDMI controller 0x%x:0x%x\n",
                  hdmi_read(hdmi, HDMI_PRODUCT_ID), hdmi_read(hdmi, HDMI_REVISION_ID));
@@ -1199,6 +1395,9 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
 ecodec:
         free_irq(irq, hdmi);
 ereqirq:
+        if (hdmi->htop1)
+                iounmap(hdmi->htop1);
+emap_htop1:
         pm_runtime_put(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
         iounmap(hdmi->base);
@@ -1230,6 +1429,8 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
         pm_runtime_disable(&pdev->dev);
         clk_disable(hdmi->hdmi_clk);
         clk_put(hdmi->hdmi_clk);
+        if (hdmi->htop1)
+                iounmap(hdmi->htop1);
         iounmap(hdmi->base);
         release_mem_region(res->start, resource_size(res));
         kfree(hdmi);
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 7a0b301587f6..e672698bd820 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -758,7 +758,7 @@ static void __sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
                 }
 
                 lcdc_write_chan(ch, LDDFR, tmp);
-                lcdc_write_chan(ch, LDMLSR, ch->pitch);
+                lcdc_write_chan(ch, LDMLSR, ch->line_size);
                 lcdc_write_chan(ch, LDSA1R, ch->base_addr_y);
                 if (ch->format->yuv)
                         lcdc_write_chan(ch, LDSA2R, ch->base_addr_c);
@@ -847,6 +847,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 
                 ch->base_addr_y = ch->dma_handle;
                 ch->base_addr_c = ch->base_addr_y + ch->xres * ch->yres_virtual;
+                ch->line_size = ch->pitch;
 
                 /* Enable MERAM if possible. */
                 if (mdev == NULL || mdev->ops == NULL ||
@@ -882,7 +883,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv)
 
                 meram = mdev->ops->meram_register(mdev, ch->cfg->meram_cfg,
                                         ch->pitch, ch->yres, pixelformat,
-                                        &ch->pitch);
+                                        &ch->line_size);
                 if (!IS_ERR(meram)) {
                         mdev->ops->meram_update(mdev, meram,
                                         ch->base_addr_y, ch->base_addr_c,
diff --git a/drivers/video/sh_mobile_lcdcfb.h b/drivers/video/sh_mobile_lcdcfb.h
index da1c26e78a57..5c3bddd2cb72 100644
--- a/drivers/video/sh_mobile_lcdcfb.h
+++ b/drivers/video/sh_mobile_lcdcfb.h
@@ -84,6 +84,7 @@ struct sh_mobile_lcdc_chan {
 
         unsigned long base_addr_y;
         unsigned long base_addr_c;
+        unsigned int line_size;
 
         int (*notify)(struct sh_mobile_lcdc_chan *ch,
                       enum sh_mobile_lcdc_entity_event event,
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index aff73842d877..85d6738b6c64 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -105,51 +105,6 @@ static const unsigned short ModeIndex_1920x1440[]    = {0x68, 0x69, 0x00, 0x6b};
 static const unsigned short ModeIndex_300_2048x1536[]= {0x6c, 0x6d, 0x00, 0x00};
 static const unsigned short ModeIndex_310_2048x1536[]= {0x6c, 0x6d, 0x00, 0x6e};
 
-static const unsigned short SiS_DRAMType[17][5]={
-        {0x0C,0x0A,0x02,0x40,0x39},
-        {0x0D,0x0A,0x01,0x40,0x48},
-        {0x0C,0x09,0x02,0x20,0x35},
-        {0x0D,0x09,0x01,0x20,0x44},
-        {0x0C,0x08,0x02,0x10,0x31},
-        {0x0D,0x08,0x01,0x10,0x40},
-        {0x0C,0x0A,0x01,0x20,0x34},
-        {0x0C,0x09,0x01,0x08,0x32},
-        {0x0B,0x08,0x02,0x08,0x21},
-        {0x0C,0x08,0x01,0x08,0x30},
-        {0x0A,0x08,0x02,0x04,0x11},
-        {0x0B,0x0A,0x01,0x10,0x28},
-        {0x09,0x08,0x02,0x02,0x01},
-        {0x0B,0x09,0x01,0x08,0x24},
-        {0x0B,0x08,0x01,0x04,0x20},
-        {0x0A,0x08,0x01,0x02,0x10},
-        {0x09,0x08,0x01,0x01,0x00}
-};
-
-static const unsigned short SiS_SDRDRAM_TYPE[13][5] =
-{
-        { 2,12, 9,64,0x35},
-        { 1,13, 9,64,0x44},
-        { 2,12, 8,32,0x31},
-        { 2,11, 9,32,0x25},
-        { 1,12, 9,32,0x34},
-        { 1,13, 8,32,0x40},
-        { 2,11, 8,16,0x21},
-        { 1,12, 8,16,0x30},
-        { 1,11, 9,16,0x24},
-        { 1,11, 8, 8,0x20},
-        { 2, 9, 8, 4,0x01},
-        { 1,10, 8, 4,0x10},
-        { 1, 9, 8, 2,0x00}
-};
-
-static const unsigned short SiS_DDRDRAM_TYPE[4][5] =
-{
-        { 2,12, 9,64,0x35},
-        { 2,12, 8,32,0x31},
-        { 2,11, 8,16,0x21},
-        { 2, 9, 8, 4,0x01}
-};
-
 static const unsigned char SiS_MDA_DAC[] =
 {
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 078ca2167d6f..a7a48db64ce2 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -4222,6 +4222,26 @@ sisfb_post_300_buswidth(struct sis_video_info *ivideo)
         return 1;                       /* 32bit */
 }
 
+static const unsigned short __devinitconst SiS_DRAMType[17][5] = {
+        {0x0C,0x0A,0x02,0x40,0x39},
+        {0x0D,0x0A,0x01,0x40,0x48},
+        {0x0C,0x09,0x02,0x20,0x35},
+        {0x0D,0x09,0x01,0x20,0x44},
+        {0x0C,0x08,0x02,0x10,0x31},
+        {0x0D,0x08,0x01,0x10,0x40},
+        {0x0C,0x0A,0x01,0x20,0x34},
+        {0x0C,0x09,0x01,0x08,0x32},
+        {0x0B,0x08,0x02,0x08,0x21},
+        {0x0C,0x08,0x01,0x08,0x30},
+        {0x0A,0x08,0x02,0x04,0x11},
+        {0x0B,0x0A,0x01,0x10,0x28},
+        {0x09,0x08,0x02,0x02,0x01},
+        {0x0B,0x09,0x01,0x08,0x24},
+        {0x0B,0x08,0x01,0x04,0x20},
+        {0x0A,0x08,0x01,0x02,0x10},
+        {0x09,0x08,0x01,0x01,0x00}
+};
+
 static int __devinit
 sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth,
                         int PseudoRankCapacity, int PseudoAdrPinCount,
@@ -4231,27 +4251,8 @@ sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, int buswidth
         unsigned short sr14;
         unsigned int k, RankCapacity, PageCapacity, BankNumHigh, BankNumMid;
         unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;
-        static const unsigned short SiS_DRAMType[17][5] = {
-                {0x0C,0x0A,0x02,0x40,0x39},
-                {0x0D,0x0A,0x01,0x40,0x48},
-                {0x0C,0x09,0x02,0x20,0x35},
-                {0x0D,0x09,0x01,0x20,0x44},
-                {0x0C,0x08,0x02,0x10,0x31},
-                {0x0D,0x08,0x01,0x10,0x40},
-                {0x0C,0x0A,0x01,0x20,0x34},
-                {0x0C,0x09,0x01,0x08,0x32},
-                {0x0B,0x08,0x02,0x08,0x21},
-                {0x0C,0x08,0x01,0x08,0x30},
-                {0x0A,0x08,0x02,0x04,0x11},
-                {0x0B,0x0A,0x01,0x10,0x28},
-                {0x09,0x08,0x02,0x02,0x01},
-                {0x0B,0x09,0x01,0x08,0x24},
-                {0x0B,0x08,0x01,0x04,0x20},
-                {0x0A,0x08,0x01,0x02,0x10},
-                {0x09,0x08,0x01,0x01,0x00}
-        };
 
-         for(k = 0; k <= 16; k++) {
+         for(k = 0; k < ARRAY_SIZE(SiS_DRAMType); k++) {
 
                 RankCapacity = buswidth * SiS_DRAMType[k][3];
 
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 30f7a815a62b..5b6abc6de84b 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -1036,6 +1036,6 @@ static void __exit xxxfb_exit(void)
      */
 
 module_init(xxxfb_init);
-module_exit(xxxfb_remove);
+module_exit(xxxfb_exit);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
index ccbfef5e828f..af3ef27ad36c 100644
--- a/drivers/video/smscufx.c
+++ b/drivers/video/smscufx.c
@@ -846,7 +846,7 @@ static void ufx_raw_rect(struct ufx_data *dev, u16 *cmd, int x, int y,
         }
 }
 
-int ufx_handle_damage(struct ufx_data *dev, int x, int y,
+static int ufx_handle_damage(struct ufx_data *dev, int x, int y,
         int width, int height)
 {
         size_t packed_line_len = ALIGN((width * 2), 4);
@@ -1083,7 +1083,7 @@ static int ufx_ops_open(struct fb_info *info, int user)
 
                 struct fb_deferred_io *fbdefio;
 
-                fbdefio = kmalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
+                fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
 
                 if (fbdefio) {
                         fbdefio->delay = UFX_DEFIO_WRITE_DELAY;
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index a159b63e18b9..8af64148294b 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -893,7 +893,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)
 
                 struct fb_deferred_io *fbdefio;
 
-                fbdefio = kmalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
+                fbdefio = kzalloc(sizeof(struct fb_deferred_io), GFP_KERNEL);
 
                 if (fbdefio) {
                         fbdefio->delay = DL_DEFIO_WRITE_DELAY;
@@ -1594,7 +1594,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
 
         dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (dev == NULL) {
-                err("dlfb_usb_probe: failed alloc of dev struct\n");
+                dev_err(&interface->dev, "dlfb_usb_probe: failed alloc of dev struct\n");
                 goto error;
         }
 
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 26e83d7fdd6f..b0e2a4261afe 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
         struct uvesafb_task *utask;
         struct uvesafb_ktask *task;
 
-        if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN))
                 return;
 
         if (msg->seq >= UVESAFB_TASKS_MAX)
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 0c8837565bc7..c80e770e1800 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1276,17 +1276,12 @@ static int viafb_dfph_proc_open(struct inode *inode, struct file *file)
 static ssize_t viafb_dfph_proc_write(struct file *file,
         const char __user *buffer, size_t count, loff_t *pos)
 {
-        char buf[20];
-        u8 reg_val = 0;
-        unsigned long length;
-        if (count < 1)
-                return -EINVAL;
-        length = count > 20 ? 20 : count;
-        if (copy_from_user(&buf[0], buffer, length))
-                return -EFAULT;
-        buf[length - 1] = '\0'; /*Ensure end string */
-        if (kstrtou8(buf, 0, &reg_val) < 0)
-                return -EINVAL;
+        int err;
+        u8 reg_val;
+        err = kstrtou8_from_user(buffer, count, 0, &reg_val);
+        if (err)
+                return err;
+
         viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
         return count;
 }
@@ -1316,17 +1311,12 @@ static int viafb_dfpl_proc_open(struct inode *inode, struct file *file)
 static ssize_t viafb_dfpl_proc_write(struct file *file,
         const char __user *buffer, size_t count, loff_t *pos)
 {
-        char buf[20];
-        u8 reg_val = 0;
-        unsigned long length;
-        if (count < 1)
-                return -EINVAL;
-        length = count > 20 ? 20 : count;
-        if (copy_from_user(&buf[0], buffer, length))
-                return -EFAULT;
-        buf[length - 1] = '\0'; /*Ensure end string */
-        if (kstrtou8(buf, 0, &reg_val) < 0)
-                return -EINVAL;
+        int err;
+        u8 reg_val;
+        err = kstrtou8_from_user(buffer, count, 0, &reg_val);
+        if (err)
+                return err;
+
         viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
         return count;
 }
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index cb4529c40d74..b7f5173ff9e9 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -365,7 +365,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         struct fb_info *fb_info;
         int fb_size;
         int val;
-        int ret;
+        int ret = 0;
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
@@ -458,26 +458,31 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         xenfb_init_shared_page(info, fb_info);
 
         ret = xenfb_connect_backend(dev, info);
-        if (ret < 0)
-                goto error;
+        if (ret < 0) {
+                xenbus_dev_fatal(dev, ret, "xenfb_connect_backend");
+                goto error_fb;
+        }
 
         ret = register_framebuffer(fb_info);
         if (ret) {
-                fb_deferred_io_cleanup(fb_info);
-                fb_dealloc_cmap(&fb_info->cmap);
-                framebuffer_release(fb_info);
                 xenbus_dev_fatal(dev, ret, "register_framebuffer");
-                goto error;
+                goto error_fb;
         }
         info->fb_info = fb_info;
 
         xenfb_make_preferred_console();
         return 0;
 
- error_nomem:
-        ret = -ENOMEM;
-        xenbus_dev_fatal(dev, ret, "allocating device memory");
- error:
+error_fb:
+        fb_deferred_io_cleanup(fb_info);
+        fb_dealloc_cmap(&fb_info->cmap);
+        framebuffer_release(fb_info);
+error_nomem:
+        if (!ret) {
+                ret = -ENOMEM;
+                xenbus_dev_fatal(dev, ret, "allocating device memory");
+        }
+error:
         xenfb_remove(dev);
         return ret;
 }