OMAPDSS: DSS: Cleanup cpu_is_xxxx checks

All the cpu_is checks have been moved to dss_init_features function providing a
much more generic and cleaner interface. The OMAP version and revision specific
initializations in various functions are cleaned and the necessary data are
moved to dss_features structure which is local to dss.c.

Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index e2e0fa453c666491df641c2e0b357ff6c3e7da53..31a553a6ee6f2dd08ab579e451ed6e880e242bb4 100644 (file)
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -31,6 +31,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>

+#include <linux/gfp.h>

 
 #include <video/omapdss.h>
 
 
 #include <video/omapdss.h>
 


@@ -65,6 +66,12 @@ struct dss_reg {
 static int dss_runtime_get(void);
 static void dss_runtime_put(void);
 
 static int dss_runtime_get(void);
 static void dss_runtime_put(void);
 

+struct dss_features {
+       u8 fck_div_max;
+       u8 dss_fck_multiplier;
+       const char *clk_name;
+};
+

 static struct {
        struct platform_device *pdev;
        void __iomem    *base;
 static struct {
        struct platform_device *pdev;
        void __iomem    *base;


@@ -83,6 +90,8 @@ static struct {
 
        bool            ctx_valid;
        u32             ctx[DSS_SZ_REGS / sizeof(u32)];
 
        bool            ctx_valid;
        u32             ctx[DSS_SZ_REGS / sizeof(u32)];

+
+       const struct dss_features *feat;

 } dss;
 
 static const char * const dss_generic_clk_source_names[] = {
 } dss;
 
 static const char * const dss_generic_clk_source_names[] = {


@@ -91,6 +100,30 @@ static const char * const dss_generic_clk_source_names[] = {
        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_FCK",
 };
 
        [OMAP_DSS_CLK_SRC_FCK]                  = "DSS_FCK",
 };
 

+static const struct dss_features omap24xx_dss_feats __initconst = {
+       .fck_div_max            =       16,
+       .dss_fck_multiplier     =       2,
+       .clk_name               =       NULL,
+};
+
+static const struct dss_features omap34xx_dss_feats __initconst = {
+       .fck_div_max            =       16,
+       .dss_fck_multiplier     =       2,
+       .clk_name               =       "dpll4_m4_ck",
+};
+
+static const struct dss_features omap3630_dss_feats __initconst = {
+       .fck_div_max            =       32,
+       .dss_fck_multiplier     =       1,
+       .clk_name               =       "dpll4_m4_ck",
+};
+
+static const struct dss_features omap44xx_dss_feats __initconst = {
+       .fck_div_max            =       32,
+       .dss_fck_multiplier     =       1,
+       .clk_name               =       "dpll_per_m5x2_ck",
+};
+

 static inline void dss_write_reg(const struct dss_reg idx, u32 val)
 {
        __raw_writel(val, dss.base + idx.idx);
 static inline void dss_write_reg(const struct dss_reg idx, u32 val)
 {
        __raw_writel(val, dss.base + idx.idx);


@@ -236,7 +269,6 @@ const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src)
        return dss_generic_clk_source_names[clk_src];
 }
 
        return dss_generic_clk_source_names[clk_src];
 }
 

-

 void dss_dump_clocks(struct seq_file *s)
 {
        unsigned long dpll4_ck_rate;
 void dss_dump_clocks(struct seq_file *s)
 {
        unsigned long dpll4_ck_rate;


@@ -259,18 +291,10 @@ void dss_dump_clocks(struct seq_file *s)
 
                seq_printf(s, "dpll4_ck %lu\n", dpll4_ck_rate);
 
 
                seq_printf(s, "dpll4_ck %lu\n", dpll4_ck_rate);
 

-               if (cpu_is_omap3630() || cpu_is_omap44xx())
-                       seq_printf(s, "%s (%s) = %lu / %lu  = %lu\n",
-                                       fclk_name, fclk_real_name,
-                                       dpll4_ck_rate,
-                                       dpll4_ck_rate / dpll4_m4_ck_rate,
-                                       fclk_rate);
-               else
-                       seq_printf(s, "%s (%s) = %lu / %lu * 2 = %lu\n",
-                                       fclk_name, fclk_real_name,
-                                       dpll4_ck_rate,
-                                       dpll4_ck_rate / dpll4_m4_ck_rate,
-                                       fclk_rate);
+               seq_printf(s, "%s (%s) = %lu / %lu * %d  = %lu\n",
+                               fclk_name, fclk_real_name, dpll4_ck_rate,
+                               dpll4_ck_rate / dpll4_m4_ck_rate,
+                               dss.feat->dss_fck_multiplier, fclk_rate);

        } else {
                seq_printf(s, "%s (%s) = %lu\n",
                                fclk_name, fclk_real_name,
        } else {
                seq_printf(s, "%s (%s) = %lu\n",
                                fclk_name, fclk_real_name,


@@ -470,7 +494,7 @@ int dss_calc_clock_div(unsigned long req_pck, struct dss_clock_info *dss_cinfo,
 
        unsigned long fck, max_dss_fck;
 
 
        unsigned long fck, max_dss_fck;
 

-       u16 fck_div, fck_div_max = 16;
+       u16 fck_div;

 
        int match = 0;
        int min_fck_per_pck;
 
        int match = 0;
        int min_fck_per_pck;


@@ -480,9 +504,8 @@ int dss_calc_clock_div(unsigned long req_pck, struct dss_clock_info *dss_cinfo,
        max_dss_fck = dss_feat_get_param_max(FEAT_PARAM_DSS_FCK);
 
        fck = clk_get_rate(dss.dss_clk);
        max_dss_fck = dss_feat_get_param_max(FEAT_PARAM_DSS_FCK);
 
        fck = clk_get_rate(dss.dss_clk);

-       if (req_pck == dss.cache_req_pck &&
-                       ((cpu_is_omap34xx() && prate == dss.cache_prate) ||
-                        dss.cache_dss_cinfo.fck == fck)) {
+       if (req_pck == dss.cache_req_pck && prate == dss.cache_prate &&
+               dss.cache_dss_cinfo.fck == fck) {

                DSSDBG("dispc clock info found from cache.\n");
                *dss_cinfo = dss.cache_dss_cinfo;
                *dispc_cinfo = dss.cache_dispc_cinfo;
                DSSDBG("dispc clock info found from cache.\n");
                *dss_cinfo = dss.cache_dss_cinfo;
                *dispc_cinfo = dss.cache_dispc_cinfo;


@@ -519,16 +542,10 @@ retry:
 
                goto found;
        } else {
 
                goto found;
        } else {

-               if (cpu_is_omap3630() || cpu_is_omap44xx())
-                       fck_div_max = 32;
-
-               for (fck_div = fck_div_max; fck_div > 0; --fck_div) {
+               for (fck_div = dss.feat->fck_div_max; fck_div > 0; --fck_div) {

                        struct dispc_clock_info cur_dispc;
 
                        struct dispc_clock_info cur_dispc;
 

-                       if (fck_div_max == 32)
-                               fck = prate / fck_div;
-                       else
-                               fck = prate / fck_div * 2;
+                       fck = prate / fck_div * dss.feat->dss_fck_multiplier;

 
                        if (fck > max_dss_fck)
                                continue;
 
                        if (fck > max_dss_fck)
                                continue;


@@ -645,22 +662,11 @@ static int dss_get_clocks(void)
 
        dss.dss_clk = clk;
 
 
        dss.dss_clk = clk;
 

-       if (cpu_is_omap34xx()) {
-               clk = clk_get(NULL, "dpll4_m4_ck");
-               if (IS_ERR(clk)) {
-                       DSSERR("Failed to get dpll4_m4_ck\n");
-                       r = PTR_ERR(clk);
-                       goto err;
-               }
-       } else if (cpu_is_omap44xx()) {
-               clk = clk_get(NULL, "dpll_per_m5x2_ck");
-               if (IS_ERR(clk)) {
-                       DSSERR("Failed to get dpll_per_m5x2_ck\n");
-                       r = PTR_ERR(clk);
-                       goto err;
-               }
-       } else { /* omap24xx */
-               clk = NULL;
+       clk = clk_get(NULL, dss.feat->clk_name);
+       if (IS_ERR(clk)) {
+               DSSERR("Failed to get %s\n", dss.feat->clk_name);
+               r = PTR_ERR(clk);
+               goto err;

        }
 
        dss.dpll4_m4_ck = clk;
        }
 
        dss.dpll4_m4_ck = clk;


@@ -716,6 +722,34 @@ void dss_debug_dump_clocks(struct seq_file *s)
 }
 #endif
 
 }
 #endif
 

+static int __init dss_init_features(struct device *dev)
+{
+       const struct dss_features *src;
+       struct dss_features *dst;
+
+       dst = devm_kzalloc(dev, sizeof(*dst), GFP_KERNEL);
+       if (!dst) {
+               dev_err(dev, "Failed to allocate local DSS Features\n");
+               return -ENOMEM;
+       }
+
+       if (cpu_is_omap24xx())
+               src = &omap24xx_dss_feats;
+       else if (cpu_is_omap34xx())
+               src = &omap34xx_dss_feats;
+       else if (cpu_is_omap3630())
+               src = &omap3630_dss_feats;
+       else if (cpu_is_omap44xx())
+               src = &omap44xx_dss_feats;
+       else
+               return -ENODEV;
+
+       memcpy(dst, src, sizeof(*dst));
+       dss.feat = dst;
+
+       return 0;
+}
+

 /* DSS HW IP initialisation */
 static int __init omap_dsshw_probe(struct platform_device *pdev)
 {
 /* DSS HW IP initialisation */
 static int __init omap_dsshw_probe(struct platform_device *pdev)
 {


@@ -725,6 +759,10 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
 
        dss.pdev = pdev;
 
 
        dss.pdev = pdev;
 

+       r = dss_init_features(&dss.pdev->dev);
+       if (r)
+               return r;
+

        dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
        if (!dss_mem) {
                DSSERR("can't get IORESOURCE_MEM DSS\n");
        dss_mem = platform_get_resource(dss.pdev, IORESOURCE_MEM, 0);
        if (!dss_mem) {
                DSSERR("can't get IORESOURCE_MEM DSS\n");