Add hwmod device names for OMAP4; this enables device build for omap4 dss
hwmod IPs.
Signed-off-by: Sumit Semwal <sumit.sem...@ti.com>
---
 arch/arm/mach-omap2/display.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 5c0a78b..10d699a 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -53,20 +53,27 @@ int __init omap_display_init(struct omap_dss_board_info
 
        /*
         * omap: valid DSS hwmod names
-        * omap2,3: dss_core, dss_dispc, dss_rfbi, dss_venc
-        * omap3: dss_dsi1
+        * 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"};
-       char *dev_name[] = { "omap_dss", "omap_dispc", "omap_rfbi", 
"omap_venc", "omap_dsi1" };
+       char *oh_name[] = {"dss_core", "dss_dispc", "dss_rfbi", "dss_venc", 
"dss_dsi1",
+                               "dss_dsi2", "dss_hdmi"};
+       char *dev_name[] = {"omap_dss", "omap_dispc", "omap_rfbi", "omap_venc", 
"omap_dsi1",
+                               "omap_dsi2", "omap_hdmi"};
        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) - 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 */
+
 
        pdata.board_data = board_data;
        pdata.board_data->get_last_off_on_transaction_id = NULL;
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to