Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits)
  OMAP: DSS2: Fix omap_dss_probe() error path
  OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
  board-omap3-beagle: add DSS2 support
  OMAP2: DSS: Add missing line for update bg color
  OMAP3630: DSS2: Updating MAX divider value
  OMAP: RX51: Update board defconfig
  OMAP: DSS2: Add ACX565AKM Panel Driver
  OMAP: RX51: Add Touch Controller in SPI board info
  OMAP: RX51: Add LCD Panel support
  OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency
  OMAP: LCD LS037V7DW01: Add Backlight driver support
  OMAP: DSS2: Taal: Fix DSI bus locking problem
  OMAP: DSS2: Taal: add mutex to protect panel data
  OMAP: DSS2: Make partial update width even
  OMAP: DSS2: Fix device disable when driver is not loaded
  OMAP: DSS2: VENC: don't call platform_enable/disable() twice
  OMAP: DSS2: check lock_fb_info() return value
  OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order
  OMAP: DSS2: Use vdds_sdi regulator supply in SDI
  OMAP: DSS2: Remove redundant enable/disable calls from SDI
  ...

16 files changed, 1219 insertions, 100 deletions

diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index dfb57ee50861..881c9f77c75a 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -10,6 +10,7 @@ config PANEL_GENERIC
 config PANEL_SHARP_LS037V7DW01
         tristate "Sharp LS037V7DW01 LCD Panel"
         depends on OMAP2_DSS
+        select BACKLIGHT_CLASS_DEVICE
         help
           LCD Panel used in TI's SDP3430 and EVM boards
 
@@ -33,8 +34,14 @@ config PANEL_TOPPOLY_TDO35S
 
 config PANEL_TPO_TD043MTEA1
         tristate "TPO TD043MTEA1 LCD Panel"
-        depends on OMAP2_DSS && I2C
+        depends on OMAP2_DSS && SPI
         help
           LCD Panel used in OMAP3 Pandora
 
+config PANEL_ACX565AKM
+        tristate "ACX565AKM Panel"
+        depends on OMAP2_DSS_SDI
+        select BACKLIGHT_CLASS_DEVICE
+        help
+          This is the LCD panel used on Nokia N900
 endmenu
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index e2bb32168dee..aa386095d7c4 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_PANEL_SHARP_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
 obj-$(CONFIG_PANEL_TAAL) += panel-taal.o
 obj-$(CONFIG_PANEL_TOPPOLY_TDO35S) += panel-toppoly-tdo35s.o
 obj-$(CONFIG_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
+obj-$(CONFIG_PANEL_ACX565AKM) += panel-acx565akm.o
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
new file mode 100644
index 000000000000..1f8eb70e2937
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -0,0 +1,819 @@
+/*
+ * Support for ACX565AKM LCD Panel used on Nokia N900
+ *
+ * Copyright (C) 2010 Nokia Corporation
+ *
+ * Original Driver Author: Imre Deak <imre.deak@nokia.com>
+ * Based on panel-generic.c by Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ * Adapted to new DSS2 framework: Roger Quadros <roger.quadros@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/spi/spi.h>
+#include <linux/jiffies.h>
+#include <linux/sched.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+
+#include <plat/display.h>
+
+#define MIPID_CMD_READ_DISP_ID          0x04
+#define MIPID_CMD_READ_RED              0x06
+#define MIPID_CMD_READ_GREEN            0x07
+#define MIPID_CMD_READ_BLUE             0x08
+#define MIPID_CMD_READ_DISP_STATUS      0x09
+#define MIPID_CMD_RDDSDR                0x0F
+#define MIPID_CMD_SLEEP_IN              0x10
+#define MIPID_CMD_SLEEP_OUT             0x11
+#define MIPID_CMD_DISP_OFF              0x28
+#define MIPID_CMD_DISP_ON               0x29
+#define MIPID_CMD_WRITE_DISP_BRIGHTNESS 0x51
+#define MIPID_CMD_READ_DISP_BRIGHTNESS  0x52
+#define MIPID_CMD_WRITE_CTRL_DISP       0x53
+
+#define CTRL_DISP_BRIGHTNESS_CTRL_ON    (1 << 5)
+#define CTRL_DISP_AMBIENT_LIGHT_CTRL_ON (1 << 4)
+#define CTRL_DISP_BACKLIGHT_ON          (1 << 2)
+#define CTRL_DISP_AUTO_BRIGHTNESS_ON    (1 << 1)
+
+#define MIPID_CMD_READ_CTRL_DISP        0x54
+#define MIPID_CMD_WRITE_CABC            0x55
+#define MIPID_CMD_READ_CABC             0x56
+
+#define MIPID_VER_LPH8923               3
+#define MIPID_VER_LS041Y3               4
+#define MIPID_VER_L4F00311              8
+#define MIPID_VER_ACX565AKM             9
+
+struct acx565akm_device {
+        char            *name;
+        int             enabled;
+        int             model;
+        int             revision;
+        u8              display_id[3];
+        unsigned        has_bc:1;
+        unsigned        has_cabc:1;
+        unsigned        cabc_mode;
+        unsigned long   hw_guard_end;           /* next value of jiffies
+                                                   when we can issue the
+                                                   next sleep in/out command */
+        unsigned long   hw_guard_wait;          /* max guard time in jiffies */
+
+        struct spi_device       *spi;
+        struct mutex            mutex;
+
+        struct omap_dss_device  *dssdev;
+        struct backlight_device *bl_dev;
+};
+
+static struct acx565akm_device acx_dev;
+static int acx565akm_bl_update_status(struct backlight_device *dev);
+
+/*--------------------MIPID interface-----------------------------*/
+
+static void acx565akm_transfer(struct acx565akm_device *md, int cmd,
+                              const u8 *wbuf, int wlen, u8 *rbuf, int rlen)
+{
+        struct spi_message      m;
+        struct spi_transfer     *x, xfer[5];
+        int                     r;
+
+        BUG_ON(md->spi == NULL);
+
+        spi_message_init(&m);
+
+        memset(xfer, 0, sizeof(xfer));
+        x = &xfer[0];
+
+        cmd &=  0xff;
+        x->tx_buf = &cmd;
+        x->bits_per_word = 9;
+        x->len = 2;
+
+        if (rlen > 1 && wlen == 0) {
+                /*
+                 * Between the command and the response data there is a
+                 * dummy clock cycle. Add an extra bit after the command
+                 * word to account for this.
+                 */
+                x->bits_per_word = 10;
+                cmd <<= 1;
+        }
+        spi_message_add_tail(x, &m);
+
+        if (wlen) {
+                x++;
+                x->tx_buf = wbuf;
+                x->len = wlen;
+                x->bits_per_word = 9;
+                spi_message_add_tail(x, &m);
+        }
+
+        if (rlen) {
+                x++;
+                x->rx_buf       = rbuf;
+                x->len          = rlen;
+                spi_message_add_tail(x, &m);
+        }
+
+        r = spi_sync(md->spi, &m);
+        if (r < 0)
+                dev_dbg(&md->spi->dev, "spi_sync %d\n", r);
+}
+
+static inline void acx565akm_cmd(struct acx565akm_device *md, int cmd)
+{
+        acx565akm_transfer(md, cmd, NULL, 0, NULL, 0);
+}
+
+static inline void acx565akm_write(struct acx565akm_device *md,
+                               int reg, const u8 *buf, int len)
+{
+        acx565akm_transfer(md, reg, buf, len, NULL, 0);
+}
+
+static inline void acx565akm_read(struct acx565akm_device *md,
+                              int reg, u8 *buf, int len)
+{
+        acx565akm_transfer(md, reg, NULL, 0, buf, len);
+}
+
+static void hw_guard_start(struct acx565akm_device *md, int guard_msec)
+{
+        md->hw_guard_wait = msecs_to_jiffies(guard_msec);
+        md->hw_guard_end = jiffies + md->hw_guard_wait;
+}
+
+static void hw_guard_wait(struct acx565akm_device *md)
+{
+        unsigned long wait = md->hw_guard_end - jiffies;
+
+        if ((long)wait > 0 && wait <= md->hw_guard_wait) {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(wait);
+        }
+}
+
+/*----------------------MIPID wrappers----------------------------*/
+
+static void set_sleep_mode(struct acx565akm_device *md, int on)
+{
+        int cmd;
+
+        if (on)
+                cmd = MIPID_CMD_SLEEP_IN;
+        else
+                cmd = MIPID_CMD_SLEEP_OUT;
+        /*
+         * We have to keep 120msec between sleep in/out commands.
+         * (8.2.15, 8.2.16).
+         */
+        hw_guard_wait(md);
+        acx565akm_cmd(md, cmd);
+        hw_guard_start(md, 120);
+}
+
+static void set_display_state(struct acx565akm_device *md, int enabled)
+{
+        int cmd = enabled ? MIPID_CMD_DISP_ON : MIPID_CMD_DISP_OFF;
+
+        acx565akm_cmd(md, cmd);
+}
+
+static int panel_enabled(struct acx565akm_device *md)
+{
+        u32 disp_status;
+        int enabled;
+
+        acx565akm_read(md, MIPID_CMD_READ_DISP_STATUS, (u8 *)&disp_status, 4);
+        disp_status = __be32_to_cpu(disp_status);
+        enabled = (disp_status & (1 << 17)) && (disp_status & (1 << 10));
+        dev_dbg(&md->spi->dev,
+                "LCD panel %senabled by bootloader (status 0x%04x)\n",
+                enabled ? "" : "not ", disp_status);
+        return enabled;
+}
+
+static int panel_detect(struct acx565akm_device *md)
+{
+        acx565akm_read(md, MIPID_CMD_READ_DISP_ID, md->display_id, 3);
+        dev_dbg(&md->spi->dev, "MIPI display ID: %02x%02x%02x\n",
+                md->display_id[0], md->display_id[1], md->display_id[2]);
+
+        switch (md->display_id[0]) {
+        case 0x10:
+                md->model = MIPID_VER_ACX565AKM;
+                md->name = "acx565akm";
+                md->has_bc = 1;
+                md->has_cabc = 1;
+                break;
+        case 0x29:
+                md->model = MIPID_VER_L4F00311;
+                md->name = "l4f00311";
+                break;
+        case 0x45:
+                md->model = MIPID_VER_LPH8923;
+                md->name = "lph8923";
+                break;
+        case 0x83:
+                md->model = MIPID_VER_LS041Y3;
+                md->name = "ls041y3";
+                break;
+        default:
+                md->name = "unknown";
+                dev_err(&md->spi->dev, "invalid display ID\n");
+                return -ENODEV;
+        }
+
+        md->revision = md->display_id[1];
+
+        dev_info(&md->spi->dev, "omapfb: %s rev %02x LCD detected\n",
+                        md->name, md->revision);
+
+        return 0;
+}
+
+/*----------------------Backlight Control-------------------------*/
+
+static void enable_backlight_ctrl(struct acx565akm_device *md, int enable)
+{
+        u16 ctrl;
+
+        acx565akm_read(md, MIPID_CMD_READ_CTRL_DISP, (u8 *)&ctrl, 1);
+        if (enable) {
+                ctrl |= CTRL_DISP_BRIGHTNESS_CTRL_ON |
+                        CTRL_DISP_BACKLIGHT_ON;
+        } else {
+                ctrl &= ~(CTRL_DISP_BRIGHTNESS_CTRL_ON |
+                          CTRL_DISP_BACKLIGHT_ON);
+        }
+
+        ctrl |= 1 << 8;
+        acx565akm_write(md, MIPID_CMD_WRITE_CTRL_DISP, (u8 *)&ctrl, 2);
+}
+
+static void set_cabc_mode(struct acx565akm_device *md, unsigned mode)
+{
+        u16 cabc_ctrl;
+
+        md->cabc_mode = mode;
+        if (!md->enabled)
+                return;
+        cabc_ctrl = 0;
+        acx565akm_read(md, MIPID_CMD_READ_CABC, (u8 *)&cabc_ctrl, 1);
+        cabc_ctrl &= ~3;
+        cabc_ctrl |= (1 << 8) | (mode & 3);
+        acx565akm_write(md, MIPID_CMD_WRITE_CABC, (u8 *)&cabc_ctrl, 2);
+}
+
+static unsigned get_cabc_mode(struct acx565akm_device *md)
+{
+        return md->cabc_mode;
+}
+
+static unsigned get_hw_cabc_mode(struct acx565akm_device *md)
+{
+        u8 cabc_ctrl;
+
+        acx565akm_read(md, MIPID_CMD_READ_CABC, &cabc_ctrl, 1);
+        return cabc_ctrl & 3;
+}
+
+static void acx565akm_set_brightness(struct acx565akm_device *md, int level)
+{
+        int bv;
+
+        bv = level | (1 << 8);
+        acx565akm_write(md, MIPID_CMD_WRITE_DISP_BRIGHTNESS, (u8 *)&bv, 2);
+
+        if (level)
+                enable_backlight_ctrl(md, 1);
+        else
+                enable_backlight_ctrl(md, 0);
+}
+
+static int acx565akm_get_actual_brightness(struct acx565akm_device *md)
+{
+        u8 bv;
+
+        acx565akm_read(md, MIPID_CMD_READ_DISP_BRIGHTNESS, &bv, 1);
+
+        return bv;
+}
+
+
+static int acx565akm_bl_update_status(struct backlight_device *dev)
+{
+        struct acx565akm_device *md = dev_get_drvdata(&dev->dev);
+        int r;
+        int level;
+
+        dev_dbg(&md->spi->dev, "%s\n", __func__);
+
+        mutex_lock(&md->mutex);
+
+        if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
+                        dev->props.power == FB_BLANK_UNBLANK)
+                level = dev->props.brightness;
+        else
+                level = 0;
+
+        r = 0;
+        if (md->has_bc)
+                acx565akm_set_brightness(md, level);
+        else if (md->dssdev->set_backlight)
+                r = md->dssdev->set_backlight(md->dssdev, level);
+        else
+                r = -ENODEV;
+
+        mutex_unlock(&md->mutex);
+
+        return r;
+}
+
+static int acx565akm_bl_get_intensity(struct backlight_device *dev)
+{
+        struct acx565akm_device *md = dev_get_drvdata(&dev->dev);
+
+        dev_dbg(&dev->dev, "%s\n", __func__);
+
+        if (!md->has_bc && md->dssdev->set_backlight == NULL)
+                return -ENODEV;
+
+        if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
+                        dev->props.power == FB_BLANK_UNBLANK) {
+                if (md->has_bc)
+                        return acx565akm_get_actual_brightness(md);
+                else
+                        return dev->props.brightness;
+        }
+
+        return 0;
+}
+
+static const struct backlight_ops acx565akm_bl_ops = {
+        .get_brightness = acx565akm_bl_get_intensity,
+        .update_status  = acx565akm_bl_update_status,
+};
+
+/*--------------------Auto Brightness control via Sysfs---------------------*/
+
+static const char *cabc_modes[] = {
+        "off",          /* always used when CABC is not supported */
+        "ui",
+        "still-image",
+        "moving-image",
+};
+
+static ssize_t show_cabc_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct acx565akm_device *md = dev_get_drvdata(dev);
+        const char *mode_str;
+        int mode;
+        int len;
+
+        if (!md->has_cabc)
+                mode = 0;
+        else
+                mode = get_cabc_mode(md);
+        mode_str = "unknown";
+        if (mode >= 0 && mode < ARRAY_SIZE(cabc_modes))
+                mode_str = cabc_modes[mode];
+        len = snprintf(buf, PAGE_SIZE, "%s\n", mode_str);
+
+        return len < PAGE_SIZE - 1 ? len : PAGE_SIZE - 1;
+}
+
+static ssize_t store_cabc_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct acx565akm_device *md = dev_get_drvdata(dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cabc_modes); i++) {
+                const char *mode_str = cabc_modes[i];
+                int cmp_len = strlen(mode_str);
+
+                if (count > 0 && buf[count - 1] == '\n')
+                        count--;
+                if (count != cmp_len)
+                        continue;
+
+                if (strncmp(buf, mode_str, cmp_len) == 0)
+                        break;
+        }
+
+        if (i == ARRAY_SIZE(cabc_modes))
+                return -EINVAL;
+
+        if (!md->has_cabc && i != 0)
+                return -EINVAL;
+
+        mutex_lock(&md->mutex);
+        set_cabc_mode(md, i);
+        mutex_unlock(&md->mutex);
+
+        return count;
+}
+
+static ssize_t show_cabc_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct acx565akm_device *md = dev_get_drvdata(dev);
+        int len;
+        int i;
+
+        if (!md->has_cabc)
+                return snprintf(buf, PAGE_SIZE, "%s\n", cabc_modes[0]);
+
+        for (i = 0, len = 0;
+             len < PAGE_SIZE && i < ARRAY_SIZE(cabc_modes); i++)
+                len += snprintf(&buf[len], PAGE_SIZE - len, "%s%s%s",
+                        i ? " " : "", cabc_modes[i],
+                        i == ARRAY_SIZE(cabc_modes) - 1 ? "\n" : "");
+
+        return len < PAGE_SIZE ? len : PAGE_SIZE - 1;
+}
+
+static DEVICE_ATTR(cabc_mode, S_IRUGO | S_IWUSR,
+                show_cabc_mode, store_cabc_mode);
+static DEVICE_ATTR(cabc_available_modes, S_IRUGO,
+                show_cabc_available_modes, NULL);
+
+static struct attribute *bldev_attrs[] = {
+        &dev_attr_cabc_mode.attr,
+        &dev_attr_cabc_available_modes.attr,
+        NULL,
+};
+
+static struct attribute_group bldev_attr_group = {
+        .attrs = bldev_attrs,
+};
+
+
+/*---------------------------ACX Panel----------------------------*/
+
+static int acx_get_recommended_bpp(struct omap_dss_device *dssdev)
+{
+        return 16;
+}
+
+static struct omap_video_timings acx_panel_timings = {
+        .x_res          = 800,
+        .y_res          = 480,
+        .pixel_clock    = 24000,
+        .hfp            = 28,
+        .hsw            = 4,
+        .hbp            = 24,
+        .vfp            = 3,
+        .vsw            = 3,
+        .vbp            = 4,
+};
+
+static int acx_panel_probe(struct omap_dss_device *dssdev)
+{
+        int r;
+        struct acx565akm_device *md = &acx_dev;
+        struct backlight_device *bldev;
+        int max_brightness, brightness;
+        struct backlight_properties props;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                                        OMAP_DSS_LCD_IHS;
+        /* FIXME AC bias ? */
+        dssdev->panel.timings = acx_panel_timings;
+
+        if (dssdev->platform_enable)
+                dssdev->platform_enable(dssdev);
+        /*
+         * After reset we have to wait 5 msec before the first
+         * command can be sent.
+         */
+        msleep(5);
+
+        md->enabled = panel_enabled(md);
+
+        r = panel_detect(md);
+        if (r) {
+                dev_err(&dssdev->dev, "%s panel detect error\n", __func__);
+                if (!md->enabled && dssdev->platform_disable)
+                        dssdev->platform_disable(dssdev);
+                return r;
+        }
+
+        mutex_lock(&acx_dev.mutex);
+        acx_dev.dssdev = dssdev;
+        mutex_unlock(&acx_dev.mutex);
+
+        if (!md->enabled) {
+                if (dssdev->platform_disable)
+                        dssdev->platform_disable(dssdev);
+        }
+
+        /*------- Backlight control --------*/
+
+        props.fb_blank = FB_BLANK_UNBLANK;
+        props.power = FB_BLANK_UNBLANK;
+
+        bldev = backlight_device_register("acx565akm", &md->spi->dev,
+                        md, &acx565akm_bl_ops, &props);
+        md->bl_dev = bldev;
+        if (md->has_cabc) {
+                r = sysfs_create_group(&bldev->dev.kobj, &bldev_attr_group);
+                if (r) {
+                        dev_err(&bldev->dev,
+                                "%s failed to create sysfs files\n", __func__);
+                        backlight_device_unregister(bldev);
+                        return r;
+                }
+                md->cabc_mode = get_hw_cabc_mode(md);
+        }
+
+        if (md->has_bc)
+                max_brightness = 255;
+        else
+                max_brightness = dssdev->max_backlight_level;
+
+        if (md->has_bc)
+                brightness = acx565akm_get_actual_brightness(md);
+        else if (dssdev->get_backlight)
+                brightness = dssdev->get_backlight(dssdev);
+        else
+                brightness = 0;
+
+        bldev->props.max_brightness = max_brightness;
+        bldev->props.brightness = brightness;
+
+        acx565akm_bl_update_status(bldev);
+        return 0;
+}
+
+static void acx_panel_remove(struct omap_dss_device *dssdev)
+{
+        struct acx565akm_device *md = &acx_dev;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        sysfs_remove_group(&md->bl_dev->dev.kobj, &bldev_attr_group);
+        backlight_device_unregister(md->bl_dev);
+        mutex_lock(&acx_dev.mutex);
+        acx_dev.dssdev = NULL;
+        mutex_unlock(&acx_dev.mutex);
+}
+
+static int acx_panel_power_on(struct omap_dss_device *dssdev)
+{
+        struct acx565akm_device *md = &acx_dev;
+        int r;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+
+        mutex_lock(&md->mutex);
+
+        r = omapdss_sdi_display_enable(dssdev);
+        if (r) {
+                pr_err("%s sdi enable failed\n", __func__);
+                return r;
+        }
+
+        /*FIXME tweak me */
+        msleep(50);
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto fail;
+        }
+
+        if (md->enabled) {
+                dev_dbg(&md->spi->dev, "panel already enabled\n");
+                mutex_unlock(&md->mutex);
+                return 0;
+        }
+
+        /*
+         * We have to meet all the following delay requirements:
+         * 1. tRW: reset pulse width 10usec (7.12.1)
+         * 2. tRT: reset cancel time 5msec (7.12.1)
+         * 3. Providing PCLK,HS,VS signals for 2 frames = ~50msec worst
+         *    case (7.6.2)
+         * 4. 120msec before the sleep out command (7.12.1)
+         */
+        msleep(120);
+
+        set_sleep_mode(md, 0);
+        md->enabled = 1;
+
+        /* 5msec between sleep out and the next command. (8.2.16) */
+        msleep(5);
+        set_display_state(md, 1);
+        set_cabc_mode(md, md->cabc_mode);
+
+        mutex_unlock(&md->mutex);
+
+        return acx565akm_bl_update_status(md->bl_dev);
+fail:
+        omapdss_sdi_display_disable(dssdev);
+        return r;
+}
+
+static void acx_panel_power_off(struct omap_dss_device *dssdev)
+{
+        struct acx565akm_device *md = &acx_dev;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+
+        mutex_lock(&md->mutex);
+
+        if (!md->enabled) {
+                mutex_unlock(&md->mutex);
+                return;
+        }
+        set_display_state(md, 0);
+        set_sleep_mode(md, 1);
+        md->enabled = 0;
+        /*
+         * We have to provide PCLK,HS,VS signals for 2 frames (worst case
+         * ~50msec) after sending the sleep in command and asserting the
+         * reset signal. We probably could assert the reset w/o the delay
+         * but we still delay to avoid possible artifacts. (7.6.1)
+         */
+        msleep(50);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        /* FIXME need to tweak this delay */
+        msleep(100);
+
+        omapdss_sdi_display_disable(dssdev);
+
+        mutex_unlock(&md->mutex);
+}
+
+static int acx_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        r = acx_panel_power_on(dssdev);
+
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+        return 0;
+}
+
+static void acx_panel_disable(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        acx_panel_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int acx_panel_suspend(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        acx_panel_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int acx_panel_resume(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        dev_dbg(&dssdev->dev, "%s\n", __func__);
+        r = acx_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+        return 0;
+}
+
+static void acx_panel_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        int r;
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+                omapdss_sdi_display_disable(dssdev);
+
+        dssdev->panel.timings = *timings;
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                r = omapdss_sdi_display_enable(dssdev);
+                if (r)
+                        dev_err(&dssdev->dev, "%s enable failed\n", __func__);
+        }
+}
+
+static void acx_panel_get_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        *timings = dssdev->panel.timings;
+}
+
+static int acx_panel_check_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        return 0;
+}
+
+
+static struct omap_dss_driver acx_panel_driver = {
+        .probe          = acx_panel_probe,
+        .remove         = acx_panel_remove,
+
+        .enable         = acx_panel_enable,
+        .disable        = acx_panel_disable,
+        .suspend        = acx_panel_suspend,
+        .resume         = acx_panel_resume,
+
+        .set_timings    = acx_panel_set_timings,
+        .get_timings    = acx_panel_get_timings,
+        .check_timings  = acx_panel_check_timings,
+
+        .get_recommended_bpp = acx_get_recommended_bpp,
+
+        .driver         = {
+                .name   = "panel-acx565akm",
+                .owner  = THIS_MODULE,
+        },
+};
+
+/*--------------------SPI probe-------------------------*/
+
+static int acx565akm_spi_probe(struct spi_device *spi)
+{
+        struct acx565akm_device *md = &acx_dev;
+
+        dev_dbg(&spi->dev, "%s\n", __func__);
+
+        spi->mode = SPI_MODE_3;
+        md->spi = spi;
+        mutex_init(&md->mutex);
+        dev_set_drvdata(&spi->dev, md);
+
+        omap_dss_register_driver(&acx_panel_driver);
+
+        return 0;
+}
+
+static int acx565akm_spi_remove(struct spi_device *spi)
+{
+        struct acx565akm_device *md = dev_get_drvdata(&spi->dev);
+
+        dev_dbg(&md->spi->dev, "%s\n", __func__);
+        omap_dss_unregister_driver(&acx_panel_driver);
+
+        return 0;
+}
+
+static struct spi_driver acx565akm_spi_driver = {
+        .driver = {
+                .name   = "acx565akm",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe  = acx565akm_spi_probe,
+        .remove = __devexit_p(acx565akm_spi_remove),
+};
+
+static int __init acx565akm_init(void)
+{
+        return spi_register_driver(&acx565akm_spi_driver);
+}
+
+static void __exit acx565akm_exit(void)
+{
+        spi_unregister_driver(&acx565akm_spi_driver);
+}
+
+module_init(acx565akm_init);
+module_exit(acx565akm_exit);
+
+MODULE_AUTHOR("Nokia Corporation");
+MODULE_DESCRIPTION("acx565akm LCD Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index 8d51a5e6341c..7d9eb2b1f5af 100644
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -20,10 +20,17 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #include <plat/display.h>
 
+struct sharp_data {
+        struct backlight_device *bl;
+};
+
 static struct omap_video_timings sharp_ls_timings = {
         .x_res = 480,
         .y_res = 640,
@@ -39,18 +46,89 @@ static struct omap_video_timings sharp_ls_timings = {
         .vbp            = 1,
 };
 
+static int sharp_ls_bl_update_status(struct backlight_device *bl)
+{
+        struct omap_dss_device *dssdev = dev_get_drvdata(&bl->dev);
+        int level;
+
+        if (!dssdev->set_backlight)
+                return -EINVAL;
+
+        if (bl->props.fb_blank == FB_BLANK_UNBLANK &&
+                        bl->props.power == FB_BLANK_UNBLANK)
+                level = bl->props.brightness;
+        else
+                level = 0;
+
+        return dssdev->set_backlight(dssdev, level);
+}
+
+static int sharp_ls_bl_get_brightness(struct backlight_device *bl)
+{
+        if (bl->props.fb_blank == FB_BLANK_UNBLANK &&
+                        bl->props.power == FB_BLANK_UNBLANK)
+                return bl->props.brightness;
+
+        return 0;
+}
+
+static const struct backlight_ops sharp_ls_bl_ops = {
+        .get_brightness = sharp_ls_bl_get_brightness,
+        .update_status  = sharp_ls_bl_update_status,
+};
+
+
+
 static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
 {
+        struct backlight_properties props;
+        struct backlight_device *bl;
+        struct sharp_data *sd;
+        int r;
+
         dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
                 OMAP_DSS_LCD_IHS;
         dssdev->panel.acb = 0x28;
         dssdev->panel.timings = sharp_ls_timings;
 
+        sd = kzalloc(sizeof(*sd), GFP_KERNEL);
+        if (!sd)
+                return -ENOMEM;
+
+        dev_set_drvdata(&dssdev->dev, sd);
+
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = dssdev->max_backlight_level;
+
+        bl = backlight_device_register("sharp-ls", &dssdev->dev, dssdev,
+                        &sharp_ls_bl_ops, &props);
+        if (IS_ERR(bl)) {
+                r = PTR_ERR(bl);
+                kfree(sd);
+                return r;
+        }
+        sd->bl = bl;
+
+        bl->props.fb_blank = FB_BLANK_UNBLANK;
+        bl->props.power = FB_BLANK_UNBLANK;
+        bl->props.brightness = dssdev->max_backlight_level;
+        r = sharp_ls_bl_update_status(bl);
+        if (r < 0)
+                dev_err(&dssdev->dev, "failed to set lcd brightness\n");
+
         return 0;
 }
 
 static void sharp_ls_panel_remove(struct omap_dss_device *dssdev)
 {
+        struct sharp_data *sd = dev_get_drvdata(&dssdev->dev);
+        struct backlight_device *bl = sd->bl;
+
+        bl->props.power = FB_BLANK_POWERDOWN;
+        sharp_ls_bl_update_status(bl);
+        backlight_device_unregister(bl);
+
+        kfree(sd);
 }
 
 static int sharp_ls_power_on(struct omap_dss_device *dssdev)
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
index 4f3988a41082..aaf5d308a046 100644
--- a/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -31,6 +31,7 @@
 #include <linux/completion.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 
 #include <plat/display.h>
 
@@ -67,6 +68,8 @@
 static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable);
 
 struct taal_data {
+        struct mutex lock;
+
         struct backlight_device *bldev;
 
         unsigned long   hw_guard_end;   /* next value of jiffies when we can
@@ -510,6 +513,8 @@ static int taal_probe(struct omap_dss_device *dssdev)
         }
         td->dssdev = dssdev;
 
+        mutex_init(&td->lock);
+
         td->esd_wq = create_singlethread_workqueue("taal_esd");
         if (td->esd_wq == NULL) {
                 dev_err(&dssdev->dev, "can't create ESD workqueue\n");
@@ -697,10 +702,9 @@ static int taal_power_on(struct omap_dss_device *dssdev)
 
         return 0;
 err:
-        dsi_bus_unlock();
-
         omapdss_dsi_display_disable(dssdev);
 err0:
+        dsi_bus_unlock();
         if (dssdev->platform_disable)
                 dssdev->platform_disable(dssdev);
 
@@ -733,54 +737,96 @@ static void taal_power_off(struct omap_dss_device *dssdev)
 
 static int taal_enable(struct omap_dss_device *dssdev)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         int r;
+
         dev_dbg(&dssdev->dev, "enable\n");
 
-        if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)
-                return -EINVAL;
+        mutex_lock(&td->lock);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
+                r = -EINVAL;
+                goto err;
+        }
 
         r = taal_power_on(dssdev);
         if (r)
-                return r;
+                goto err;
 
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
+        mutex_unlock(&td->lock);
+
+        return 0;
+err:
+        dev_dbg(&dssdev->dev, "enable failed\n");
+        mutex_unlock(&td->lock);
         return r;
 }
 
 static void taal_disable(struct omap_dss_device *dssdev)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
         dev_dbg(&dssdev->dev, "disable\n");
 
+        mutex_lock(&td->lock);
+
         if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                 taal_power_off(dssdev);
 
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+
+        mutex_unlock(&td->lock);
 }
 
 static int taal_suspend(struct omap_dss_device *dssdev)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+
         dev_dbg(&dssdev->dev, "suspend\n");
 
-        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
-                return -EINVAL;
+        mutex_lock(&td->lock);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+                r = -EINVAL;
+                goto err;
+        }
 
         taal_power_off(dssdev);
         dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
 
+        mutex_unlock(&td->lock);
+
         return 0;
+err:
+        mutex_unlock(&td->lock);
+        return r;
 }
 
 static int taal_resume(struct omap_dss_device *dssdev)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         int r;
+
         dev_dbg(&dssdev->dev, "resume\n");
 
-        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
-                return -EINVAL;
+        mutex_lock(&td->lock);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
+                r = -EINVAL;
+                goto err;
+        }
 
         r = taal_power_on(dssdev);
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        mutex_unlock(&td->lock);
+
+        return r;
+err:
+        mutex_unlock(&td->lock);
         return r;
 }
 
@@ -799,6 +845,7 @@ static int taal_update(struct omap_dss_device *dssdev,
 
         dev_dbg(&dssdev->dev, "update %d, %d, %d x %d\n", x, y, w, h);
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
 
         if (!td->enabled) {
@@ -820,18 +867,24 @@ static int taal_update(struct omap_dss_device *dssdev,
                 goto err;
 
         /* note: no bus_unlock here. unlock is in framedone_cb */
+        mutex_unlock(&td->lock);
         return 0;
 err:
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return r;
 }
 
 static int taal_sync(struct omap_dss_device *dssdev)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
         dev_dbg(&dssdev->dev, "sync\n");
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
 
         dev_dbg(&dssdev->dev, "sync done\n");
 
@@ -861,13 +914,16 @@ static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 
 static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         int r;
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
 
         r = _taal_enable_te(dssdev, enable);
 
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
 
         return r;
 }
@@ -875,7 +931,13 @@ static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
 static int taal_get_te(struct omap_dss_device *dssdev)
 {
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        return td->te_enabled;
+        int r;
+
+        mutex_lock(&td->lock);
+        r = td->te_enabled;
+        mutex_unlock(&td->lock);
+
+        return r;
 }
 
 static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
@@ -885,6 +947,7 @@ static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
 
         dev_dbg(&dssdev->dev, "rotate %d\n", rotate);
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
 
         if (td->enabled) {
@@ -896,16 +959,24 @@ static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
         td->rotate = rotate;
 
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return 0;
 err:
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return r;
 }
 
 static u8 taal_get_rotate(struct omap_dss_device *dssdev)
 {
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        return td->rotate;
+        int r;
+
+        mutex_lock(&td->lock);
+        r = td->rotate;
+        mutex_unlock(&td->lock);
+
+        return r;
 }
 
 static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
@@ -915,6 +986,7 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
 
         dev_dbg(&dssdev->dev, "mirror %d\n", enable);
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
         if (td->enabled) {
                 r = taal_set_addr_mode(td->rotate, enable);
@@ -925,23 +997,33 @@ static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
         td->mirror = enable;
 
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return 0;
 err:
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return r;
 }
 
 static bool taal_get_mirror(struct omap_dss_device *dssdev)
 {
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
-        return td->mirror;
+        int r;
+
+        mutex_lock(&td->lock);
+        r = td->mirror;
+        mutex_unlock(&td->lock);
+
+        return r;
 }
 
 static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
 {
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
         u8 id1, id2, id3;
         int r;
 
+        mutex_lock(&td->lock);
         dsi_bus_lock();
 
         r = taal_dcs_read_1(DCS_GET_ID1, &id1);
@@ -955,9 +1037,11 @@ static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
                 goto err;
 
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return 0;
 err:
         dsi_bus_unlock();
+        mutex_unlock(&td->lock);
         return r;
 }
 
@@ -971,12 +1055,16 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
         unsigned buf_used = 0;
         struct taal_data *td = dev_get_drvdata(&dssdev->dev);
 
-        if (!td->enabled)
-                return -ENODEV;
-
         if (size < w * h * 3)
                 return -ENOMEM;
 
+        mutex_lock(&td->lock);
+
+        if (!td->enabled) {
+                r = -ENODEV;
+                goto err1;
+        }
+
         size = min(w * h * 3,
                         dssdev->panel.timings.x_res *
                         dssdev->panel.timings.y_res * 3);
@@ -995,7 +1083,7 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
 
         r = dsi_vc_set_max_rx_packet_size(TCH, plen);
         if (r)
-                goto err0;
+                goto err2;
 
         while (buf_used < size) {
                 u8 dcs_cmd = first ? 0x2e : 0x3e;
@@ -1006,7 +1094,7 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
 
                 if (r < 0) {
                         dev_err(&dssdev->dev, "read error\n");
-                        goto err;
+                        goto err3;
                 }
 
                 buf_used += r;
@@ -1020,16 +1108,18 @@ static int taal_memory_read(struct omap_dss_device *dssdev,
                         dev_err(&dssdev->dev, "signal pending, "
                                         "aborting memory read\n");
                         r = -ERESTARTSYS;
-                        goto err;
+                        goto err3;
                 }
         }
 
         r = buf_used;
 
-err:
+err3:
         dsi_vc_set_max_rx_packet_size(TCH, 1);
-err0:
+err2:
         dsi_bus_unlock();
+err1:
+        mutex_unlock(&td->lock);
         return r;
 }
 
@@ -1041,8 +1131,12 @@ static void taal_esd_work(struct work_struct *work)
         u8 state1, state2;
         int r;
 
-        if (!td->enabled)
+        mutex_lock(&td->lock);
+
+        if (!td->enabled) {
+                mutex_unlock(&td->lock);
                 return;
+        }
 
         dsi_bus_lock();
 
@@ -1084,16 +1178,19 @@ static void taal_esd_work(struct work_struct *work)
 
         queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
 
+        mutex_unlock(&td->lock);
         return;
 err:
         dev_err(&dssdev->dev, "performing LCD reset\n");
 
-        taal_disable(dssdev);
-        taal_enable(dssdev);
+        taal_power_off(dssdev);
+        taal_power_on(dssdev);
 
         dsi_bus_unlock();
 
         queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
+
+        mutex_unlock(&td->lock);
 }
 
 static int taal_set_update_mode(struct omap_dss_device *dssdev,
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
index 87afb81b2c44..43b64403eaa4 100644
--- a/drivers/video/omap2/dss/Kconfig
+++ b/drivers/video/omap2/dss/Kconfig
@@ -36,6 +36,12 @@ config OMAP2_DSS_COLLECT_IRQ_STATS
           <debugfs>/omapdss/dispc_irq for DISPC interrupts, and
           <debugfs>/omapdss/dsi_irq for DSI interrupts.
 
+config OMAP2_DSS_DPI
+        bool "DPI support"
+        default y
+        help
+          DPI Interface. This is the Parallel Display Interface.
+
 config OMAP2_DSS_RFBI
         bool "RFBI support"
         default n
diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile
index 980c72c2db98..d71b5d9d71b1 100644
--- a/drivers/video/omap2/dss/Makefile
+++ b/drivers/video/omap2/dss/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_OMAP2_DSS) += omapdss.o
-omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o
+omapdss-y := core.o dss.o dispc.o display.o manager.o overlay.o
+omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o
 omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
 omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 7ebe50b335ed..b3a498f22d36 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -482,6 +482,14 @@ static void dss_uninitialize_debugfs(void)
         if (dss_debugfs_dir)
                 debugfs_remove_recursive(dss_debugfs_dir);
 }
+#else /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
+static inline int dss_initialize_debugfs(void)
+{
+        return 0;
+}
+static inline void dss_uninitialize_debugfs(void)
+{
+}
 #endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
 
 /* PLATFORM DEVICE */
@@ -499,7 +507,7 @@ static int omap_dss_probe(struct platform_device *pdev)
 
         r = dss_get_clocks();
         if (r)
-                goto fail0;
+                goto err_clocks;
 
         dss_clk_enable_all_no_ctx();
 
@@ -515,64 +523,64 @@ static int omap_dss_probe(struct platform_device *pdev)
         r = dss_init(skip_init);
         if (r) {
                 DSSERR("Failed to initialize DSS\n");
-                goto fail0;
+                goto err_dss;
         }
 
-#ifdef CONFIG_OMAP2_DSS_RFBI
         r = rfbi_init();
         if (r) {
                 DSSERR("Failed to initialize rfbi\n");
-                goto fail0;
+                goto err_rfbi;
         }
-#endif
 
         r = dpi_init(pdev);
         if (r) {
                 DSSERR("Failed to initialize dpi\n");
-                goto fail0;
+                goto err_dpi;
         }
 
         r = dispc_init();
         if (r) {
                 DSSERR("Failed to initialize dispc\n");
-                goto fail0;
+                goto err_dispc;
         }
-#ifdef CONFIG_OMAP2_DSS_VENC
+
         r = venc_init(pdev);
         if (r) {
                 DSSERR("Failed to initialize venc\n");
-                goto fail0;
+                goto err_venc;
         }
-#endif
+
         if (cpu_is_omap34xx()) {
-#ifdef CONFIG_OMAP2_DSS_SDI
                 r = sdi_init(skip_init);
                 if (r) {
                         DSSERR("Failed to initialize SDI\n");
-                        goto fail0;
+                        goto err_sdi;
                 }
-#endif
-#ifdef CONFIG_OMAP2_DSS_DSI
+
                 r = dsi_init(pdev);
                 if (r) {
                         DSSERR("Failed to initialize DSI\n");
-                        goto fail0;
+                        goto err_dsi;
                 }
-#endif
         }
 
-#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
         r = dss_initialize_debugfs();
         if (r)
-                goto fail0;
-#endif
+                goto err_debugfs;
 
         for (i = 0; i < pdata->num_devices; ++i) {
                 struct omap_dss_device *dssdev = pdata->devices[i];
 
                 r = omap_dss_register_device(dssdev);
-                if (r)
-                        DSSERR("device reg failed %d\n", i);
+                if (r) {
+                        DSSERR("device %d %s register failed %d\n", i,
+                                dssdev->name ?: "unnamed", r);
+
+                        while (--i >= 0)
+                                omap_dss_unregister_device(pdata->devices[i]);
+
+                        goto err_register;
+                }
 
                 if (def_disp_name && strcmp(def_disp_name, dssdev->name) == 0)
                         pdata->default_device = dssdev;
@@ -582,8 +590,29 @@ static int omap_dss_probe(struct platform_device *pdev)
 
         return 0;
 
-        /* XXX fail correctly */
-fail0:
+err_register:
+        dss_uninitialize_debugfs();
+err_debugfs:
+        if (cpu_is_omap34xx())
+                dsi_exit();
+err_dsi:
+        if (cpu_is_omap34xx())
+                sdi_exit();
+err_sdi:
+        venc_exit();
+err_venc:
+        dispc_exit();
+err_dispc:
+        dpi_exit();
+err_dpi:
+        rfbi_exit();
+err_rfbi:
+        dss_exit();
+err_dss:
+        dss_clk_disable_all_no_ctx();
+        dss_put_clocks();
+err_clocks:
+
         return r;
 }
 
@@ -593,25 +622,15 @@ static int omap_dss_remove(struct platform_device *pdev)
         int i;
         int c;
 
-#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
         dss_uninitialize_debugfs();
-#endif
 
-#ifdef CONFIG_OMAP2_DSS_VENC
         venc_exit();
-#endif
         dispc_exit();
         dpi_exit();
-#ifdef CONFIG_OMAP2_DSS_RFBI
         rfbi_exit();
-#endif
         if (cpu_is_omap34xx()) {
-#ifdef CONFIG_OMAP2_DSS_DSI
                 dsi_exit();
-#endif
-#ifdef CONFIG_OMAP2_DSS_SDI
                 sdi_exit();
-#endif
         }
 
         dss_exit();
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
index 6a74ea116d29..ef8c8529dda2 100644
--- a/drivers/video/omap2/dss/display.c
+++ b/drivers/video/omap2/dss/display.c
@@ -392,7 +392,9 @@ void dss_init_device(struct platform_device *pdev,
         int r;
 
         switch (dssdev->type) {
+#ifdef CONFIG_OMAP2_DSS_DPI
         case OMAP_DISPLAY_TYPE_DPI:
+#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
         case OMAP_DISPLAY_TYPE_DBI:
 #endif
@@ -413,9 +415,11 @@ void dss_init_device(struct platform_device *pdev,
         }
 
         switch (dssdev->type) {
+#ifdef CONFIG_OMAP2_DSS_DPI
         case OMAP_DISPLAY_TYPE_DPI:
                 r = dpi_init_display(dssdev);
                 break;
+#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
         case OMAP_DISPLAY_TYPE_DBI:
                 r = rfbi_init_display(dssdev);
@@ -541,7 +545,10 @@ int dss_resume_all_devices(void)
 static int dss_disable_device(struct device *dev, void *data)
 {
         struct omap_dss_device *dssdev = to_dss_device(dev);
-        dssdev->driver->disable(dssdev);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)
+                dssdev->driver->disable(dssdev);
+
         return 0;
 }
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 54344184dd73..24b18258654f 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -223,7 +223,13 @@ void dss_dump_clocks(struct seq_file *s)
 
         seq_printf(s, "dpll4_ck %lu\n", dpll4_ck_rate);
 
-        seq_printf(s, "dss1_alwon_fclk = %lu / %lu * 2 = %lu\n",
+        if (cpu_is_omap3630())
+                seq_printf(s, "dss1_alwon_fclk = %lu / %lu  = %lu\n",
+                        dpll4_ck_rate,
+                        dpll4_ck_rate / dpll4_m4_ck_rate,
+                        dss_clk_get_rate(DSS_CLK_FCK1));
+        else
+                seq_printf(s, "dss1_alwon_fclk = %lu / %lu * 2 = %lu\n",
                         dpll4_ck_rate,
                         dpll4_ck_rate / dpll4_m4_ck_rate,
                         dss_clk_get_rate(DSS_CLK_FCK1));
@@ -293,7 +299,8 @@ int dss_calc_clock_rates(struct dss_clock_info *cinfo)
 {
         unsigned long prate;
 
-        if (cinfo->fck_div > 16 || cinfo->fck_div == 0)
+        if (cinfo->fck_div > (cpu_is_omap3630() ? 32 : 16) ||
+                                                cinfo->fck_div == 0)
                 return -EINVAL;
 
         prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
@@ -329,7 +336,10 @@ int dss_get_clock_div(struct dss_clock_info *cinfo)
         if (cpu_is_omap34xx()) {
                 unsigned long prate;
                 prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
-                cinfo->fck_div = prate / (cinfo->fck / 2);
+                if (cpu_is_omap3630())
+                        cinfo->fck_div = prate / (cinfo->fck);
+                else
+                        cinfo->fck_div = prate / (cinfo->fck / 2);
         } else {
                 cinfo->fck_div = 0;
         }
@@ -402,10 +412,14 @@ retry:
 
                 goto found;
         } else if (cpu_is_omap34xx()) {
-                for (fck_div = 16; fck_div > 0; --fck_div) {
+                for (fck_div = (cpu_is_omap3630() ? 32 : 16);
+                                        fck_div > 0; --fck_div) {
                         struct dispc_clock_info cur_dispc;
 
-                        fck = prate / fck_div * 2;
+                        if (cpu_is_omap3630())
+                                fck = prate / fck_div;
+                        else
+                                fck = prate / fck_div * 2;
 
                         if (fck > DISPC_MAX_FCK)
                                 continue;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 24326a5fd292..786f433fd571 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -242,11 +242,22 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
                 struct dispc_clock_info *dispc_cinfo);
 
 /* SDI */
+#ifdef CONFIG_OMAP2_DSS_SDI
 int sdi_init(bool skip_init);
 void sdi_exit(void);
 int sdi_init_display(struct omap_dss_device *display);
+#else
+static inline int sdi_init(bool skip_init)
+{
+        return 0;
+}
+static inline void sdi_exit(void)
+{
+}
+#endif
 
 /* DSI */
+#ifdef CONFIG_OMAP2_DSS_DSI
 int dsi_init(struct platform_device *pdev);
 void dsi_exit(void);
 
@@ -270,11 +281,30 @@ void dsi_pll_uninit(void);
 void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
                 u32 fifo_size, enum omap_burst_size *burst_size,
                 u32 *fifo_low, u32 *fifo_high);
+#else
+static inline int dsi_init(struct platform_device *pdev)
+{
+        return 0;
+}
+static inline void dsi_exit(void)
+{
+}
+#endif
 
 /* DPI */
+#ifdef CONFIG_OMAP2_DSS_DPI
 int dpi_init(struct platform_device *pdev);
 void dpi_exit(void);
 int dpi_init_display(struct omap_dss_device *dssdev);
+#else
+static inline int dpi_init(struct platform_device *pdev)
+{
+        return 0;
+}
+static inline void dpi_exit(void)
+{
+}
+#endif
 
 /* DISPC */
 int dispc_init(void);
@@ -362,12 +392,23 @@ int dispc_get_clock_div(struct dispc_clock_info *cinfo);
 
 
 /* VENC */
+#ifdef CONFIG_OMAP2_DSS_VENC
 int venc_init(struct platform_device *pdev);
 void venc_exit(void);
 void venc_dump_regs(struct seq_file *s);
 int venc_init_display(struct omap_dss_device *display);
+#else
+static inline int venc_init(struct platform_device *pdev)
+{
+        return 0;
+}
+static inline void venc_exit(void)
+{
+}
+#endif
 
 /* RFBI */
+#ifdef CONFIG_OMAP2_DSS_RFBI
 int rfbi_init(void);
 void rfbi_exit(void);
 void rfbi_dump_regs(struct seq_file *s);
@@ -379,6 +420,15 @@ void rfbi_transfer_area(u16 width, u16 height,
 void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
 unsigned long rfbi_get_max_tx_rate(void);
 int rfbi_init_display(struct omap_dss_device *display);
+#else
+static inline int rfbi_init(void)
+{
+        return 0;
+}
+static inline void rfbi_exit(void)
+{
+}
+#endif
 
 
 #ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index 0820986d4a68..9e1fbe531bf0 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -843,6 +843,7 @@ static void configure_manager(enum omap_channel channel)
 
         c = &dss_cache.manager_cache[channel];
 
+        dispc_set_default_color(channel, c->default_color);
         dispc_set_trans_key(channel, c->trans_key_type, c->trans_key);
         dispc_enable_trans_key(channel, c->trans_enabled);
         dispc_enable_alpha_blending(channel, c->alpha_enabled);
@@ -940,6 +941,22 @@ static int configure_dispc(void)
         return r;
 }
 
+/* Make the coordinates even. There are some strange problems with OMAP and
+ * partial DSI update when the update widths are odd. */
+static void make_even(u16 *x, u16 *w)
+{
+        u16 x1, x2;
+
+        x1 = *x;
+        x2 = *x + *w;
+
+        x1 &= ~1;
+        x2 = ALIGN(x2, 2);
+
+        *x = x1;
+        *w = x2 - x1;
+}
+
 /* Configure dispc for partial update. Return possibly modified update
  * area */
 void dss_setup_partial_planes(struct omap_dss_device *dssdev,
@@ -968,6 +985,8 @@ void dss_setup_partial_planes(struct omap_dss_device *dssdev,
                 return;
         }
 
+        make_even(&x, &w);
+
         spin_lock_irqsave(&dss_cache.lock, flags);
 
         /* We need to show the whole overlay if it is scaled. So look for
@@ -1029,6 +1048,8 @@ void dss_setup_partial_planes(struct omap_dss_device *dssdev,
                 w = x2 - x1;
                 h = y2 - y1;
 
+                make_even(&x, &w);
+
                 DSSDBG("changing upd area due to ovl(%d) scaling %d,%d %dx%d\n",
                                 i, x, y, w, h);
         }
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 12eb4042dd82..ee07a3cc22ef 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -23,13 +23,16 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/regulator/consumer.h>
 
 #include <plat/display.h>
+#include <plat/cpu.h>
 #include "dss.h"
 
 static struct {
         bool skip_init;
         bool update_enabled;
+        struct regulator *vdds_sdi_reg;
 } sdi;
 
 static void sdi_basic_init(void)
@@ -57,6 +60,10 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
                 goto err0;
         }
 
+        r = regulator_enable(sdi.vdds_sdi_reg);
+        if (r)
+                goto err1;
+
         /* In case of skip_init sdi_init has already enabled the clocks */
         if (!sdi.skip_init)
                 dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
@@ -115,19 +122,12 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
 
         dssdev->manager->enable(dssdev->manager);
 
-        if (dssdev->driver->enable) {
-                r = dssdev->driver->enable(dssdev);
-                if (r)
-                        goto err3;
-        }
-
         sdi.skip_init = 0;
 
         return 0;
-err3:
-        dssdev->manager->disable(dssdev->manager);
 err2:
         dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        regulator_disable(sdi.vdds_sdi_reg);
 err1:
         omap_dss_stop_device(dssdev);
 err0:
@@ -137,15 +137,14 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
 
 void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
 {
-        if (dssdev->driver->disable)
-                dssdev->driver->disable(dssdev);
-
         dssdev->manager->disable(dssdev->manager);
 
         dss_sdi_disable();
 
         dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
+        regulator_disable(sdi.vdds_sdi_reg);
+
         omap_dss_stop_device(dssdev);
 }
 EXPORT_SYMBOL(omapdss_sdi_display_disable);
@@ -162,6 +161,11 @@ int sdi_init(bool skip_init)
         /* we store this for first display enable, then clear it */
         sdi.skip_init = skip_init;
 
+        sdi.vdds_sdi_reg = dss_get_vdds_sdi();
+        if (IS_ERR(sdi.vdds_sdi_reg)) {
+                DSSERR("can't get VDDS_SDI regulator\n");
+                return PTR_ERR(sdi.vdds_sdi_reg);
+        }
         /*
          * Enable clocks already here, otherwise there would be a toggle
          * of them until sdi_display_enable is called.
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index f0ba5732d84a..eff35050e28a 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
                 goto err1;
         }
 
-        if (dssdev->platform_enable) {
-                r = dssdev->platform_enable(dssdev);
-                if (r)
-                        goto err2;
-        }
-
         venc_power_on(dssdev);
 
         venc.wss_data = 0;
@@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
         /* wait couple of vsyncs until enabling the LCD */
         msleep(50);
 
-        mutex_unlock(&venc.venc_lock);
-
-        return r;
-err2:
-        venc_power_off(dssdev);
 err1:
         mutex_unlock(&venc.venc_lock);
+
         return r;
 }
 
@@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev)
         /* wait at least 5 vsyncs after disabling the LCD */
         msleep(100);
 
-        if (dssdev->platform_disable)
-                dssdev->platform_disable(dssdev);
-
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
 end:
         mutex_unlock(&venc.venc_lock);
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
index 1ffa760b8545..9c7361871d78 100644
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -183,13 +183,14 @@ int omapfb_update_window(struct fb_info *fbi,
         struct omapfb2_device *fbdev = ofbi->fbdev;
         int r;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         r = omapfb_update_window_nolock(fbi, x, y, w, h);
 
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return r;
 }
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
index 62bb88f5c192..5179219128bd 100644
--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -57,7 +57,8 @@ static ssize_t store_rotate_type(struct device *dev,
         if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
                 return -EINVAL;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         r = 0;
         if (rot_type == ofbi->rotation_type)
@@ -105,7 +106,8 @@ static ssize_t store_mirror(struct device *dev,
         if (mirror != 0 && mirror != 1)
                 return -EINVAL;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         ofbi->mirror = mirror;
 
@@ -137,8 +139,9 @@ static ssize_t show_overlays(struct device *dev,
         ssize_t l = 0;
         int t;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         for (t = 0; t < ofbi->num_overlays; t++) {
                 struct omap_overlay *ovl = ofbi->overlays[t];
@@ -154,8 +157,8 @@ static ssize_t show_overlays(struct device *dev,
 
         l += snprintf(buf + l, PAGE_SIZE - l, "\n");
 
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return l;
 }
@@ -195,8 +198,9 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
         if (buf[len - 1] == '\n')
                 len = len - 1;
 
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
         omapfb_lock(fbdev);
-        lock_fb_info(fbi);
 
         if (len > 0) {
                 char *p = (char *)buf;
@@ -303,8 +307,8 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
 
         r = count;
 out:
-        unlock_fb_info(fbi);
         omapfb_unlock(fbdev);
+        unlock_fb_info(fbi);
 
         return r;
 }
@@ -317,7 +321,8 @@ static ssize_t show_overlays_rotate(struct device *dev,
         ssize_t l = 0;
         int t;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         for (t = 0; t < ofbi->num_overlays; t++) {
                 l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
@@ -345,7 +350,8 @@ static ssize_t store_overlays_rotate(struct device *dev,
         if (buf[len - 1] == '\n')
                 len = len - 1;
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         if (len > 0) {
                 char *p = (char *)buf;
@@ -416,7 +422,8 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
 
         size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0));
 
-        lock_fb_info(fbi);
+        if (!lock_fb_info(fbi))
+                return -ENODEV;
 
         for (i = 0; i < ofbi->num_overlays; i++) {
                 if (ofbi->overlays[i]->info.enabled) {