openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAPDSS: export dss_get_def_display_name() 

Export dss_get_def_display_name() with the name of
omapdss_get_def_display_name() so that omapfb can use it after the next
patch which moves default display handling to omapfb.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Tomi Valkeinen 2012-10-29 12:40:46 +02:00
parent c31cba8af8
commit 2bbcce5e0b
10 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/omap2/dss/core.c
View File

@ -53,10 +53,11 @@ static char *def_disp_name;
module_param_named(def_disp, def_disp_name, charp, 0); module_param_named(def_disp, def_disp_name, charp, 0);
MODULE_PARM_DESC(def_disp, "default display name"); MODULE_PARM_DESC(def_disp, "default display name");
const char *dss_get_default_display_name(void) const char *omapdss_get_default_display_name(void)
{ {
return core.default_display_name; return core.default_display_name;
} }
EXPORT_SYMBOL(omapdss_get_default_display_name);
enum omapdss_version omapdss_get_version(void) enum omapdss_version omapdss_get_version(void)
{ {

2
drivers/video/omap2/dss/display.c
View File

@ -394,7 +394,7 @@ int dss_init_device(struct platform_device *pdev,
{ {
struct device_attribute *attr; struct device_attribute *attr;
int i, r; int i, r;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
bool force; bool force;
force = def_disp_name && strcmp(def_disp_name, dssdev->name) == 0; force = def_disp_name && strcmp(def_disp_name, dssdev->name) == 0;

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

@ -389,7 +389,7 @@ static int __init dpi_init_display(struct omap_dss_device *dssdev)
static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init dpi_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

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

@ -5100,7 +5100,7 @@ static struct omap_dss_device * __init dsi_find_dssdev(struct platform_device *p
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
struct dsi_data *dsi = dsi_get_dsidrv_data(pdev); struct dsi_data *dsi = dsi_get_dsidrv_data(pdev);
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

1
drivers/video/omap2/dss/dss.h
View File

@ -160,7 +160,6 @@ struct seq_file;
struct platform_device; struct platform_device;
/* core */ /* core */
const char *dss_get_default_display_name(void);
struct bus_type *dss_get_bus(void); struct bus_type *dss_get_bus(void);
struct regulator *dss_get_vdds_dsi(void); struct regulator *dss_get_vdds_dsi(void);
struct regulator *dss_get_vdds_sdi(void); struct regulator *dss_get_vdds_sdi(void);

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

@ -910,7 +910,7 @@ int hdmi_audio_config(struct omap_dss_audio *audio)
static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init hdmi_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

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

@ -950,7 +950,7 @@ static int __init rfbi_init_display(struct omap_dss_device *dssdev)
static struct omap_dss_device * __init rfbi_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init rfbi_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

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

@ -205,7 +205,7 @@ static int __init sdi_init_display(struct omap_dss_device *dssdev)
static struct omap_dss_device * __init sdi_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init sdi_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

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

@ -744,7 +744,7 @@ static void venc_put_clocks(void)
static struct omap_dss_device * __init venc_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init venc_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
const char *def_disp_name = dss_get_default_display_name(); const char *def_disp_name = omapdss_get_default_display_name();
struct omap_dss_device *def_dssdev; struct omap_dss_device *def_dssdev;
int i; int i;

1
include/video/omapdss.h
View File

@ -753,6 +753,7 @@ void omap_dss_put_device(struct omap_dss_device *dssdev);
struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from); struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
struct omap_dss_device *omap_dss_find_device(void *data, struct omap_dss_device *omap_dss_find_device(void *data,
int (*match)(struct omap_dss_device *dssdev, void *data)); int (*match)(struct omap_dss_device *dssdev, void *data));
const char *omapdss_get_default_display_name(void);
int omap_dss_start_device(struct omap_dss_device *dssdev); int omap_dss_start_device(struct omap_dss_device *dssdev);
void omap_dss_stop_device(struct omap_dss_device *dssdev); void omap_dss_stop_device(struct omap_dss_device *dssdev);