@@ -51,20 +51,27 @@ int __init omap_display_init(struct omap_dss_board_info
struct omap_device *od;
int i;
struct omap_display_platform_data pdata;
- char *oh_name[] = { "dss_dss", /* omap2,3 */
- "dss_dispc", /* omap2,3 */
- "dss_rfbi", /* omap2,3 */
- "dss_venc", /* omap2,3 */
- "dss_dsi1" }; /* omap3 */
+ char *oh_name[] = { "dss_dss", /* omap2,3,4 */
+ "dss_dispc", /* omap2,3,4 */
+ "dss_rfbi", /* omap2,3,4 */
+ "dss_venc", /* omap2,3,4 */
+ "dss_dsi1", /* omap3,4 */
+ "dss_dsi2", /* omap4 */
+ "dss_hdmi", /* omap4 */
+ };
+
char *dev_name[] = { "omap_dss", "omap_dispc", "omap_rfbi",
"omap_venc", "omap_dsi1" };
int oh_count;
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 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 not available for omap3 */
}
pdata.board_data = board_data;