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

Commit 8768a52f authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: omap_dss_register_device() doesn't take display index 



We used to have all the displays of the board in one list, and we made a
"displayX" directory in the sysfs, where X was the index of the display
in the list.

This doesn't work anymore with device tree, as there's no single list to
get the number from, and it doesn't work very well even with non-DT as
we need to do some tricks to get the index nowadays.

This patch changes omap_dss_register_device() so that it doesn't take
disp_num as a parameter anymore, but uses a private increasing counter
for the display number.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent fda7c362

drivers/video/omap2/dss/core.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -450,16 +450,17 @@ static void omap_dss_dev_release(struct device *dev) 
	reset_device(dev, 0);

	reset_device(dev, 0);

}

}





static int disp_num_counter;



int omap_dss_register_device(struct omap_dss_device *dssdev,

int omap_dss_register_device(struct omap_dss_device *dssdev,

		struct device *parent, int disp_num)

		struct device *parent)

{

{

	WARN_ON(!dssdev->driver_name);



	reset_device(&dssdev->dev, 1);

	reset_device(&dssdev->dev, 1);



	dssdev->dev.bus = &dss_bus_type;

	dssdev->dev.bus = &dss_bus_type;

	dssdev->dev.parent = parent;

	dssdev->dev.parent = parent;

	dssdev->dev.release = omap_dss_dev_release;

	dssdev->dev.release = omap_dss_dev_release;

	dev_set_name(&dssdev->dev, "display%d", disp_num);

	dev_set_name(&dssdev->dev, "display%d", disp_num_counter++);

	return device_register(&dssdev->dev);

	return device_register(&dssdev->dev);

}

}

drivers/video/omap2/dss/dpi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -388,7 +388,7 @@ static void __init dpi_probe_pdata(struct platform_device *pdev) 
			continue;

			continue;

		}

		}





		r = omap_dss_register_device(dssdev, &pdev->dev, i);

		r = omap_dss_register_device(dssdev, &pdev->dev);

		if (r)

		if (r)

			DSSERR("device %s register failed: %d\n",

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

					dssdev->name, r);

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5027,7 +5027,7 @@ static void __init dsi_probe_pdata(struct platform_device *dsidev) 
			continue;

			continue;

		}

		}





		r = omap_dss_register_device(dssdev, &dsidev->dev, i);

		r = omap_dss_register_device(dssdev, &dsidev->dev);

		if (r)

		if (r)

			DSSERR("device %s register failed: %d\n",

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

					dssdev->name, r);

drivers/video/omap2/dss/dss.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ int dss_set_min_bus_tput(struct device *dev, unsigned long tput); 
int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *));

int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *));





int omap_dss_register_device(struct omap_dss_device *dssdev,

int omap_dss_register_device(struct omap_dss_device *dssdev,

		struct device *parent, int disp_num);

		struct device *parent);

void omap_dss_unregister_device(struct omap_dss_device *dssdev);

void omap_dss_unregister_device(struct omap_dss_device *dssdev);

void omap_dss_unregister_child_devices(struct device *parent);

void omap_dss_unregister_child_devices(struct device *parent);

drivers/video/omap2/dss/hdmi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -923,7 +923,7 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev) 
			continue;

			continue;

		}

		}





		r = omap_dss_register_device(dssdev, &pdev->dev, i);

		r = omap_dss_register_device(dssdev, &pdev->dev);

		if (r)

		if (r)

			DSSERR("device %s register failed: %d\n",

			DSSERR("device %s register failed: %d\n",

					dssdev->name, r);

					dssdev->name, r);