asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OMAPDSS: omap_dss_register_device() doesn't take display index

Browse source 
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: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2012-09-06 13:57:39 +03:00
parent fda7c362f9
commit 8768a52f8f
8 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/video/omap2/dss/core.c
View file

@ -450,16 +450,17 @@ static void omap_dss_dev_release(struct device *dev)
reset_device(dev, 0);
}
int omap_dss_register_device(struct omap_dss_device *dssdev,
struct device *parent, int disp_num)
{
WARN_ON(!dssdev->driver_name);
static int disp_num_counter;
int omap_dss_register_device(struct omap_dss_device *dssdev,
struct device *parent)
{
reset_device(&dssdev->dev, 1);
dssdev->dev.bus = &dss_bus_type;
dssdev->dev.parent = parent;
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);
}

2
drivers/video/omap2/dss/dpi.c
View file

@ -388,7 +388,7 @@ static void __init dpi_probe_pdata(struct platform_device *pdev)
continue;
}
r = omap_dss_register_device(dssdev, &pdev->dev, i);
r = omap_dss_register_device(dssdev, &pdev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);

2
drivers/video/omap2/dss/dsi.c
View file

@ -5027,7 +5027,7 @@ static void __init dsi_probe_pdata(struct platform_device *dsidev)
continue;
}
r = omap_dss_register_device(dssdev, &dsidev->dev, i);
r = omap_dss_register_device(dssdev, &dsidev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);

2
drivers/video/omap2/dss/dss.h
View file

@ -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 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_child_devices(struct device *parent);

2
drivers/video/omap2/dss/hdmi.c
View file

@ -923,7 +923,7 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
continue;
}
r = omap_dss_register_device(dssdev, &pdev->dev, i);
r = omap_dss_register_device(dssdev, &pdev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);

2
drivers/video/omap2/dss/rfbi.c
View file

@ -959,7 +959,7 @@ static void __init rfbi_probe_pdata(struct platform_device *pdev)
continue;
}
r = omap_dss_register_device(dssdev, &pdev->dev, i);
r = omap_dss_register_device(dssdev, &pdev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);

2
drivers/video/omap2/dss/sdi.c
View file

@ -212,7 +212,7 @@ static void __init sdi_probe_pdata(struct platform_device *pdev)
continue;
}
r = omap_dss_register_device(dssdev, &pdev->dev, i);
r = omap_dss_register_device(dssdev, &pdev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);

2
drivers/video/omap2/dss/venc.c
View file

@ -752,7 +752,7 @@ static void __init venc_probe_pdata(struct platform_device *pdev)
continue;
}
r = omap_dss_register_device(dssdev, &pdev->dev, i);
r = omap_dss_register_device(dssdev, &pdev->dev);
if (r)
DSSERR("device %s register failed: %d\n",
dssdev->name, r);