diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-21 05:03:31 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-24 09:50:08 -0400 |
commit | 84273a9593306926af56ad5b4a69029c2886c5de (patch) | |
tree | adc114dad5520990b8d6f0be3dbcdd51f81ec1d3 /drivers/video/omap2 | |
parent | 233628328037c02cf3db6165cab5d3f43587c5f3 (diff) |
OMAPDSS: move dss feats to the end of dss.c
Move dss_features to the end of dss.c the same way they are in dispc.c,
so that we don't have to declare prototypes for static feat-related
functions.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r-- | drivers/video/omap2/dss/dss.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 4524c174ac50..660813b01197 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c | |||
@@ -99,36 +99,6 @@ static const char * const dss_generic_clk_source_names[] = { | |||
99 | [OMAP_DSS_CLK_SRC_FCK] = "DSS_FCK", | 99 | [OMAP_DSS_CLK_SRC_FCK] = "DSS_FCK", |
100 | }; | 100 | }; |
101 | 101 | ||
102 | static const struct dss_features omap24xx_dss_feats __initconst = { | ||
103 | .fck_div_max = 16, | ||
104 | .dss_fck_multiplier = 2, | ||
105 | .clk_name = NULL, | ||
106 | }; | ||
107 | |||
108 | static const struct dss_features omap34xx_dss_feats __initconst = { | ||
109 | .fck_div_max = 16, | ||
110 | .dss_fck_multiplier = 2, | ||
111 | .clk_name = "dpll4_m4_ck", | ||
112 | }; | ||
113 | |||
114 | static const struct dss_features omap3630_dss_feats __initconst = { | ||
115 | .fck_div_max = 32, | ||
116 | .dss_fck_multiplier = 1, | ||
117 | .clk_name = "dpll4_m4_ck", | ||
118 | }; | ||
119 | |||
120 | static const struct dss_features omap44xx_dss_feats __initconst = { | ||
121 | .fck_div_max = 32, | ||
122 | .dss_fck_multiplier = 1, | ||
123 | .clk_name = "dpll_per_m5x2_ck", | ||
124 | }; | ||
125 | |||
126 | static const struct dss_features omap54xx_dss_feats __initconst = { | ||
127 | .fck_div_max = 64, | ||
128 | .dss_fck_multiplier = 1, | ||
129 | .clk_name = "dpll_per_h12x2_ck", | ||
130 | }; | ||
131 | |||
132 | static inline void dss_write_reg(const struct dss_reg idx, u32 val) | 102 | static inline void dss_write_reg(const struct dss_reg idx, u32 val) |
133 | { | 103 | { |
134 | __raw_writel(val, dss.base + idx.idx); | 104 | __raw_writel(val, dss.base + idx.idx); |
@@ -727,6 +697,36 @@ void dss_debug_dump_clocks(struct seq_file *s) | |||
727 | } | 697 | } |
728 | #endif | 698 | #endif |
729 | 699 | ||
700 | static const struct dss_features omap24xx_dss_feats __initconst = { | ||
701 | .fck_div_max = 16, | ||
702 | .dss_fck_multiplier = 2, | ||
703 | .clk_name = NULL, | ||
704 | }; | ||
705 | |||
706 | static const struct dss_features omap34xx_dss_feats __initconst = { | ||
707 | .fck_div_max = 16, | ||
708 | .dss_fck_multiplier = 2, | ||
709 | .clk_name = "dpll4_m4_ck", | ||
710 | }; | ||
711 | |||
712 | static const struct dss_features omap3630_dss_feats __initconst = { | ||
713 | .fck_div_max = 32, | ||
714 | .dss_fck_multiplier = 1, | ||
715 | .clk_name = "dpll4_m4_ck", | ||
716 | }; | ||
717 | |||
718 | static const struct dss_features omap44xx_dss_feats __initconst = { | ||
719 | .fck_div_max = 32, | ||
720 | .dss_fck_multiplier = 1, | ||
721 | .clk_name = "dpll_per_m5x2_ck", | ||
722 | }; | ||
723 | |||
724 | static const struct dss_features omap54xx_dss_feats __initconst = { | ||
725 | .fck_div_max = 64, | ||
726 | .dss_fck_multiplier = 1, | ||
727 | .clk_name = "dpll_per_h12x2_ck", | ||
728 | }; | ||
729 | |||
730 | static int __init dss_init_features(struct device *dev) | 730 | static int __init dss_init_features(struct device *dev) |
731 | { | 731 | { |
732 | const struct dss_features *src; | 732 | const struct dss_features *src; |