aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/core.c2
-rw-r--r--include/video/omapdss.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index c9c2252e3719..710e9f9a4436 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -243,6 +243,8 @@ static int __init omap_dss_probe(struct platform_device *pdev)
243 243
244 if (def_disp_name) 244 if (def_disp_name)
245 core.default_display_name = def_disp_name; 245 core.default_display_name = def_disp_name;
246 else if (pdata->default_display_name)
247 core.default_display_name = pdata->default_display_name;
246 else if (pdata->default_device) 248 else if (pdata->default_device)
247 core.default_display_name = pdata->default_device->name; 249 core.default_display_name = pdata->default_device->name;
248 250
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index aeb4e9a0c5d1..6462f689a16d 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -365,6 +365,7 @@ struct omap_dss_board_info {
365 int num_devices; 365 int num_devices;
366 struct omap_dss_device **devices; 366 struct omap_dss_device **devices;
367 struct omap_dss_device *default_device; 367 struct omap_dss_device *default_device;
368 const char *default_display_name;
368 int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask); 369 int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
369 void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask); 370 void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
370 int (*set_min_bus_tput)(struct device *dev, unsigned long r); 371 int (*set_min_bus_tput)(struct device *dev, unsigned long r);