Commit a57dd4fe authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: create DPI & SDI drivers

We currently have separate device/driver for each DSS HW module. The DPI
and SDI outputs are more or less parts of the DSS or DISPC hardware
modules, but in SW it makes sense to represent them as device/driver
pairs similarly to all the other outputs. This also makes sense for
device tree, as each node under dss will be a platform device, and
handling DPI & SDI somehow differently than the rest would just make the
code more complex.

This patch modifies the dpi.c and sdi.c to create drivers for the
platform devices.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 53f576a8
...@@ -536,6 +536,18 @@ static int __init omap_dss_register_drivers(void) ...@@ -536,6 +536,18 @@ static int __init omap_dss_register_drivers(void)
goto err_dispc; goto err_dispc;
} }
r = dpi_init_platform_driver();
if (r) {
DSSERR("Failed to initialize dpi platform driver\n");
goto err_dpi;
}
r = sdi_init_platform_driver();
if (r) {
DSSERR("Failed to initialize sdi platform driver\n");
goto err_sdi;
}
r = rfbi_init_platform_driver(); r = rfbi_init_platform_driver();
if (r) { if (r) {
DSSERR("Failed to initialize rfbi platform driver\n"); DSSERR("Failed to initialize rfbi platform driver\n");
...@@ -569,6 +581,10 @@ static int __init omap_dss_register_drivers(void) ...@@ -569,6 +581,10 @@ static int __init omap_dss_register_drivers(void)
err_venc: err_venc:
rfbi_uninit_platform_driver(); rfbi_uninit_platform_driver();
err_rfbi: err_rfbi:
sdi_uninit_platform_driver();
err_sdi:
dpi_uninit_platform_driver();
err_dpi:
dispc_uninit_platform_driver(); dispc_uninit_platform_driver();
err_dispc: err_dispc:
dss_uninit_platform_driver(); dss_uninit_platform_driver();
...@@ -584,6 +600,8 @@ static void __exit omap_dss_unregister_drivers(void) ...@@ -584,6 +600,8 @@ static void __exit omap_dss_unregister_drivers(void)
dsi_uninit_platform_driver(); dsi_uninit_platform_driver();
venc_uninit_platform_driver(); venc_uninit_platform_driver();
rfbi_uninit_platform_driver(); rfbi_uninit_platform_driver();
sdi_uninit_platform_driver();
dpi_uninit_platform_driver();
dispc_uninit_platform_driver(); dispc_uninit_platform_driver();
dss_uninit_platform_driver(); dss_uninit_platform_driver();
......
...@@ -379,12 +379,31 @@ int dpi_init_display(struct omap_dss_device *dssdev) ...@@ -379,12 +379,31 @@ int dpi_init_display(struct omap_dss_device *dssdev)
return 0; return 0;
} }
int dpi_init(void) static int omap_dpi_probe(struct platform_device *pdev)
{ {
return 0; return 0;
} }
void dpi_exit(void) static int omap_dpi_remove(struct platform_device *pdev)
{ {
return 0;
} }
static struct platform_driver omap_dpi_driver = {
.probe = omap_dpi_probe,
.remove = omap_dpi_remove,
.driver = {
.name = "omapdss_dpi",
.owner = THIS_MODULE,
},
};
int dpi_init_platform_driver(void)
{
return platform_driver_register(&omap_dpi_driver);
}
void dpi_uninit_platform_driver(void)
{
platform_driver_unregister(&omap_dpi_driver);
}
...@@ -786,18 +786,6 @@ static int omap_dsshw_probe(struct platform_device *pdev) ...@@ -786,18 +786,6 @@ static int omap_dsshw_probe(struct platform_device *pdev)
dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK; dss.lcd_clk_source[0] = OMAP_DSS_CLK_SRC_FCK;
dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK; dss.lcd_clk_source[1] = OMAP_DSS_CLK_SRC_FCK;
r = dpi_init();
if (r) {
DSSERR("Failed to initialize DPI\n");
goto err_dpi;
}
r = sdi_init();
if (r) {
DSSERR("Failed to initialize SDI\n");
goto err_sdi;
}
rev = dss_read_reg(DSS_REVISION); rev = dss_read_reg(DSS_REVISION);
printk(KERN_INFO "OMAP DSS rev %d.%d\n", printk(KERN_INFO "OMAP DSS rev %d.%d\n",
FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
...@@ -805,10 +793,7 @@ static int omap_dsshw_probe(struct platform_device *pdev) ...@@ -805,10 +793,7 @@ static int omap_dsshw_probe(struct platform_device *pdev)
dss_runtime_put(); dss_runtime_put();
return 0; return 0;
err_sdi:
dpi_exit();
err_dpi:
dss_runtime_put();
err_runtime_get: err_runtime_get:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
dss_put_clocks(); dss_put_clocks();
...@@ -817,9 +802,6 @@ static int omap_dsshw_probe(struct platform_device *pdev) ...@@ -817,9 +802,6 @@ static int omap_dsshw_probe(struct platform_device *pdev)
static int omap_dsshw_remove(struct platform_device *pdev) static int omap_dsshw_remove(struct platform_device *pdev)
{ {
dpi_exit();
sdi_exit();
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
dss_put_clocks(); dss_put_clocks();
......
...@@ -272,17 +272,12 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck, ...@@ -272,17 +272,12 @@ int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
/* SDI */ /* SDI */
#ifdef CONFIG_OMAP2_DSS_SDI #ifdef CONFIG_OMAP2_DSS_SDI
int sdi_init(void); int sdi_init_platform_driver(void);
void sdi_exit(void); void sdi_uninit_platform_driver(void);
int sdi_init_display(struct omap_dss_device *display); int sdi_init_display(struct omap_dss_device *display);
#else #else
static inline int sdi_init(void) static inline int sdi_init_platform_driver(void) { return 0; }
{ static inline void sdi_uninit_platform_driver(void) { }
return 0;
}
static inline void sdi_exit(void)
{
}
#endif #endif
/* DSI */ /* DSI */
...@@ -384,17 +379,12 @@ static inline struct platform_device *dsi_get_dsidev_from_id(int module) ...@@ -384,17 +379,12 @@ static inline struct platform_device *dsi_get_dsidev_from_id(int module)
/* DPI */ /* DPI */
#ifdef CONFIG_OMAP2_DSS_DPI #ifdef CONFIG_OMAP2_DSS_DPI
int dpi_init(void); int dpi_init_platform_driver(void);
void dpi_exit(void); void dpi_uninit_platform_driver(void);
int dpi_init_display(struct omap_dss_device *dssdev); int dpi_init_display(struct omap_dss_device *dssdev);
#else #else
static inline int dpi_init(void) static inline int dpi_init_platform_driver(void) { return 0; }
{ static inline void dpi_uninit_platform_driver(void) { }
return 0;
}
static inline void dpi_exit(void)
{
}
#endif #endif
/* DISPC */ /* DISPC */
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/platform_device.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include "dss.h" #include "dss.h"
...@@ -182,11 +183,31 @@ int sdi_init_display(struct omap_dss_device *dssdev) ...@@ -182,11 +183,31 @@ int sdi_init_display(struct omap_dss_device *dssdev)
return 0; return 0;
} }
int sdi_init(void) static int omap_sdi_probe(struct platform_device *pdev)
{ {
return 0; return 0;
} }
void sdi_exit(void) static int omap_sdi_remove(struct platform_device *pdev)
{ {
return 0;
}
static struct platform_driver omap_sdi_driver = {
.probe = omap_sdi_probe,
.remove = omap_sdi_remove,
.driver = {
.name = "omapdss_sdi",
.owner = THIS_MODULE,
},
};
int sdi_init_platform_driver(void)
{
return platform_driver_register(&omap_sdi_driver);
}
void sdi_uninit_platform_driver(void)
{
platform_driver_unregister(&omap_sdi_driver);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment