diff options
author | Jun Nie <jun.nie@linaro.org> | 2015-07-23 03:02:53 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 14:59:39 -0400 |
commit | d99215ae06be51558b723a3648515e672898ca4b (patch) | |
tree | c31e0809d2fa67dff7f0158f232a8f1500ba7e2a | |
parent | 105644e59a2b1c43fe2eeba6595d142c390552c2 (diff) |
clk: zx: Constify parent names in clock init data
The array of parent names can be made as array of const pointers to
const strings.
Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/zte/clk-zx296702.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/clk/zte/clk-zx296702.c b/drivers/clk/zte/clk-zx296702.c index 9dcac73480ba..ebd20d852e73 100644 --- a/drivers/clk/zte/clk-zx296702.c +++ b/drivers/clk/zte/clk-zx296702.c | |||
@@ -83,115 +83,115 @@ static const struct clk_div_table sec_wclk_divider[] = { | |||
83 | { /* sentinel */ } | 83 | { /* sentinel */ } |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static const char * matrix_aclk_sel[] = { | 86 | static const char * const matrix_aclk_sel[] = { |
87 | "pll_mm0_198M", | 87 | "pll_mm0_198M", |
88 | "osc", | 88 | "osc", |
89 | "clk_148M5", | 89 | "clk_148M5", |
90 | "pll_lsp_104M", | 90 | "pll_lsp_104M", |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static const char * a9_wclk_sel[] = { | 93 | static const char * const a9_wclk_sel[] = { |
94 | "pll_a9", | 94 | "pll_a9", |
95 | "osc", | 95 | "osc", |
96 | "clk_500", | 96 | "clk_500", |
97 | "clk_250", | 97 | "clk_250", |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static const char * a9_as1_aclk_sel[] = { | 100 | static const char * const a9_as1_aclk_sel[] = { |
101 | "clk_250", | 101 | "clk_250", |
102 | "osc", | 102 | "osc", |
103 | "pll_mm0_396M", | 103 | "pll_mm0_396M", |
104 | "pll_mac_333M", | 104 | "pll_mac_333M", |
105 | }; | 105 | }; |
106 | 106 | ||
107 | static const char * a9_trace_clkin_sel[] = { | 107 | static const char * const a9_trace_clkin_sel[] = { |
108 | "clk_74M25", | 108 | "clk_74M25", |
109 | "pll_mm1_108M", | 109 | "pll_mm1_108M", |
110 | "clk_125", | 110 | "clk_125", |
111 | "clk_148M5", | 111 | "clk_148M5", |
112 | }; | 112 | }; |
113 | 113 | ||
114 | static const char * decppu_aclk_sel[] = { | 114 | static const char * const decppu_aclk_sel[] = { |
115 | "clk_250", | 115 | "clk_250", |
116 | "pll_mm0_198M", | 116 | "pll_mm0_198M", |
117 | "pll_lsp_104M", | 117 | "pll_lsp_104M", |
118 | "pll_audio_294M912", | 118 | "pll_audio_294M912", |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static const char * vou_main_wclk_sel[] = { | 121 | static const char * const vou_main_wclk_sel[] = { |
122 | "clk_148M5", | 122 | "clk_148M5", |
123 | "clk_74M25", | 123 | "clk_74M25", |
124 | "clk_27", | 124 | "clk_27", |
125 | "pll_mm1_54M", | 125 | "pll_mm1_54M", |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static const char * vou_scaler_wclk_sel[] = { | 128 | static const char * const vou_scaler_wclk_sel[] = { |
129 | "clk_250", | 129 | "clk_250", |
130 | "pll_mac_333M", | 130 | "pll_mac_333M", |
131 | "pll_audio_294M912", | 131 | "pll_audio_294M912", |
132 | "pll_mm0_198M", | 132 | "pll_mm0_198M", |
133 | }; | 133 | }; |
134 | 134 | ||
135 | static const char * r2d_wclk_sel[] = { | 135 | static const char * const r2d_wclk_sel[] = { |
136 | "pll_audio_294M912", | 136 | "pll_audio_294M912", |
137 | "pll_mac_333M", | 137 | "pll_mac_333M", |
138 | "pll_a9_350M", | 138 | "pll_a9_350M", |
139 | "pll_mm0_396M", | 139 | "pll_mm0_396M", |
140 | }; | 140 | }; |
141 | 141 | ||
142 | static const char * ddr_wclk_sel[] = { | 142 | static const char * const ddr_wclk_sel[] = { |
143 | "pll_mac_333M", | 143 | "pll_mac_333M", |
144 | "pll_ddr_266M", | 144 | "pll_ddr_266M", |
145 | "pll_audio_294M912", | 145 | "pll_audio_294M912", |
146 | "pll_mm0_198M", | 146 | "pll_mm0_198M", |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static const char * nand_wclk_sel[] = { | 149 | static const char * const nand_wclk_sel[] = { |
150 | "pll_lsp_104M", | 150 | "pll_lsp_104M", |
151 | "osc", | 151 | "osc", |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static const char * lsp_26_wclk_sel[] = { | 154 | static const char * const lsp_26_wclk_sel[] = { |
155 | "pll_lsp_26M", | 155 | "pll_lsp_26M", |
156 | "osc", | 156 | "osc", |
157 | }; | 157 | }; |
158 | 158 | ||
159 | static const char * vl0_sel[] = { | 159 | static const char * const vl0_sel[] = { |
160 | "vou_main_channel_div", | 160 | "vou_main_channel_div", |
161 | "vou_aux_channel_div", | 161 | "vou_aux_channel_div", |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static const char * hdmi_sel[] = { | 164 | static const char * const hdmi_sel[] = { |
165 | "vou_main_channel_wclk", | 165 | "vou_main_channel_wclk", |
166 | "vou_aux_channel_wclk", | 166 | "vou_aux_channel_wclk", |
167 | }; | 167 | }; |
168 | 168 | ||
169 | static const char * sdmmc0_wclk_sel[] = { | 169 | static const char * const sdmmc0_wclk_sel[] = { |
170 | "lsp1_104M_wclk", | 170 | "lsp1_104M_wclk", |
171 | "lsp1_26M_wclk", | 171 | "lsp1_26M_wclk", |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static const char * sdmmc1_wclk_sel[] = { | 174 | static const char * const sdmmc1_wclk_sel[] = { |
175 | "lsp0_104M_wclk", | 175 | "lsp0_104M_wclk", |
176 | "lsp0_26M_wclk", | 176 | "lsp0_26M_wclk", |
177 | }; | 177 | }; |
178 | 178 | ||
179 | static const char * uart_wclk_sel[] = { | 179 | static const char * const uart_wclk_sel[] = { |
180 | "lsp1_104M_wclk", | 180 | "lsp1_104M_wclk", |
181 | "lsp1_26M_wclk", | 181 | "lsp1_26M_wclk", |
182 | }; | 182 | }; |
183 | 183 | ||
184 | static const char * spdif0_wclk_sel[] = { | 184 | static const char * const spdif0_wclk_sel[] = { |
185 | "lsp0_104M_wclk", | 185 | "lsp0_104M_wclk", |
186 | "lsp0_26M_wclk", | 186 | "lsp0_26M_wclk", |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static const char * spdif1_wclk_sel[] = { | 189 | static const char * const spdif1_wclk_sel[] = { |
190 | "lsp1_104M_wclk", | 190 | "lsp1_104M_wclk", |
191 | "lsp1_26M_wclk", | 191 | "lsp1_26M_wclk", |
192 | }; | 192 | }; |
193 | 193 | ||
194 | static const char * i2s_wclk_sel[] = { | 194 | static const char * const i2s_wclk_sel[] = { |
195 | "lsp0_104M_wclk", | 195 | "lsp0_104M_wclk", |
196 | "lsp0_26M_wclk", | 196 | "lsp0_26M_wclk", |
197 | }; | 197 | }; |
@@ -211,7 +211,7 @@ static inline struct clk *zx_div(const char *name, const char *parent, | |||
211 | reg, shift, width, 0, ®_lock); | 211 | reg, shift, width, 0, ®_lock); |
212 | } | 212 | } |
213 | 213 | ||
214 | static inline struct clk *zx_mux(const char *name, const char **parents, | 214 | static inline struct clk *zx_mux(const char *name, const char * const *parents, |
215 | int num_parents, void __iomem *reg, u8 shift, u8 width) | 215 | int num_parents, void __iomem *reg, u8 shift, u8 width) |
216 | { | 216 | { |
217 | return clk_register_mux(NULL, name, parents, num_parents, | 217 | return clk_register_mux(NULL, name, parents, num_parents, |