drm: omapdrm: Move DISPC_CLK_SWITCH reg feature to struct dss_features

The register belongs to the DSS, move the feature to the dss_features
structure.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 3d6b1e8ec0c0823f2960b67d2f2b660c5a13a036..d145d9eedfa7260de2ab22d0cb1cec06f6a6b298 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -86,6 +86,7 @@ struct dss_features {
        const enum omap_display_type *ports;
        int num_ports;
        const struct dss_ops *ops;
+       struct dss_reg_field dispc_clk_switch;
 };
 
 static struct {
@@ -427,7 +428,6 @@ static int dss_get_channel_index(enum omap_channel channel)
 static void dss_select_dispc_clk_source(enum dss_clk_source clk_src)
 {
        int b;
-       u8 start, end;
 
        /*
         * We always use PRCM clock as the DISPC func clock, except on DSS3,
@@ -452,9 +452,9 @@ static void dss_select_dispc_clk_source(enum dss_clk_source clk_src)
                return;
        }
 
-       dss_feat_get_reg_field(FEAT_REG_DISPC_CLK_SWITCH, &start, &end);
-
-       REG_FLD_MOD(DSS_CONTROL, b, start, end);        /* DISPC_CLK_SWITCH */
+       REG_FLD_MOD(DSS_CONTROL, b,                     /* DISPC_CLK_SWITCH */
+                   dss.feat->dispc_clk_switch.start,
+                   dss.feat->dispc_clk_switch.end);
 
        dss.dispc_clk_source = clk_src;
 }
@@ -1010,6 +1010,7 @@ static const struct dss_features omap24xx_dss_feats = {
        .ports                  =       omap2plus_ports,
        .num_ports              =       ARRAY_SIZE(omap2plus_ports),
        .ops                    =       &dss_ops_omap2_omap3,
+       .dispc_clk_switch       =       { 0, 0 },
 };
 
 static const struct dss_features omap34xx_dss_feats = {
@@ -1020,6 +1021,7 @@ static const struct dss_features omap34xx_dss_feats = {
        .ports                  =       omap34xx_ports,
        .num_ports              =       ARRAY_SIZE(omap34xx_ports),
        .ops                    =       &dss_ops_omap2_omap3,
+       .dispc_clk_switch       =       { 0, 0 },
 };
 
 static const struct dss_features omap3630_dss_feats = {
@@ -1030,6 +1032,7 @@ static const struct dss_features omap3630_dss_feats = {
        .ports                  =       omap2plus_ports,
        .num_ports              =       ARRAY_SIZE(omap2plus_ports),
        .ops                    =       &dss_ops_omap2_omap3,
+       .dispc_clk_switch       =       { 0, 0 },
 };
 
 static const struct dss_features omap44xx_dss_feats = {
@@ -1040,6 +1043,7 @@ static const struct dss_features omap44xx_dss_feats = {
        .ports                  =       omap2plus_ports,
        .num_ports              =       ARRAY_SIZE(omap2plus_ports),
        .ops                    =       &dss_ops_omap4,
+       .dispc_clk_switch       =       { 9, 8 },
 };
 
 static const struct dss_features omap54xx_dss_feats = {
@@ -1050,6 +1054,7 @@ static const struct dss_features omap54xx_dss_feats = {
        .ports                  =       omap2plus_ports,
        .num_ports              =       ARRAY_SIZE(omap2plus_ports),
        .ops                    =       &dss_ops_omap5,
+       .dispc_clk_switch       =       { 9, 7 },
 };
 
 static const struct dss_features am43xx_dss_feats = {
@@ -1060,6 +1065,7 @@ static const struct dss_features am43xx_dss_feats = {
        .ports                  =       omap2plus_ports,
        .num_ports              =       ARRAY_SIZE(omap2plus_ports),
        .ops                    =       &dss_ops_omap2_omap3,
+       .dispc_clk_switch       =       { 0, 0 },
 };
 
 static const struct dss_features dra7xx_dss_feats = {
@@ -1070,6 +1076,7 @@ static const struct dss_features dra7xx_dss_feats = {
        .ports                  =       dra7xx_ports,
        .num_ports              =       ARRAY_SIZE(dra7xx_ports),
        .ops                    =       &dss_ops_dra7,
+       .dispc_clk_switch       =       { 9, 7 },
 };
 
 static int dss_init_ports(struct platform_device *pdev)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index b7ce0eacdd0ef88e63769043c8ee7f851adf7b29..ac642607321efa29cdc5723c6f7d19b625c550a4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -200,6 +200,11 @@ struct dss_pll {
        struct dss_pll_clock_info cinfo;
 };
 
+/* Defines a generic omap register field */
+struct dss_reg_field {
+       u8 start, end;
+};
+
 struct dispc_clock_info {
        /* rates that we get with dividers below */
        unsigned long lck;

diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.c b/drivers/gpu/drm/omapdrm/dss/dss_features.c
index faa9bc3c03b2c6ec445828aab1a088481ac89493..04848196780e429dd95208049bb47514603f9816 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.c
@@ -28,11 +28,6 @@
 #include "dss.h"
 #include "dss_features.h"
 
-/* Defines a generic omap register field */
-struct dss_reg_field {
-       u8 start, end;
-};
-
 struct dss_param_range {
        int min, max;
 };
@@ -59,7 +54,6 @@ static const struct dss_reg_field omap2_dss_reg_fields[] = {
        [FEAT_REG_FIFOSIZE]                     = { 8, 0 },
        [FEAT_REG_HORIZONTALACCU]               = { 9, 0 },
        [FEAT_REG_VERTICALACCU]                 = { 25, 16 },
-       [FEAT_REG_DISPC_CLK_SWITCH]             = { 0, 0 },
 };
 
 static const struct dss_reg_field omap3_dss_reg_fields[] = {
@@ -70,7 +64,6 @@ static const struct dss_reg_field omap3_dss_reg_fields[] = {
        [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 am43xx_dss_reg_fields[] = {
@@ -81,7 +74,6 @@ static const struct dss_reg_field am43xx_dss_reg_fields[] = {
        [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[] = {
@@ -92,7 +84,6 @@ static const struct dss_reg_field omap4_dss_reg_fields[] = {
        [FEAT_REG_FIFOSIZE]                     = { 15, 0 },
        [FEAT_REG_HORIZONTALACCU]               = { 10, 0 },
        [FEAT_REG_VERTICALACCU]                 = { 26, 16 },
-       [FEAT_REG_DISPC_CLK_SWITCH]             = { 9, 8 },
 };
 
 static const struct dss_reg_field omap5_dss_reg_fields[] = {
@@ -103,7 +94,6 @@ static const struct dss_reg_field omap5_dss_reg_fields[] = {
        [FEAT_REG_FIFOSIZE]                     = { 15, 0 },
        [FEAT_REG_HORIZONTALACCU]               = { 10, 0 },
        [FEAT_REG_VERTICALACCU]                 = { 26, 16 },
-       [FEAT_REG_DISPC_CLK_SWITCH]             = { 9, 7 },
 };
 
 static const enum omap_dss_output_id omap2_dss_supported_outputs[] = {

diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
index 89a36d2b57a701b08eb5a646586eb7b93cab0efa..e0e825db4b0ae4ee56a1836b52da082dd6884340 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss_features.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss_features.h
@@ -73,7 +73,6 @@ enum dss_feat_reg_field {
        FEAT_REG_FIFOSIZE,
        FEAT_REG_HORIZONTALACCU,
        FEAT_REG_VERTICALACCU,
-       FEAT_REG_DISPC_CLK_SWITCH,
 };
 
 enum dss_range_param {