To avoid the need for a "nickname" property for each display, change the display registration so that the display's alias (i.e. "display0" etc) will be used for the dssdev->name if the display driver didn't provide a name. This means that when booting with board files, we will have more descriptive names for displays, like "lcd1", "hdmi". With DT we'll only have "display0", etc. But as there are no "nicknames" for things like serials ports either, I hope we will do fine with this approach. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx> --- drivers/video/omap2/dss/display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c index 669a81fdf58e..a946cf7ed00f 100644 --- a/drivers/video/omap2/dss/display.c +++ b/drivers/video/omap2/dss/display.c @@ -137,6 +137,9 @@ int omapdss_register_display(struct omap_dss_device *dssdev) snprintf(dssdev->alias, sizeof(dssdev->alias), "display%d", disp_num_counter++); + if (dssdev->name == NULL) + dssdev->name = dssdev->alias; + if (drv && drv->get_resolution == NULL) drv->get_resolution = omapdss_default_get_resolution; if (drv && drv->get_recommended_bpp == NULL) -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
