Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f2bcd06 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: add 'label' support for DT 



Add support to get the label (i.e. a "nickname") for a display from the
DT data. If there is no label defined, use the display's alias (e.g.
'display0') as a name.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarArchit Taneja <archit@ti.com>
parent 6a0e6b38

drivers/video/omap2/dss/display.c

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/module.h>

#include <linux/jiffies.h>

#include <linux/platform_device.h>

#include <linux/of.h>



#include <video/omapdss.h>

#include "dss.h"
@@ -137,6 +138,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev) 
	snprintf(dssdev->alias, sizeof(dssdev->alias),

			"display%d", disp_num_counter++);



	/* Use 'label' property for name, if it exists */

	if (dssdev->dev->of_node)

		of_property_read_string(dssdev->dev->of_node, "label",

			&dssdev->name);



	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)