aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMayuresh Janorkar <mayur@ti.com>2011-01-27 06:17:04 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-03-11 08:46:23 -0500
commit545376e734a6b0a4c66efb7616724ae4dbb2e57a (patch)
treeb93d30bf40a14bb042862cb81f2bc3992bf46f60 /arch
parent3f3aa06c46796cd2dc0f71d7d2f41bb75f7e97ff (diff)
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')
-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 ee8303037d3d..16d0db6718ae 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)
52 52
53 /* 53 /*
54 * omap: valid DSS hwmod names 54 * omap: valid DSS hwmod names
55 * omap2,3: dss_core, dss_dispc, dss_rfbi, dss_venc 55 * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc
56 * omap3: dss_dsi1 56 * omap3,4: dss_dsi1
57 * omap4: dss_dsi2, dss_hdmi
57 */ 58 */
58 char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc", 59 char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc",
59 "dss_dsi1" }; 60 "dss_dsi1", "dss_dsi2", "dss_hdmi" };
60 char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi", 61 char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
61 "omapdss_venc", "omapdss_dsi1" }; 62 "omapdss_venc", "omapdss_dsi1", "omapdss_dsi2",
63 "omapdss_hdmi" };
62 int oh_count; 64 int oh_count;
63 65
64 memset(&pdata, 0, sizeof(pdata)); 66 memset(&pdata, 0, sizeof(pdata));
65 67
66 if (cpu_is_omap24xx()) 68 if (cpu_is_omap24xx())
67 oh_count = ARRAY_SIZE(oh_name) - 1; 69 oh_count = ARRAY_SIZE(oh_name) - 3;
68 /* last hwmod dev in oh_name is not available for omap2 */ 70 /* last 3 hwmod dev in oh_name are not available for omap2 */
69 else 71 else if (cpu_is_omap44xx())
70 oh_count = ARRAY_SIZE(oh_name); 72 oh_count = ARRAY_SIZE(oh_name);
73 else
74 oh_count = ARRAY_SIZE(oh_name) - 2;
75 /* last 2 hwmod dev in oh_name are not available for omap3 */
76
71 77
72 pdata.board_data = board_data; 78 pdata.board_data = board_data;
73 pdata.board_data->get_last_off_on_transaction_id = NULL; 79 pdata.board_data->get_last_off_on_transaction_id = NULL;