aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-07-30 09:19:12 -0400
committerMichael Turquette <mturquette@baylibre.com>2015-08-24 19:49:02 -0400
commit0f350f063eb62212a701a512f74e63ae4714441c (patch)
tree9eec8c5b7d942c4544deea6d5806877b6bc72bad
parentfc4a05d4b0eb1a0110ef11201bf563cd4b53fbce (diff)
clk: ux500: delete the non-DT U8500 clock implementation
This code is unused and not coming back. Let's kill it off. Cc: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/ux500/Makefile1
-rw-r--r--drivers/clk/ux500/u8500_clk.c525
-rw-r--r--include/linux/platform_data/clk-ux500.h2
3 files changed, 0 insertions, 528 deletions
diff --git a/drivers/clk/ux500/Makefile b/drivers/clk/ux500/Makefile
index 521483f0ba33..f3baef29859c 100644
--- a/drivers/clk/ux500/Makefile
+++ b/drivers/clk/ux500/Makefile
@@ -9,7 +9,6 @@ obj-y += clk-sysctrl.o
9 9
10# Clock definitions 10# Clock definitions
11obj-y += u8500_of_clk.o 11obj-y += u8500_of_clk.o
12obj-y += u8500_clk.o
13obj-y += u9540_clk.o 12obj-y += u9540_clk.o
14obj-y += u8540_clk.o 13obj-y += u8540_clk.o
15 14
diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
deleted file mode 100644
index 1c7b639d9222..000000000000
--- a/drivers/clk/ux500/u8500_clk.c
+++ /dev/null
@@ -1,525 +0,0 @@
1/*
2 * Clock definitions for u8500 platform.
3 *
4 * Copyright (C) 2012 ST-Ericsson SA
5 * Author: Ulf Hansson <ulf.hansson@linaro.org>
6 *
7 * License terms: GNU General Public License (GPL) version 2
8 */
9
10#include <linux/clkdev.h>
11#include <linux/clk-provider.h>
12#include <linux/mfd/dbx500-prcmu.h>
13#include <linux/platform_data/clk-ux500.h>
14#include "clk.h"
15
16void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
17 u32 clkrst5_base, u32 clkrst6_base)
18{
19 struct prcmu_fw_version *fw_version;
20 const char *sgaclk_parent = NULL;
21 struct clk *clk;
22
23 /* Clock sources */
24 clk = clk_reg_prcmu_gate("soc0_pll", NULL, PRCMU_PLLSOC0,
25 CLK_IS_ROOT|CLK_IGNORE_UNUSED);
26 clk_register_clkdev(clk, "soc0_pll", NULL);
27
28 clk = clk_reg_prcmu_gate("soc1_pll", NULL, PRCMU_PLLSOC1,
29 CLK_IS_ROOT|CLK_IGNORE_UNUSED);
30 clk_register_clkdev(clk, "soc1_pll", NULL);
31
32 clk = clk_reg_prcmu_gate("ddr_pll", NULL, PRCMU_PLLDDR,
33 CLK_IS_ROOT|CLK_IGNORE_UNUSED);
34 clk_register_clkdev(clk, "ddr_pll", NULL);
35
36 /* FIXME: Add sys, ulp and int clocks here. */
37
38 clk = clk_register_fixed_rate(NULL, "rtc32k", "NULL",
39 CLK_IS_ROOT|CLK_IGNORE_UNUSED,
40 32768);
41 clk_register_clkdev(clk, "clk32k", NULL);
42 clk_register_clkdev(clk, "apb_pclk", "rtc-pl031");
43
44 /* PRCMU clocks */
45 fw_version = prcmu_get_fw_version();
46 if (fw_version != NULL) {
47 switch (fw_version->project) {
48 case PRCMU_FW_PROJECT_U8500_C2:
49 case PRCMU_FW_PROJECT_U8520:
50 case PRCMU_FW_PROJECT_U8420:
51 sgaclk_parent = "soc0_pll";
52 break;
53 default:
54 break;
55 }
56 }
57
58 if (sgaclk_parent)
59 clk = clk_reg_prcmu_gate("sgclk", sgaclk_parent,
60 PRCMU_SGACLK, 0);
61 else
62 clk = clk_reg_prcmu_gate("sgclk", NULL,
63 PRCMU_SGACLK, CLK_IS_ROOT);
64 clk_register_clkdev(clk, NULL, "mali");
65
66 clk = clk_reg_prcmu_gate("uartclk", NULL, PRCMU_UARTCLK, CLK_IS_ROOT);
67 clk_register_clkdev(clk, NULL, "UART");
68
69 clk = clk_reg_prcmu_gate("msp02clk", NULL, PRCMU_MSP02CLK, CLK_IS_ROOT);
70 clk_register_clkdev(clk, NULL, "MSP02");
71
72 clk = clk_reg_prcmu_gate("msp1clk", NULL, PRCMU_MSP1CLK, CLK_IS_ROOT);
73 clk_register_clkdev(clk, NULL, "MSP1");
74
75 clk = clk_reg_prcmu_gate("i2cclk", NULL, PRCMU_I2CCLK, CLK_IS_ROOT);
76 clk_register_clkdev(clk, NULL, "I2C");
77
78 clk = clk_reg_prcmu_gate("slimclk", NULL, PRCMU_SLIMCLK, CLK_IS_ROOT);
79 clk_register_clkdev(clk, NULL, "slim");
80
81 clk = clk_reg_prcmu_gate("per1clk", NULL, PRCMU_PER1CLK, CLK_IS_ROOT);
82 clk_register_clkdev(clk, NULL, "PERIPH1");
83
84 clk = clk_reg_prcmu_gate("per2clk", NULL, PRCMU_PER2CLK, CLK_IS_ROOT);
85 clk_register_clkdev(clk, NULL, "PERIPH2");
86
87 clk = clk_reg_prcmu_gate("per3clk", NULL, PRCMU_PER3CLK, CLK_IS_ROOT);
88 clk_register_clkdev(clk, NULL, "PERIPH3");
89
90 clk = clk_reg_prcmu_gate("per5clk", NULL, PRCMU_PER5CLK, CLK_IS_ROOT);
91 clk_register_clkdev(clk, NULL, "PERIPH5");
92
93 clk = clk_reg_prcmu_gate("per6clk", NULL, PRCMU_PER6CLK, CLK_IS_ROOT);
94 clk_register_clkdev(clk, NULL, "PERIPH6");
95
96 clk = clk_reg_prcmu_gate("per7clk", NULL, PRCMU_PER7CLK, CLK_IS_ROOT);
97 clk_register_clkdev(clk, NULL, "PERIPH7");
98
99 clk = clk_reg_prcmu_scalable("lcdclk", NULL, PRCMU_LCDCLK, 0,
100 CLK_IS_ROOT|CLK_SET_RATE_GATE);
101 clk_register_clkdev(clk, NULL, "lcd");
102 clk_register_clkdev(clk, "lcd", "mcde");
103
104 clk = clk_reg_prcmu_opp_gate("bmlclk", NULL, PRCMU_BMLCLK, CLK_IS_ROOT);
105 clk_register_clkdev(clk, NULL, "bml");
106
107 clk = clk_reg_prcmu_scalable("hsitxclk", NULL, PRCMU_HSITXCLK, 0,
108 CLK_IS_ROOT|CLK_SET_RATE_GATE);
109
110 clk = clk_reg_prcmu_scalable("hsirxclk", NULL, PRCMU_HSIRXCLK, 0,
111 CLK_IS_ROOT|CLK_SET_RATE_GATE);
112
113 clk = clk_reg_prcmu_scalable("hdmiclk", NULL, PRCMU_HDMICLK, 0,
114 CLK_IS_ROOT|CLK_SET_RATE_GATE);
115 clk_register_clkdev(clk, NULL, "hdmi");
116 clk_register_clkdev(clk, "hdmi", "mcde");
117
118 clk = clk_reg_prcmu_scalable("apeatclk", NULL, PRCMU_APEATCLK, 0,
119 CLK_IS_ROOT|CLK_SET_RATE_GATE);
120 clk_register_clkdev(clk, NULL, "apeat");
121
122 clk = clk_reg_prcmu_scalable("apetraceclk", NULL, PRCMU_APETRACECLK, 0,
123 CLK_IS_ROOT|CLK_SET_RATE_GATE);
124 clk_register_clkdev(clk, NULL, "apetrace");
125
126 clk = clk_reg_prcmu_gate("mcdeclk", NULL, PRCMU_MCDECLK, CLK_IS_ROOT);
127 clk_register_clkdev(clk, NULL, "mcde");
128 clk_register_clkdev(clk, "mcde", "mcde");
129 clk_register_clkdev(clk, "dsisys", "dsilink.0");
130 clk_register_clkdev(clk, "dsisys", "dsilink.1");
131 clk_register_clkdev(clk, "dsisys", "dsilink.2");
132
133 clk = clk_reg_prcmu_opp_gate("ipi2cclk", NULL, PRCMU_IPI2CCLK,
134 CLK_IS_ROOT);
135 clk_register_clkdev(clk, NULL, "ipi2");
136
137 clk = clk_reg_prcmu_gate("dsialtclk", NULL, PRCMU_DSIALTCLK,
138 CLK_IS_ROOT);
139 clk_register_clkdev(clk, NULL, "dsialt");
140
141 clk = clk_reg_prcmu_gate("dmaclk", NULL, PRCMU_DMACLK, CLK_IS_ROOT);
142 clk_register_clkdev(clk, NULL, "dma40.0");
143
144 clk = clk_reg_prcmu_gate("b2r2clk", NULL, PRCMU_B2R2CLK, CLK_IS_ROOT);
145 clk_register_clkdev(clk, NULL, "b2r2");
146 clk_register_clkdev(clk, NULL, "b2r2_core");
147 clk_register_clkdev(clk, NULL, "U8500-B2R2.0");
148
149 clk = clk_reg_prcmu_scalable("tvclk", NULL, PRCMU_TVCLK, 0,
150 CLK_IS_ROOT|CLK_SET_RATE_GATE);
151 clk_register_clkdev(clk, NULL, "tv");
152 clk_register_clkdev(clk, "tv", "mcde");
153
154 clk = clk_reg_prcmu_gate("sspclk", NULL, PRCMU_SSPCLK, CLK_IS_ROOT);
155 clk_register_clkdev(clk, NULL, "SSP");
156
157 clk = clk_reg_prcmu_gate("rngclk", NULL, PRCMU_RNGCLK, CLK_IS_ROOT);
158 clk_register_clkdev(clk, NULL, "rngclk");
159
160 clk = clk_reg_prcmu_gate("uiccclk", NULL, PRCMU_UICCCLK, CLK_IS_ROOT);
161 clk_register_clkdev(clk, NULL, "uicc");
162
163 clk = clk_reg_prcmu_gate("timclk", NULL, PRCMU_TIMCLK, CLK_IS_ROOT);
164 clk_register_clkdev(clk, NULL, "mtu0");
165 clk_register_clkdev(clk, NULL, "mtu1");
166
167 clk = clk_reg_prcmu_opp_volt_scalable("sdmmcclk", NULL, PRCMU_SDMMCCLK,
168 100000000,
169 CLK_IS_ROOT|CLK_SET_RATE_GATE);
170 clk_register_clkdev(clk, NULL, "sdmmc");
171
172 clk = clk_reg_prcmu_scalable("dsi_pll", "hdmiclk",
173 PRCMU_PLLDSI, 0, CLK_SET_RATE_GATE);
174 clk_register_clkdev(clk, "dsihs2", "mcde");
175 clk_register_clkdev(clk, "dsihs2", "dsilink.2");
176
177
178 clk = clk_reg_prcmu_scalable("dsi0clk", "dsi_pll",
179 PRCMU_DSI0CLK, 0, CLK_SET_RATE_GATE);
180 clk_register_clkdev(clk, "dsihs0", "mcde");
181 clk_register_clkdev(clk, "dsihs0", "dsilink.0");
182
183 clk = clk_reg_prcmu_scalable("dsi1clk", "dsi_pll",
184 PRCMU_DSI1CLK, 0, CLK_SET_RATE_GATE);
185 clk_register_clkdev(clk, "dsihs1", "mcde");
186 clk_register_clkdev(clk, "dsihs1", "dsilink.1");
187
188 clk = clk_reg_prcmu_scalable("dsi0escclk", "tvclk",
189 PRCMU_DSI0ESCCLK, 0, CLK_SET_RATE_GATE);
190 clk_register_clkdev(clk, "dsilp0", "dsilink.0");
191 clk_register_clkdev(clk, "dsilp0", "mcde");
192
193 clk = clk_reg_prcmu_scalable("dsi1escclk", "tvclk",
194 PRCMU_DSI1ESCCLK, 0, CLK_SET_RATE_GATE);
195 clk_register_clkdev(clk, "dsilp1", "dsilink.1");
196 clk_register_clkdev(clk, "dsilp1", "mcde");
197
198 clk = clk_reg_prcmu_scalable("dsi2escclk", "tvclk",
199 PRCMU_DSI2ESCCLK, 0, CLK_SET_RATE_GATE);
200 clk_register_clkdev(clk, "dsilp2", "dsilink.2");
201 clk_register_clkdev(clk, "dsilp2", "mcde");
202
203 clk = clk_reg_prcmu_scalable_rate("armss", NULL,
204 PRCMU_ARMSS, 0, CLK_IS_ROOT|CLK_IGNORE_UNUSED);
205 clk_register_clkdev(clk, "armss", NULL);
206
207 clk = clk_register_fixed_factor(NULL, "smp_twd", "armss",
208 CLK_IGNORE_UNUSED, 1, 2);
209 clk_register_clkdev(clk, NULL, "smp_twd");
210
211 /*
212 * FIXME: Add special handled PRCMU clocks here:
213 * 1. clkout0yuv, use PRCMU as parent + need regulator + pinctrl.
214 * 2. ab9540_clkout1yuv, see clkout0yuv
215 */
216
217 /* PRCC P-clocks */
218 clk = clk_reg_prcc_pclk("p1_pclk0", "per1clk", clkrst1_base,
219 BIT(0), 0);
220 clk_register_clkdev(clk, "apb_pclk", "uart0");
221
222 clk = clk_reg_prcc_pclk("p1_pclk1", "per1clk", clkrst1_base,
223 BIT(1), 0);
224 clk_register_clkdev(clk, "apb_pclk", "uart1");
225
226 clk = clk_reg_prcc_pclk("p1_pclk2", "per1clk", clkrst1_base,
227 BIT(2), 0);
228 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.1");
229
230 clk = clk_reg_prcc_pclk("p1_pclk3", "per1clk", clkrst1_base,
231 BIT(3), 0);
232 clk_register_clkdev(clk, "apb_pclk", "msp0");
233 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.0");
234
235 clk = clk_reg_prcc_pclk("p1_pclk4", "per1clk", clkrst1_base,
236 BIT(4), 0);
237 clk_register_clkdev(clk, "apb_pclk", "msp1");
238 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.1");
239
240 clk = clk_reg_prcc_pclk("p1_pclk5", "per1clk", clkrst1_base,
241 BIT(5), 0);
242 clk_register_clkdev(clk, "apb_pclk", "sdi0");
243
244 clk = clk_reg_prcc_pclk("p1_pclk6", "per1clk", clkrst1_base,
245 BIT(6), 0);
246 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.2");
247
248 clk = clk_reg_prcc_pclk("p1_pclk7", "per1clk", clkrst1_base,
249 BIT(7), 0);
250 clk_register_clkdev(clk, NULL, "spi3");
251
252 clk = clk_reg_prcc_pclk("p1_pclk8", "per1clk", clkrst1_base,
253 BIT(8), 0);
254 clk_register_clkdev(clk, "apb_pclk", "slimbus0");
255
256 clk = clk_reg_prcc_pclk("p1_pclk9", "per1clk", clkrst1_base,
257 BIT(9), 0);
258 clk_register_clkdev(clk, NULL, "gpio.0");
259 clk_register_clkdev(clk, NULL, "gpio.1");
260 clk_register_clkdev(clk, NULL, "gpioblock0");
261
262 clk = clk_reg_prcc_pclk("p1_pclk10", "per1clk", clkrst1_base,
263 BIT(10), 0);
264 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.4");
265
266 clk = clk_reg_prcc_pclk("p1_pclk11", "per1clk", clkrst1_base,
267 BIT(11), 0);
268 clk_register_clkdev(clk, "apb_pclk", "msp3");
269 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.3");
270
271 clk = clk_reg_prcc_pclk("p2_pclk0", "per2clk", clkrst2_base,
272 BIT(0), 0);
273 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.3");
274
275 clk = clk_reg_prcc_pclk("p2_pclk1", "per2clk", clkrst2_base,
276 BIT(1), 0);
277 clk_register_clkdev(clk, NULL, "spi2");
278
279 clk = clk_reg_prcc_pclk("p2_pclk2", "per2clk", clkrst2_base,
280 BIT(2), 0);
281 clk_register_clkdev(clk, NULL, "spi1");
282
283 clk = clk_reg_prcc_pclk("p2_pclk3", "per2clk", clkrst2_base,
284 BIT(3), 0);
285 clk_register_clkdev(clk, NULL, "pwl");
286
287 clk = clk_reg_prcc_pclk("p2_pclk4", "per2clk", clkrst2_base,
288 BIT(4), 0);
289 clk_register_clkdev(clk, "apb_pclk", "sdi4");
290
291 clk = clk_reg_prcc_pclk("p2_pclk5", "per2clk", clkrst2_base,
292 BIT(5), 0);
293 clk_register_clkdev(clk, "apb_pclk", "msp2");
294 clk_register_clkdev(clk, "apb_pclk", "ux500-msp-i2s.2");
295
296 clk = clk_reg_prcc_pclk("p2_pclk6", "per2clk", clkrst2_base,
297 BIT(6), 0);
298 clk_register_clkdev(clk, "apb_pclk", "sdi1");
299
300 clk = clk_reg_prcc_pclk("p2_pclk7", "per2clk", clkrst2_base,
301 BIT(7), 0);
302 clk_register_clkdev(clk, "apb_pclk", "sdi3");
303
304 clk = clk_reg_prcc_pclk("p2_pclk8", "per2clk", clkrst2_base,
305 BIT(8), 0);
306 clk_register_clkdev(clk, NULL, "spi0");
307
308 clk = clk_reg_prcc_pclk("p2_pclk9", "per2clk", clkrst2_base,
309 BIT(9), 0);
310 clk_register_clkdev(clk, "hsir_hclk", "ste_hsi.0");
311
312 clk = clk_reg_prcc_pclk("p2_pclk10", "per2clk", clkrst2_base,
313 BIT(10), 0);
314 clk_register_clkdev(clk, "hsit_hclk", "ste_hsi.0");
315
316 clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base,
317 BIT(11), 0);
318 clk_register_clkdev(clk, NULL, "gpio.6");
319 clk_register_clkdev(clk, NULL, "gpio.7");
320 clk_register_clkdev(clk, NULL, "gpioblock1");
321
322 clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base,
323 BIT(12), 0);
324
325 clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base,
326 BIT(0), 0);
327 clk_register_clkdev(clk, "fsmc", NULL);
328 clk_register_clkdev(clk, NULL, "smsc911x.0");
329
330 clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base,
331 BIT(1), 0);
332 clk_register_clkdev(clk, "apb_pclk", "ssp0");
333
334 clk = clk_reg_prcc_pclk("p3_pclk2", "per3clk", clkrst3_base,
335 BIT(2), 0);
336 clk_register_clkdev(clk, "apb_pclk", "ssp1");
337
338 clk = clk_reg_prcc_pclk("p3_pclk3", "per3clk", clkrst3_base,
339 BIT(3), 0);
340 clk_register_clkdev(clk, "apb_pclk", "nmk-i2c.0");
341
342 clk = clk_reg_prcc_pclk("p3_pclk4", "per3clk", clkrst3_base,
343 BIT(4), 0);
344 clk_register_clkdev(clk, "apb_pclk", "sdi2");
345
346 clk = clk_reg_prcc_pclk("p3_pclk5", "per3clk", clkrst3_base,
347 BIT(5), 0);
348 clk_register_clkdev(clk, "apb_pclk", "ske");
349 clk_register_clkdev(clk, "apb_pclk", "nmk-ske-keypad");
350
351 clk = clk_reg_prcc_pclk("p3_pclk6", "per3clk", clkrst3_base,
352 BIT(6), 0);
353 clk_register_clkdev(clk, "apb_pclk", "uart2");
354
355 clk = clk_reg_prcc_pclk("p3_pclk7", "per3clk", clkrst3_base,
356 BIT(7), 0);
357 clk_register_clkdev(clk, "apb_pclk", "sdi5");
358
359 clk = clk_reg_prcc_pclk("p3_pclk8", "per3clk", clkrst3_base,
360 BIT(8), 0);
361 clk_register_clkdev(clk, NULL, "gpio.2");
362 clk_register_clkdev(clk, NULL, "gpio.3");
363 clk_register_clkdev(clk, NULL, "gpio.4");
364 clk_register_clkdev(clk, NULL, "gpio.5");
365 clk_register_clkdev(clk, NULL, "gpioblock2");
366
367 clk = clk_reg_prcc_pclk("p5_pclk0", "per5clk", clkrst5_base,
368 BIT(0), 0);
369 clk_register_clkdev(clk, "usb", "musb-ux500.0");
370
371 clk = clk_reg_prcc_pclk("p5_pclk1", "per5clk", clkrst5_base,
372 BIT(1), 0);
373 clk_register_clkdev(clk, NULL, "gpio.8");
374 clk_register_clkdev(clk, NULL, "gpioblock3");
375
376 clk = clk_reg_prcc_pclk("p6_pclk0", "per6clk", clkrst6_base,
377 BIT(0), 0);
378 clk_register_clkdev(clk, "apb_pclk", "rng");
379
380 clk = clk_reg_prcc_pclk("p6_pclk1", "per6clk", clkrst6_base,
381 BIT(1), 0);
382 clk_register_clkdev(clk, NULL, "cryp0");
383 clk_register_clkdev(clk, NULL, "cryp1");
384
385 clk = clk_reg_prcc_pclk("p6_pclk2", "per6clk", clkrst6_base,
386 BIT(2), 0);
387 clk_register_clkdev(clk, NULL, "hash0");
388
389 clk = clk_reg_prcc_pclk("p6_pclk3", "per6clk", clkrst6_base,
390 BIT(3), 0);
391 clk_register_clkdev(clk, NULL, "pka");
392
393 clk = clk_reg_prcc_pclk("p6_pclk4", "per6clk", clkrst6_base,
394 BIT(4), 0);
395 clk_register_clkdev(clk, NULL, "hash1");
396
397 clk = clk_reg_prcc_pclk("p6_pclk5", "per6clk", clkrst6_base,
398 BIT(5), 0);
399 clk_register_clkdev(clk, NULL, "cfgreg");
400
401 clk = clk_reg_prcc_pclk("p6_pclk6", "per6clk", clkrst6_base,
402 BIT(6), 0);
403 clk_register_clkdev(clk, "apb_pclk", "mtu0");
404
405 clk = clk_reg_prcc_pclk("p6_pclk7", "per6clk", clkrst6_base,
406 BIT(7), 0);
407 clk_register_clkdev(clk, "apb_pclk", "mtu1");
408
409 /* PRCC K-clocks
410 *
411 * FIXME: Some drivers requires PERPIH[n| to be automatically enabled
412 * by enabling just the K-clock, even if it is not a valid parent to
413 * the K-clock. Until drivers get fixed we might need some kind of
414 * "parent muxed join".
415 */
416
417 /* Periph1 */
418 clk = clk_reg_prcc_kclk("p1_uart0_kclk", "uartclk",
419 clkrst1_base, BIT(0), CLK_SET_RATE_GATE);
420 clk_register_clkdev(clk, NULL, "uart0");
421
422 clk = clk_reg_prcc_kclk("p1_uart1_kclk", "uartclk",
423 clkrst1_base, BIT(1), CLK_SET_RATE_GATE);
424 clk_register_clkdev(clk, NULL, "uart1");
425
426 clk = clk_reg_prcc_kclk("p1_i2c1_kclk", "i2cclk",
427 clkrst1_base, BIT(2), CLK_SET_RATE_GATE);
428 clk_register_clkdev(clk, NULL, "nmk-i2c.1");
429
430 clk = clk_reg_prcc_kclk("p1_msp0_kclk", "msp02clk",
431 clkrst1_base, BIT(3), CLK_SET_RATE_GATE);
432 clk_register_clkdev(clk, NULL, "msp0");
433 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.0");
434
435 clk = clk_reg_prcc_kclk("p1_msp1_kclk", "msp1clk",
436 clkrst1_base, BIT(4), CLK_SET_RATE_GATE);
437 clk_register_clkdev(clk, NULL, "msp1");
438 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.1");
439
440 clk = clk_reg_prcc_kclk("p1_sdi0_kclk", "sdmmcclk",
441 clkrst1_base, BIT(5), CLK_SET_RATE_GATE);
442 clk_register_clkdev(clk, NULL, "sdi0");
443
444 clk = clk_reg_prcc_kclk("p1_i2c2_kclk", "i2cclk",
445 clkrst1_base, BIT(6), CLK_SET_RATE_GATE);
446 clk_register_clkdev(clk, NULL, "nmk-i2c.2");
447
448 clk = clk_reg_prcc_kclk("p1_slimbus0_kclk", "slimclk",
449 clkrst1_base, BIT(8), CLK_SET_RATE_GATE);
450 clk_register_clkdev(clk, NULL, "slimbus0");
451
452 clk = clk_reg_prcc_kclk("p1_i2c4_kclk", "i2cclk",
453 clkrst1_base, BIT(9), CLK_SET_RATE_GATE);
454 clk_register_clkdev(clk, NULL, "nmk-i2c.4");
455
456 clk = clk_reg_prcc_kclk("p1_msp3_kclk", "msp1clk",
457 clkrst1_base, BIT(10), CLK_SET_RATE_GATE);
458 clk_register_clkdev(clk, NULL, "msp3");
459 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.3");
460
461 /* Periph2 */
462 clk = clk_reg_prcc_kclk("p2_i2c3_kclk", "i2cclk",
463 clkrst2_base, BIT(0), CLK_SET_RATE_GATE);
464 clk_register_clkdev(clk, NULL, "nmk-i2c.3");
465
466 clk = clk_reg_prcc_kclk("p2_sdi4_kclk", "sdmmcclk",
467 clkrst2_base, BIT(2), CLK_SET_RATE_GATE);
468 clk_register_clkdev(clk, NULL, "sdi4");
469
470 clk = clk_reg_prcc_kclk("p2_msp2_kclk", "msp02clk",
471 clkrst2_base, BIT(3), CLK_SET_RATE_GATE);
472 clk_register_clkdev(clk, NULL, "msp2");
473 clk_register_clkdev(clk, NULL, "ux500-msp-i2s.2");
474
475 clk = clk_reg_prcc_kclk("p2_sdi1_kclk", "sdmmcclk",
476 clkrst2_base, BIT(4), CLK_SET_RATE_GATE);
477 clk_register_clkdev(clk, NULL, "sdi1");
478
479 clk = clk_reg_prcc_kclk("p2_sdi3_kclk", "sdmmcclk",
480 clkrst2_base, BIT(5), CLK_SET_RATE_GATE);
481 clk_register_clkdev(clk, NULL, "sdi3");
482
483 /* Note that rate is received from parent. */
484 clk = clk_reg_prcc_kclk("p2_ssirx_kclk", "hsirxclk",
485 clkrst2_base, BIT(6),
486 CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
487 clk = clk_reg_prcc_kclk("p2_ssitx_kclk", "hsitxclk",
488 clkrst2_base, BIT(7),
489 CLK_SET_RATE_GATE|CLK_SET_RATE_PARENT);
490
491 /* Periph3 */
492 clk = clk_reg_prcc_kclk("p3_ssp0_kclk", "sspclk",
493 clkrst3_base, BIT(1), CLK_SET_RATE_GATE);
494 clk_register_clkdev(clk, NULL, "ssp0");
495
496 clk = clk_reg_prcc_kclk("p3_ssp1_kclk", "sspclk",
497 clkrst3_base, BIT(2), CLK_SET_RATE_GATE);
498 clk_register_clkdev(clk, NULL, "ssp1");
499
500 clk = clk_reg_prcc_kclk("p3_i2c0_kclk", "i2cclk",
501 clkrst3_base, BIT(3), CLK_SET_RATE_GATE);
502 clk_register_clkdev(clk, NULL, "nmk-i2c.0");
503
504 clk = clk_reg_prcc_kclk("p3_sdi2_kclk", "sdmmcclk",
505 clkrst3_base, BIT(4), CLK_SET_RATE_GATE);
506 clk_register_clkdev(clk, NULL, "sdi2");
507
508 clk = clk_reg_prcc_kclk("p3_ske_kclk", "rtc32k",
509 clkrst3_base, BIT(5), CLK_SET_RATE_GATE);
510 clk_register_clkdev(clk, NULL, "ske");
511 clk_register_clkdev(clk, NULL, "nmk-ske-keypad");
512
513 clk = clk_reg_prcc_kclk("p3_uart2_kclk", "uartclk",
514 clkrst3_base, BIT(6), CLK_SET_RATE_GATE);
515 clk_register_clkdev(clk, NULL, "uart2");
516
517 clk = clk_reg_prcc_kclk("p3_sdi5_kclk", "sdmmcclk",
518 clkrst3_base, BIT(7), CLK_SET_RATE_GATE);
519 clk_register_clkdev(clk, NULL, "sdi5");
520
521 /* Periph6 */
522 clk = clk_reg_prcc_kclk("p3_rng_kclk", "rngclk",
523 clkrst6_base, BIT(0), CLK_SET_RATE_GATE);
524 clk_register_clkdev(clk, NULL, "rng");
525}
diff --git a/include/linux/platform_data/clk-ux500.h b/include/linux/platform_data/clk-ux500.h
index 97baf831e071..0058edb24391 100644
--- a/include/linux/platform_data/clk-ux500.h
+++ b/include/linux/platform_data/clk-ux500.h
@@ -13,8 +13,6 @@
13void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, 13void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
14 u32 clkrst5_base, u32 clkrst6_base); 14 u32 clkrst5_base, u32 clkrst6_base);
15 15
16void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
17 u32 clkrst5_base, u32 clkrst6_base);
18void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, 16void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
19 u32 clkrst5_base, u32 clkrst6_base); 17 u32 clkrst5_base, u32 clkrst6_base);
20void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, 18void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,