Skip to content

Commit

Permalink
OMAPDSS: DSS: remove legacy dss bus support
Browse files Browse the repository at this point in the history 
With all the old panels removed and all the old panel model APIs removed
from the DSS encoders, we can now remove the custom omapdss-bus which
was used in the old panel model.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
  • Loading branch information
Tomi Valkeinen committed Aug 30, 2013
1 parent c1e4535 commit b386429
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 302 deletions.
291 changes: 4 additions & 287 deletions drivers/video/omap2/dss/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,235 +248,6 @@ static struct platform_driver omap_dss_driver = {
},
};

/* BUS */
static int dss_bus_match(struct device *dev, struct device_driver *driver)
{
struct omap_dss_device *dssdev = to_dss_device(dev);

DSSDBG("bus_match. dev %s/%s, drv %s\n",
dev_name(dev), dssdev->driver_name, driver->name);

return strcmp(dssdev->driver_name, driver->name) == 0;
}

static struct bus_type dss_bus_type = {
.name = "omapdss",
.match = dss_bus_match,
};

static void dss_bus_release(struct device *dev)
{
DSSDBG("bus_release\n");
}

static struct device dss_bus = {
.release = dss_bus_release,
};

struct bus_type *dss_get_bus(void)
{
return &dss_bus_type;
}

/* DRIVER */
static int dss_driver_probe(struct device *dev)
{
int r;
struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
struct omap_dss_device *dssdev = to_dss_device(dev);

DSSDBG("driver_probe: dev %s/%s, drv %s\n",
dev_name(dev), dssdev->driver_name,
dssdrv->driver.name);

r = dssdrv->probe(dssdev);

if (r) {
DSSERR("driver probe failed: %d\n", r);
return r;
}

DSSDBG("probe done for device %s\n", dev_name(dev));

dssdev->driver = dssdrv;

return 0;
}

static int dss_driver_remove(struct device *dev)
{
struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
struct omap_dss_device *dssdev = to_dss_device(dev);

DSSDBG("driver_remove: dev %s/%s\n", dev_name(dev),
dssdev->driver_name);

dssdrv->remove(dssdev);

dssdev->driver = NULL;

return 0;
}

static int omapdss_default_connect(struct omap_dss_device *dssdev)
{
struct omap_dss_device *out;
struct omap_overlay_manager *mgr;
int r;

out = dssdev->output;

if (out == NULL)
return -ENODEV;

mgr = omap_dss_get_overlay_manager(out->dispc_channel);
if (!mgr)
return -ENODEV;

r = dss_mgr_connect(mgr, out);
if (r)
return r;

return 0;
}

static void omapdss_default_disconnect(struct omap_dss_device *dssdev)
{
struct omap_dss_device *out;
struct omap_overlay_manager *mgr;

out = dssdev->output;

if (out == NULL)
return;

mgr = out->manager;

if (mgr == NULL)
return;

dss_mgr_disconnect(mgr, out);
}

int omap_dss_register_driver(struct omap_dss_driver *dssdriver)
{
dssdriver->driver.bus = &dss_bus_type;
dssdriver->driver.probe = dss_driver_probe;
dssdriver->driver.remove = dss_driver_remove;

if (dssdriver->get_resolution == NULL)
dssdriver->get_resolution = omapdss_default_get_resolution;
if (dssdriver->get_recommended_bpp == NULL)
dssdriver->get_recommended_bpp =
omapdss_default_get_recommended_bpp;
if (dssdriver->get_timings == NULL)
dssdriver->get_timings = omapdss_default_get_timings;
if (dssdriver->connect == NULL)
dssdriver->connect = omapdss_default_connect;
if (dssdriver->disconnect == NULL)
dssdriver->disconnect = omapdss_default_disconnect;

return driver_register(&dssdriver->driver);
}
EXPORT_SYMBOL(omap_dss_register_driver);

void omap_dss_unregister_driver(struct omap_dss_driver *dssdriver)
{
driver_unregister(&dssdriver->driver);
}
EXPORT_SYMBOL(omap_dss_unregister_driver);

/* DEVICE */

static void omap_dss_dev_release(struct device *dev)
{
struct omap_dss_device *dssdev = to_dss_device(dev);
kfree(dssdev);
}

static int disp_num_counter;

struct omap_dss_device *dss_alloc_and_init_device(struct device *parent)
{
struct omap_dss_device *dssdev;

dssdev = kzalloc(sizeof(*dssdev), GFP_KERNEL);
if (!dssdev)
return NULL;

dssdev->old_dev.bus = &dss_bus_type;
dssdev->old_dev.parent = parent;
dssdev->old_dev.release = omap_dss_dev_release;
dev_set_name(&dssdev->old_dev, "display%d", disp_num_counter++);

device_initialize(&dssdev->old_dev);

return dssdev;
}

int dss_add_device(struct omap_dss_device *dssdev)
{
dssdev->dev = &dssdev->old_dev;

omapdss_register_display(dssdev);
return device_add(&dssdev->old_dev);
}

void dss_put_device(struct omap_dss_device *dssdev)
{
put_device(&dssdev->old_dev);
}

void dss_unregister_device(struct omap_dss_device *dssdev)
{
device_unregister(&dssdev->old_dev);
omapdss_unregister_display(dssdev);
}

static int dss_unregister_dss_dev(struct device *dev, void *data)
{
struct omap_dss_device *dssdev = to_dss_device(dev);
dss_unregister_device(dssdev);
return 0;
}

void dss_unregister_child_devices(struct device *parent)
{
device_for_each_child(parent, NULL, dss_unregister_dss_dev);
}

void dss_copy_device_pdata(struct omap_dss_device *dst,
const struct omap_dss_device *src)
{
u8 *d = (u8 *)dst;
u8 *s = (u8 *)src;
size_t dsize = sizeof(struct device);

memcpy(d + dsize, s + dsize, sizeof(struct omap_dss_device) - dsize);
}

/* BUS */
static int __init omap_dss_bus_register(void)
{
int r;

r = bus_register(&dss_bus_type);
if (r) {
DSSERR("bus register failed\n");
return r;
}

dev_set_name(&dss_bus, "omapdss");
r = device_register(&dss_bus);
if (r) {
DSSERR("bus driver register failed\n");
bus_unregister(&dss_bus_type);
return r;
}

return 0;
}

/* INIT */
static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
#ifdef CONFIG_OMAP2_DSS_DSI
Expand Down Expand Up @@ -522,7 +293,7 @@ static void (*dss_output_drv_unreg_funcs[])(void) __exitdata = {

static bool dss_output_drv_loaded[ARRAY_SIZE(dss_output_drv_reg_funcs)];

static int __init omap_dss_register_drivers(void)
static int __init omap_dss_init(void)
{
int r;
int i;
Expand Down Expand Up @@ -553,6 +324,8 @@ static int __init omap_dss_register_drivers(void)
dss_output_drv_loaded[i] = true;
}

dss_initialized = true;

return 0;

err_dispc:
Expand All @@ -563,7 +336,7 @@ static int __init omap_dss_register_drivers(void)
return r;
}

static void __exit omap_dss_unregister_drivers(void)
static void __exit omap_dss_exit(void)
{
int i;

Expand All @@ -578,64 +351,8 @@ static void __exit omap_dss_unregister_drivers(void)
platform_driver_unregister(&omap_dss_driver);
}

#ifdef CONFIG_OMAP2_DSS_MODULE
static void omap_dss_bus_unregister(void)
{
device_unregister(&dss_bus);

bus_unregister(&dss_bus_type);
}

static int __init omap_dss_init(void)
{
int r;

r = omap_dss_bus_register();
if (r)
return r;

r = omap_dss_register_drivers();
if (r) {
omap_dss_bus_unregister();
return r;
}

dss_initialized = true;

return 0;
}

static void __exit omap_dss_exit(void)
{
omap_dss_unregister_drivers();

omap_dss_bus_unregister();
}

module_init(omap_dss_init);
module_exit(omap_dss_exit);
#else
static int __init omap_dss_init(void)
{
return omap_dss_bus_register();
}

static int __init omap_dss_init2(void)
{
int r;

r = omap_dss_register_drivers();
if (r)
return r;

dss_initialized = true;

return 0;
}

core_initcall(omap_dss_init);
device_initcall(omap_dss_init2);
#endif

MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");
Expand Down
9 changes: 0 additions & 9 deletions drivers/video/omap2/dss/dss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,11 @@ struct platform_device;

/* core */
struct platform_device *dss_get_core_pdev(void);
struct bus_type *dss_get_bus(void);
int dss_dsi_enable_pads(int dsi_id, unsigned lane_mask);
void dss_dsi_disable_pads(int dsi_id, unsigned lane_mask);
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 *));

struct omap_dss_device *dss_alloc_and_init_device(struct device *parent);
int dss_add_device(struct omap_dss_device *dssdev);
void dss_unregister_device(struct omap_dss_device *dssdev);
void dss_unregister_child_devices(struct device *parent);
void dss_put_device(struct omap_dss_device *dssdev);
void dss_copy_device_pdata(struct omap_dss_device *dst,
const struct omap_dss_device *src);

/* display */
int dss_suspend_all_devices(void);
int dss_resume_all_devices(void);
Expand Down
6 changes: 0 additions & 6 deletions include/video/omapdss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,10 +703,6 @@ struct omapdss_dsi_ops {
};

struct omap_dss_device {
/* old device, to be removed */
struct device old_dev;

/* new device, pointer to panel device */
struct device *dev;

struct module *owner;
Expand Down Expand Up @@ -808,8 +804,6 @@ struct omap_dss_hdmi_data
};

struct omap_dss_driver {
struct device_driver driver;

int (*probe)(struct omap_dss_device *);
void (*remove)(struct omap_dss_device *);

Expand Down

0 comments on commit b386429

Please sign in to comment.