OMAP2, 3: DSS2: RFBI: create platform_driver, move init, exit to driver

Hwmod adaptation design requires each of the DSS HW IP to be a platform driver.
So a platform_driver for RFBI is created and init exit methods are moved from core.c
to its driver probe,remove. pdev member has to be maintained by its own drivers.

RFBI platform driver is registered from inside omap_dss_probe, in the order desired.

Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 255935541d0d353efc194d84b6b6c0614936e7d5..8eef616fee037c0f3eb7bfaf9519341a4e11cc4e 100644 (file)
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -201,9 +201,9 @@ static int omap_dss_probe(struct platform_device *pdev)
        /* keep clocks enabled to prevent context saves/restores during init */
        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
-       r = rfbi_init();
+       r = rfbi_init_platform_driver();
        if (r) {
-               DSSERR("Failed to initialize rfbi\n");
+               DSSERR("Failed to initialize rfbi platform driver\n");
                goto err_rfbi;
        }
 
@@ -285,7 +285,7 @@ err_venc:
 err_dispc:
        dpi_exit();
 err_dpi:
-       rfbi_exit();
+       rfbi_uninit_platform_driver();
 err_rfbi:
        dss_uninit_platform_driver();
 err_dss:
@@ -303,7 +303,7 @@ static int omap_dss_remove(struct platform_device *pdev)
        venc_exit();
        dispc_exit();
        dpi_exit();
-       rfbi_exit();
+       rfbi_uninit_platform_driver();
        if (cpu_is_omap34xx()) {
                dsi_exit();
                sdi_exit();

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index c535ee1db3ee4960cfa12643298306e2740f42d2..0ba4bdbd6b01a5dd481a0378b856db560c788980 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -428,8 +428,8 @@ static inline void venc_exit(void)
 
 /* RFBI */
 #ifdef CONFIG_OMAP2_DSS_RFBI
-int rfbi_init(void);
-void rfbi_exit(void);
+int rfbi_init_platform_driver(void);
+void rfbi_uninit_platform_driver(void);
 void rfbi_dump_regs(struct seq_file *s);
 
 int rfbi_configure(int rfbi_module, int bpp, int lines);
@@ -440,11 +440,11 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
 unsigned long rfbi_get_max_tx_rate(void);
 int rfbi_init_display(struct omap_dss_device *display);
 #else
-static inline int rfbi_init(void)
+static inline int rfbi_init_platform_driver(void)
 {
        return 0;
 }
-static inline void rfbi_exit(void)
+static inline void rfbi_uninit_platform_driver(void)
 {
 }
 #endif

diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 10a2ffe02882e929f6c64250ba2ba9d87242ccaf..153f963e8e8939a809be68ee489c2f5346e80d60 100644 (file)
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -100,6 +100,7 @@ static int rfbi_convert_timings(struct rfbi_timings *t);
 static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div);
 
 static struct {
+       struct platform_device *pdev;
        void __iomem    *base;
 
        unsigned long   l4_khz;
@@ -957,50 +958,6 @@ void rfbi_dump_regs(struct seq_file *s)
 #undef DUMPREG
 }
 
-int rfbi_init(void)
-{
-       u32 rev;
-       u32 l;
-
-       spin_lock_init(&rfbi.cmd_lock);
-
-       init_completion(&rfbi.cmd_done);
-       atomic_set(&rfbi.cmd_fifo_full, 0);
-       atomic_set(&rfbi.cmd_pending, 0);
-
-       rfbi.base = ioremap(RFBI_BASE, SZ_256);
-       if (!rfbi.base) {
-               DSSERR("can't ioremap RFBI\n");
-               return -ENOMEM;
-       }
-
-       rfbi_enable_clocks(1);
-
-       msleep(10);
-
-       rfbi.l4_khz = dss_clk_get_rate(DSS_CLK_ICK) / 1000;
-
-       /* Enable autoidle and smart-idle */
-       l = rfbi_read_reg(RFBI_SYSCONFIG);
-       l |= (1 << 0) | (2 << 3);
-       rfbi_write_reg(RFBI_SYSCONFIG, l);
-
-       rev = rfbi_read_reg(RFBI_REVISION);
-       printk(KERN_INFO "OMAP RFBI rev %d.%d\n",
-              FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-
-       rfbi_enable_clocks(0);
-
-       return 0;
-}
-
-void rfbi_exit(void)
-{
-       DSSDBG("rfbi_exit\n");
-
-       iounmap(rfbi.base);
-}
-
 int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
 {
        int r;
@@ -1056,3 +1013,68 @@ int rfbi_init_display(struct omap_dss_device *dssdev)
        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
        return 0;
 }
+
+/* RFBI HW IP initialisation */
+static int omap_rfbihw_probe(struct platform_device *pdev)
+{
+       u32 rev;
+       u32 l;
+
+       rfbi.pdev = pdev;
+
+       spin_lock_init(&rfbi.cmd_lock);
+
+       init_completion(&rfbi.cmd_done);
+       atomic_set(&rfbi.cmd_fifo_full, 0);
+       atomic_set(&rfbi.cmd_pending, 0);
+
+       rfbi.base = ioremap(RFBI_BASE, SZ_256);
+       if (!rfbi.base) {
+               DSSERR("can't ioremap RFBI\n");
+               return -ENOMEM;
+       }
+
+       rfbi_enable_clocks(1);
+
+       msleep(10);
+
+       rfbi.l4_khz = dss_clk_get_rate(DSS_CLK_ICK) / 1000;
+
+       /* Enable autoidle and smart-idle */
+       l = rfbi_read_reg(RFBI_SYSCONFIG);
+       l |= (1 << 0) | (2 << 3);
+       rfbi_write_reg(RFBI_SYSCONFIG, l);
+
+       rev = rfbi_read_reg(RFBI_REVISION);
+       printk(KERN_INFO "OMAP RFBI rev %d.%d\n",
+              FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+       rfbi_enable_clocks(0);
+
+       return 0;
+}
+
+static int omap_rfbihw_remove(struct platform_device *pdev)
+{
+       iounmap(rfbi.base);
+       return 0;
+}
+
+static struct platform_driver omap_rfbihw_driver = {
+       .probe          = omap_rfbihw_probe,
+       .remove         = omap_rfbihw_remove,
+       .driver         = {
+               .name   = "omapdss_rfbi",
+               .owner  = THIS_MODULE,
+       },
+};
+
+int rfbi_init_platform_driver(void)
+{
+       return platform_driver_register(&omap_rfbihw_driver);
+}
+
+void rfbi_uninit_platform_driver(void)
+{
+       return platform_driver_unregister(&omap_rfbihw_driver);
+}