OMAP2,3: DSS2: Build omap_device for each DSS HWIP

Looks up the hwmod database for each of the given DSS HW IP and builds
omap_device which inturn does the platform device register for each of DSS HW IP

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index b18db84b034979f0faa4eb744c762a904513ae0d..ee8303037d3dfc6b25b6eaa4959006b4c61e3ce5 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,59 @@ 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,
+       },
+};
+
 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: dss_core, dss_dispc, dss_rfbi, dss_venc
+        * omap3: dss_dsi1
+        */
+       char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc",
+               "dss_dsi1" };
+       char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
+               "omapdss_venc", "omapdss_dsi1" };
+       int oh_count;
+
+       memset(&pdata, 0, sizeof(pdata));
+
+       if (cpu_is_omap24xx())
+               oh_count = ARRAY_SIZE(oh_name) - 1;
+               /* last hwmod dev in oh_name is not available for omap2 */
+       else
+               oh_count = ARRAY_SIZE(oh_name);
+
+       pdata.board_data = board_data;
+       pdata.board_data->get_last_off_on_transaction_id = NULL;
+
+       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);

diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index 0f140ecedb01da592e8f8d923a5a3a31b093cee1..2fb057e1cb98b791f2cfae382cb91d651c15206d 100644 (file)
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -237,6 +237,11 @@ static inline int omap_display_init(struct omap_dss_board_info *board_data)
 }
 #endif
 
+struct omap_display_platform_data {
+       struct omap_dss_board_info *board_data;
+       /* TODO: Additional members to be added when PM is considered */
+};
+
 struct omap_video_timings {
        /* Unit: pixels */
        u16 x_res;