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

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

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

1 files changed, 166 insertions, 30 deletions

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index db5a88a36c63..54d49ddb9b81 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -180,16 +180,133 @@ static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask)
                 omap4_dsi_mux_pads(dsi_id, 0);
 }
 
+static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)
+{
+        return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);
+}
+
+static struct platform_device *create_dss_pdev(const char *pdev_name,
+                int pdev_id, const char *oh_name, void *pdata, int pdata_len,
+                struct platform_device *parent)
+{
+        struct platform_device *pdev;
+        struct omap_device *od;
+        struct omap_hwmod *ohs[1];
+        struct omap_hwmod *oh;
+        int r;
+
+        oh = omap_hwmod_lookup(oh_name);
+        if (!oh) {
+                pr_err("Could not look up %s\n", oh_name);
+                r = -ENODEV;
+                goto err;
+        }
+
+        pdev = platform_device_alloc(pdev_name, pdev_id);
+        if (!pdev) {
+                pr_err("Could not create pdev for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        if (parent != NULL)
+                pdev->dev.parent = &parent->dev;
+
+        if (pdev->id != -1)
+                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
+        else
+                dev_set_name(&pdev->dev, "%s", pdev->name);
+
+        ohs[0] = oh;
+        od = omap_device_alloc(pdev, ohs, 1, NULL, 0);
+        if (!od) {
+                pr_err("Could not alloc omap_device for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        r = platform_device_add_data(pdev, pdata, pdata_len);
+        if (r) {
+                pr_err("Could not set pdata for %s\n", pdev_name);
+                goto err;
+        }
+
+        r = omap_device_register(pdev);
+        if (r) {
+                pr_err("Could not register omap_device for %s\n", pdev_name);
+                goto err;
+        }
+
+        return pdev;
+
+err:
+        return ERR_PTR(r);
+}
+
+static struct platform_device *create_simple_dss_pdev(const char *pdev_name,
+                int pdev_id, void *pdata, int pdata_len,
+                struct platform_device *parent)
+{
+        struct platform_device *pdev;
+        int r;
+
+        pdev = platform_device_alloc(pdev_name, pdev_id);
+        if (!pdev) {
+                pr_err("Could not create pdev for %s\n", pdev_name);
+                r = -ENOMEM;
+                goto err;
+        }
+
+        if (parent != NULL)
+                pdev->dev.parent = &parent->dev;
+
+        if (pdev->id != -1)
+                dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);
+        else
+                dev_set_name(&pdev->dev, "%s", pdev->name);
+
+        r = platform_device_add_data(pdev, pdata, pdata_len);
+        if (r) {
+                pr_err("Could not set pdata for %s\n", pdev_name);
+                goto err;
+        }
+
+        r = omap_device_register(pdev);
+        if (r) {
+                pr_err("Could not register omap_device for %s\n", pdev_name);
+                goto err;
+        }
+
+        return pdev;
+
+err:
+        return ERR_PTR(r);
+}
+
 int __init omap_display_init(struct omap_dss_board_info *board_data)
 {
         int r = 0;
-        struct omap_hwmod *oh;
         struct platform_device *pdev;
         int i, oh_count;
-        struct omap_display_platform_data pdata;
         const struct omap_dss_hwmod_data *curr_dss_hwmod;
+        struct platform_device *dss_pdev;
+
+        /* create omapdss device */
+
+        board_data->dsi_enable_pads = omap_dsi_enable_pads;
+        board_data->dsi_disable_pads = omap_dsi_disable_pads;
+        board_data->get_context_loss_count = omap_pm_get_dev_context_loss_count;
+        board_data->set_min_bus_tput = omap_dss_set_min_bus_tput;
+
+        omap_display_device.dev.platform_data = board_data;
+
+        r = platform_device_register(&omap_display_device);
+        if (r < 0) {
+                pr_err("Unable to register omapdss device\n");
+                return r;
+        }
 
-        memset(&pdata, 0, sizeof(pdata));
+        /* create devices for dss hwmods */
 
         if (cpu_is_omap24xx()) {
                 curr_dss_hwmod = omap2_dss_hwmod_data;
@@ -202,39 +319,58 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
                 oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
         }
 
-        if (board_data->dsi_enable_pads == NULL)
-                board_data->dsi_enable_pads = omap_dsi_enable_pads;
-        if (board_data->dsi_disable_pads == NULL)
-                board_data->dsi_disable_pads = omap_dsi_disable_pads;
-
-        pdata.board_data = board_data;
-        pdata.board_data->get_context_loss_count =
-                omap_pm_get_dev_context_loss_count;
-
-        for (i = 0; i < oh_count; i++) {
-                oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name);
-                if (!oh) {
-                        pr_err("Could not look up %s\n",
-                                curr_dss_hwmod[i].oh_name);
-                        return -ENODEV;
+        /*
+         * First create the pdev for dss_core, which is used as a parent device
+         * by the other dss pdevs. Note: dss_core has to be the first item in
+         * the hwmod list.
+         */
+        dss_pdev = create_dss_pdev(curr_dss_hwmod[0].dev_name,
+                        curr_dss_hwmod[0].id,
+                        curr_dss_hwmod[0].oh_name,
+                        board_data, sizeof(*board_data),
+                        NULL);
+
+        if (IS_ERR(dss_pdev)) {
+                pr_err("Could not build omap_device for %s\n",
+                                curr_dss_hwmod[0].oh_name);
+
+                return PTR_ERR(dss_pdev);
+        }
+
+        for (i = 1; i < oh_count; i++) {
+                pdev = create_dss_pdev(curr_dss_hwmod[i].dev_name,
+                                curr_dss_hwmod[i].id,
+                                curr_dss_hwmod[i].oh_name,
+                                board_data, sizeof(*board_data),
+                                dss_pdev);
+
+                if (IS_ERR(pdev)) {
+                        pr_err("Could not build omap_device for %s\n",
+                                        curr_dss_hwmod[i].oh_name);
+
+                        return PTR_ERR(pdev);
                 }
+        }
 
-                pdev = omap_device_build(curr_dss_hwmod[i].dev_name,
-                                curr_dss_hwmod[i].id, oh, &pdata,
-                                sizeof(struct omap_display_platform_data),
-                                NULL, 0, 0);
+        /* Create devices for DPI and SDI */
 
-                if (WARN((IS_ERR(pdev)), "Could not build omap_device for %s\n",
-                                curr_dss_hwmod[i].oh_name))
-                        return -ENODEV;
+        pdev = create_simple_dss_pdev("omapdss_dpi", -1,
+                        board_data, sizeof(*board_data), dss_pdev);
+        if (IS_ERR(pdev)) {
+                pr_err("Could not build platform_device for omapdss_dpi\n");
+                return PTR_ERR(pdev);
         }
-        omap_display_device.dev.platform_data = board_data;
 
-        r = platform_device_register(&omap_display_device);
-        if (r < 0)
-                printk(KERN_ERR "Unable to register OMAP-Display device\n");
+        if (cpu_is_omap34xx()) {
+                pdev = create_simple_dss_pdev("omapdss_sdi", -1,
+                                board_data, sizeof(*board_data), dss_pdev);
+                if (IS_ERR(pdev)) {
+                        pr_err("Could not build platform_device for omapdss_sdi\n");
+                        return PTR_ERR(pdev);
+                }
+        }
 
-        return r;
+        return 0;
 }
 
 static void dispc_disable_outputs(void)