summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/display.c
diff options
context:
space:
mode:
authorMayuresh Janorkar <mayur@ti.com>2011-01-27 11:17:04 (GMT)
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 13:46:23 (GMT)
commit545376e734a6b0a4c66efb7616724ae4dbb2e57a (patch)
treeb93d30bf40a14bb042862cb81f2bc3992bf46f60 /arch/arm/mach-omap2/display.c
parent3f3aa06c46796cd2dc0f71d7d2f41bb75f7e97ff (diff)
downloadlinux-545376e734a6b0a4c66efb7616724ae4dbb2e57a.tar.xz
OMAP4: DSS2: Add hwmod device names for OMAP4.
Add hwmod device names for OMAP4; this enables device build for omap4 dss hwmod IPs. Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> Signed-off-by: Mayuresh Janorkar <mayur@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r--arch/arm/mach-omap2/display.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index ee83030..16d0db6 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -52,22 +52,28 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
/*
* 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" };
+ "dss_dsi1", "dss_dsi2", "dss_hdmi" };
char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
- "omapdss_venc", "omapdss_dsi1" };
+ "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) - 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;