OMAPDSS: Add DSS features for AM43xx

Add DSS features for AM43xx.

Signed-off-by: Sathya Prakash M R <sathyap@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

5 files changed, 82 insertions, 0 deletions

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 4fe143166b74..3f612a0895d3 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -3656,6 +3656,7 @@ static int __init dispc_init_features(struct platform_device *pdev)
         case OMAPDSS_VER_OMAP34xx_ES3:
         case OMAPDSS_VER_OMAP3630:
         case OMAPDSS_VER_AM35xx:
+        case OMAPDSS_VER_AM43xx:
                 src = &omap34xx_rev3_0_dispc_feats;
                 break;
 
diff --git a/drivers/video/fbdev/omap2/dss/dpi.c b/drivers/video/fbdev/omap2/dss/dpi.c
index 157921db447a..10745261be52 100644
--- a/drivers/video/fbdev/omap2/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/dss/dpi.c
@@ -67,6 +67,7 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel)
         case OMAPDSS_VER_OMAP34xx_ES3:
         case OMAPDSS_VER_OMAP3630:
         case OMAPDSS_VER_AM35xx:
+        case OMAPDSS_VER_AM43xx:
                 return NULL;
 
         case OMAPDSS_VER_OMAP4430_ES1:
@@ -595,6 +596,7 @@ static enum omap_channel dpi_get_channel(void)
         case OMAPDSS_VER_OMAP34xx_ES3:
         case OMAPDSS_VER_OMAP3630:
         case OMAPDSS_VER_AM35xx:
+        case OMAPDSS_VER_AM43xx:
                 return OMAP_DSS_CHANNEL_LCD;
 
         case OMAPDSS_VER_OMAP4430_ES1:
diff --git a/drivers/video/fbdev/omap2/dss/dsi.c b/drivers/video/fbdev/omap2/dss/dsi.c
index 57f120896b43..90e0eff84867 100644
--- a/drivers/video/fbdev/omap2/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/dss/dsi.c
@@ -5132,6 +5132,7 @@ static enum omap_channel dsi_get_channel(int module_id)
 {
         switch (omapdss_get_version()) {
         case OMAPDSS_VER_OMAP24xx:
+        case OMAPDSS_VER_AM43xx:
                 DSSWARN("DSI not supported\n");
                 return OMAP_DSS_CHANNEL_LCD;
 
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 71524cb1b423..a6ef4c424ffa 100644
--- a/drivers/video/fbdev/omap2/dss/dss.c
+++ b/drivers/video/fbdev/omap2/dss/dss.c
@@ -728,6 +728,13 @@ static const struct dss_features omap54xx_dss_feats __initconst = {
         .dpi_select_source      =       &dss_dpi_select_source_omap5,
 };
 
+static const struct dss_features am43xx_dss_feats __initconst = {
+        .fck_div_max            =       0,
+        .dss_fck_multiplier     =       0,
+        .parent_clk_name        =       NULL,
+        .dpi_select_source      =       &dss_dpi_select_source_omap2_omap3,
+};
+
 static int __init dss_init_features(struct platform_device *pdev)
 {
         const struct dss_features *src;
@@ -764,6 +771,10 @@ static int __init dss_init_features(struct platform_device *pdev)
                 src = &omap54xx_dss_feats;
                 break;
 
+        case OMAPDSS_VER_AM43xx:
+                src = &am43xx_dss_feats;
+                break;
+
         default:
                 return -ENODEV;
         }
diff --git a/drivers/video/fbdev/omap2/dss/dss_features.c b/drivers/video/fbdev/omap2/dss/dss_features.c
index 7f8969191dc6..46542f82faef 100644
--- a/drivers/video/fbdev/omap2/dss/dss_features.c
+++ b/drivers/video/fbdev/omap2/dss/dss_features.c
@@ -93,6 +93,17 @@ static const struct dss_reg_field omap3_dss_reg_fields[] = {
         [FEAT_REG_DSIPLL_REGM_DSI]              = { 26, 23 },
 };
 
+static const struct dss_reg_field am43xx_dss_reg_fields[] = {
+        [FEAT_REG_FIRHINC]                      = { 12, 0 },
+        [FEAT_REG_FIRVINC]                      = { 28, 16 },
+        [FEAT_REG_FIFOLOWTHRESHOLD]     = { 11, 0 },
+        [FEAT_REG_FIFOHIGHTHRESHOLD]            = { 27, 16 },
+        [FEAT_REG_FIFOSIZE]             = { 10, 0 },
+        [FEAT_REG_HORIZONTALACCU]               = { 9, 0 },
+        [FEAT_REG_VERTICALACCU]                 = { 25, 16 },
+        [FEAT_REG_DISPC_CLK_SWITCH]             = { 0, 0 },
+};
+
 static const struct dss_reg_field omap4_dss_reg_fields[] = {
         [FEAT_REG_FIRHINC]                      = { 12, 0 },
         [FEAT_REG_FIRVINC]                      = { 28, 16 },
@@ -149,6 +160,11 @@ static const enum omap_display_type omap3630_dss_supported_displays[] = {
         OMAP_DISPLAY_TYPE_VENC,
 };
 
+static const enum omap_display_type am43xx_dss_supported_displays[] = {
+        /* OMAP_DSS_CHANNEL_LCD */
+        OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI,
+};
+
 static const enum omap_display_type omap4_dss_supported_displays[] = {
         /* OMAP_DSS_CHANNEL_LCD */
         OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI,
@@ -200,6 +216,11 @@ static const enum omap_dss_output_id omap3630_dss_supported_outputs[] = {
         OMAP_DSS_OUTPUT_VENC,
 };
 
+static const enum omap_dss_output_id am43xx_dss_supported_outputs[] = {
+        /* OMAP_DSS_CHANNEL_LCD */
+        OMAP_DSS_OUTPUT_DPI | OMAP_DSS_OUTPUT_DBI,
+};
+
 static const enum omap_dss_output_id omap4_dss_supported_outputs[] = {
         /* OMAP_DSS_CHANNEL_LCD */
         OMAP_DSS_OUTPUT_DBI | OMAP_DSS_OUTPUT_DSI1,
@@ -444,6 +465,13 @@ static const struct dss_param_range omap3_dss_param_range[] = {
         [FEAT_PARAM_LINEWIDTH]                  = { 1, 1024 },
 };
 
+static const struct dss_param_range am43xx_dss_param_range[] = {
+        [FEAT_PARAM_DSS_FCK]                    = { 0, 200000000 },
+        [FEAT_PARAM_DSS_PCD]                    = { 2, 255 },
+        [FEAT_PARAM_DOWNSCALE]                  = { 1, 4 },
+        [FEAT_PARAM_LINEWIDTH]                  = { 1, 1024 },
+};
+
 static const struct dss_param_range omap4_dss_param_range[] = {
         [FEAT_PARAM_DSS_FCK]                    = { 0, 186000000 },
         [FEAT_PARAM_DSS_PCD]                    = { 1, 255 },
@@ -520,6 +548,21 @@ static const enum dss_feat_id am35xx_dss_feat_list[] = {
         FEAT_OMAP3_DSI_FIFO_BUG,
 };
 
+static const enum dss_feat_id am43xx_dss_feat_list[] = {
+        FEAT_LCDENABLEPOL,
+        FEAT_LCDENABLESIGNAL,
+        FEAT_PCKFREEENABLE,
+        FEAT_FUNCGATED,
+        FEAT_LINEBUFFERSPLIT,
+        FEAT_ROWREPEATENABLE,
+        FEAT_RESIZECONF,
+        FEAT_CPR,
+        FEAT_PRELOAD,
+        FEAT_FIR_COEF_V,
+        FEAT_ALPHA_FIXED_ZORDER,
+        FEAT_FIFO_MERGE,
+};
+
 static const enum dss_feat_id omap3630_dss_feat_list[] = {
         FEAT_LCDENABLEPOL,
         FEAT_LCDENABLESIGNAL,
@@ -682,6 +725,26 @@ static const struct omap_dss_features am35xx_dss_features = {
         .burst_size_unit = 8,
 };
 
+static const struct omap_dss_features am43xx_dss_features = {
+        .reg_fields = am43xx_dss_reg_fields,
+        .num_reg_fields = ARRAY_SIZE(am43xx_dss_reg_fields),
+
+        .features = am43xx_dss_feat_list,
+        .num_features = ARRAY_SIZE(am43xx_dss_feat_list),
+
+        .num_mgrs = 1,
+        .num_ovls = 3,
+        .supported_displays = am43xx_dss_supported_displays,
+        .supported_outputs = am43xx_dss_supported_outputs,
+        .supported_color_modes = omap3_dss_supported_color_modes,
+        .overlay_caps = omap3430_dss_overlay_caps,
+        .clksrc_names = omap2_dss_clk_source_names,
+        .dss_params = am43xx_dss_param_range,
+        .supported_rotation_types = OMAP_DSS_ROT_DMA,
+        .buffer_size_unit = 1,
+        .burst_size_unit = 8,
+};
+
 static const struct omap_dss_features omap3630_dss_features = {
         .reg_fields = omap3_dss_reg_fields,
         .num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),
@@ -928,6 +991,10 @@ void dss_features_init(enum omapdss_version version)
                 omap_current_dss_features = &am35xx_dss_features;
                 break;
 
+        case OMAPDSS_VER_AM43xx:
+                omap_current_dss_features = &am43xx_dss_features;
+                break;
+
         default:
                 DSSWARN("Unsupported OMAP version");
                 break;