Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / arch / arm / mach-omap2 / display.c

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index b18db84b034979f0faa4eb744c762a904513ae0d..256d23fb79abad7a3c40f15ea7905972e780ea7b 100644 (file)
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -23,6 +23,8 @@
 #include <linux/err.h>
 
 #include <plat/display.h>
+#include <plat/omap_hwmod.h>
+#include <plat/omap_device.h>
 
 static struct platform_device omap_display_device = {
        .name          = "omapdss",
@@ -32,9 +34,87 @@ static struct platform_device omap_display_device = {
        },
 };
 
+static struct omap_device_pm_latency omap_dss_latency[] = {
+       [0] = {
+               .deactivate_func        = omap_device_idle_hwmods,
+               .activate_func          = omap_device_enable_hwmods,
+               .flags                  = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+       },
+};
+
+/* oh_core is used for getting opt-clocks */
+static struct omap_hwmod       *oh_core;
+
+static bool opt_clock_available(const char *clk_role)
+{
+       int i;
+
+       for (i = 0; i < oh_core->opt_clks_cnt; i++) {
+               if (!strcmp(oh_core->opt_clks[i].role, clk_role))
+                       return true;
+       }
+       return false;
+}
+
 int __init omap_display_init(struct omap_dss_board_info *board_data)
 {
        int r = 0;
+       struct omap_hwmod *oh;
+       struct omap_device *od;
+       int i;
+       struct omap_display_platform_data pdata;
+
+       /*
+        * omap: valid DSS hwmod names
+        * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc
+        * omap3,4: dss_dsi1
+        * omap4: dss_dsi2, dss_hdmi
+        */
+       char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc",
+               "dss_dsi1", "dss_dsi2", "dss_hdmi" };
+       char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
+               "omapdss_venc", "omapdss_dsi1", "omapdss_dsi2",
+               "omapdss_hdmi" };
+       int oh_count;
+
+       memset(&pdata, 0, sizeof(pdata));
+
+       if (cpu_is_omap24xx())
+               oh_count = ARRAY_SIZE(oh_name) - 3;
+               /* last 3 hwmod dev in oh_name are not available for omap2 */
+       else if (cpu_is_omap44xx())
+               oh_count = ARRAY_SIZE(oh_name);
+       else
+               oh_count = ARRAY_SIZE(oh_name) - 2;
+               /* last 2 hwmod dev in oh_name are not available for omap3 */
+
+       /* opt_clks are always associated with dss hwmod */
+       oh_core = omap_hwmod_lookup("dss_core");
+       if (!oh_core) {
+               pr_err("Could not look up dss_core.\n");
+               return -ENODEV;
+       }
+
+       pdata.board_data = board_data;
+       pdata.board_data->get_last_off_on_transaction_id = NULL;
+       pdata.opt_clock_available = opt_clock_available;
+
+       for (i = 0; i < oh_count; i++) {
+               oh = omap_hwmod_lookup(oh_name[i]);
+               if (!oh) {
+                       pr_err("Could not look up %s\n", oh_name[i]);
+                       return -ENODEV;
+               }
+
+               od = omap_device_build(dev_name[i], -1, oh, &pdata,
+                               sizeof(struct omap_display_platform_data),
+                               omap_dss_latency,
+                               ARRAY_SIZE(omap_dss_latency), 0);
+
+               if (WARN((IS_ERR(od)), "Could not build omap_device for %s\n",
+                               oh_name[i]))
+                       return -ENODEV;
+       }
        omap_display_device.dev.platform_data = board_data;
 
        r = platform_device_register(&omap_display_device);