OMAPDSS: RFBI: Maitain copy of rfbi timings in driver data

The RFBI driver currently relies on the omap_dss_device struct to receive the
rfbi specific timings requested by the panel driver. This makes the RFBI
interface driver dependent on the omap_dss_device struct.

Make the RFBI driver data maintain it's own rfbi specific timings field. The
panel driver is expected to call omapdss_rfbi_set_interface_timings() to
configure the rfbi timings before the interface is enabled.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index 3ffd987..17ae85e 100644 (file)
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -307,6 +307,7 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev)
                dssdev->panel.timings.y_res);
        omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size);
        omapdss_rfbi_set_data_lines(dssdev, dssdev->phy.rfbi.data_lines);
+       omapdss_rfbi_set_interface_timings(dssdev, &dssdev->ctrl.rfbi_timings);
 
        r = omapdss_rfbi_display_enable(dssdev);
        if (r)

diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 698d5b9..5a9c0e9 100644 (file)
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -115,6 +115,7 @@ static struct {
        struct omap_video_timings timings;
        int pixel_size;
        int data_lines;
+       struct rfbi_timings intf_timings;
 } rfbi;
 
 static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
@@ -799,6 +800,13 @@ void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
 }
 EXPORT_SYMBOL(omapdss_rfbi_set_data_lines);
 
+void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
+               struct rfbi_timings *timings)
+{
+       rfbi.intf_timings = *timings;
+}
+EXPORT_SYMBOL(omapdss_rfbi_set_interface_timings);
+
 static void rfbi_dump_regs(struct seq_file *s)
 {
 #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, rfbi_read_reg(r))
@@ -907,9 +915,7 @@ int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
        rfbi_configure(dssdev->phy.rfbi.channel, rfbi.pixel_size,
                        rfbi.data_lines);
 
-       rfbi_set_timings(dssdev->phy.rfbi.channel,
-                        &dssdev->ctrl.rfbi_timings);
-
+       rfbi_set_timings(dssdev->phy.rfbi.channel, &rfbi.intf_timings);
 
        return 0;
 err1:

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index bf6d16b..b868123 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -765,5 +765,7 @@ void omapdss_rfbi_set_pixel_size(struct omap_dss_device *dssdev,
                int pixel_size);
 void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev,
                int data_lines);
+void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev,
+               struct rfbi_timings *timings);
 
 #endif