diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-02-14 02:22:36 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-02-21 23:51:15 -0500 |
commit | 3db3ae5eb94eb8579991174fe66999261b66018d (patch) | |
tree | 5a5dea5a697c1fc13d325b14b642e562cf794136 /arch/arm/mach-s5pv310 | |
parent | 3c31336dc5b7ea5b6d6168a8c38c46dd54d65e95 (diff) |
ARM: EXYNOS4: Update device support
This patch updates device support of EXYNOS4 according to the change of
ARCH name, EXYNOS4.
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv310')
-rw-r--r-- | arch/arm/mach-s5pv310/dev-audio.c | 364 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/dev-pd.c | 139 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/dev-sysmmu.c | 187 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c1.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c2.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c3.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c4.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c5.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c6.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-i2c7.c | 23 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-sdhci-gpio.c | 152 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/setup-sdhci.c | 69 |
12 files changed, 0 insertions, 1072 deletions
diff --git a/arch/arm/mach-s5pv310/dev-audio.c b/arch/arm/mach-s5pv310/dev-audio.c deleted file mode 100644 index a1964242f0fa..000000000000 --- a/arch/arm/mach-s5pv310/dev-audio.c +++ /dev/null | |||
@@ -1,364 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/dev-audio.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co. Ltd | ||
4 | * Jaswinder Singh <jassi.brar@samsung.com> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/platform_device.h> | ||
12 | #include <linux/dma-mapping.h> | ||
13 | #include <linux/gpio.h> | ||
14 | |||
15 | #include <plat/gpio-cfg.h> | ||
16 | #include <plat/audio.h> | ||
17 | |||
18 | #include <mach/map.h> | ||
19 | #include <mach/dma.h> | ||
20 | #include <mach/irqs.h> | ||
21 | |||
22 | static const char *rclksrc[] = { | ||
23 | [0] = "busclk", | ||
24 | [1] = "i2sclk", | ||
25 | }; | ||
26 | |||
27 | static int s5pv310_cfg_i2s(struct platform_device *pdev) | ||
28 | { | ||
29 | /* configure GPIO for i2s port */ | ||
30 | switch (pdev->id) { | ||
31 | case 0: | ||
32 | s3c_gpio_cfgpin_range(S5PV310_GPZ(0), 7, S3C_GPIO_SFN(2)); | ||
33 | break; | ||
34 | case 1: | ||
35 | s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(2)); | ||
36 | break; | ||
37 | case 2: | ||
38 | s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 5, S3C_GPIO_SFN(4)); | ||
39 | break; | ||
40 | default: | ||
41 | printk(KERN_ERR "Invalid Device %d\n", pdev->id); | ||
42 | return -EINVAL; | ||
43 | } | ||
44 | |||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | static struct s3c_audio_pdata i2sv5_pdata = { | ||
49 | .cfg_gpio = s5pv310_cfg_i2s, | ||
50 | .type = { | ||
51 | .i2s = { | ||
52 | .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | ||
53 | | QUIRK_NEED_RSTCLR, | ||
54 | .src_clk = rclksrc, | ||
55 | }, | ||
56 | }, | ||
57 | }; | ||
58 | |||
59 | static struct resource s5pv310_i2s0_resource[] = { | ||
60 | [0] = { | ||
61 | .start = S5PV310_PA_I2S0, | ||
62 | .end = S5PV310_PA_I2S0 + 0x100 - 1, | ||
63 | .flags = IORESOURCE_MEM, | ||
64 | }, | ||
65 | [1] = { | ||
66 | .start = DMACH_I2S0_TX, | ||
67 | .end = DMACH_I2S0_TX, | ||
68 | .flags = IORESOURCE_DMA, | ||
69 | }, | ||
70 | [2] = { | ||
71 | .start = DMACH_I2S0_RX, | ||
72 | .end = DMACH_I2S0_RX, | ||
73 | .flags = IORESOURCE_DMA, | ||
74 | }, | ||
75 | [3] = { | ||
76 | .start = DMACH_I2S0S_TX, | ||
77 | .end = DMACH_I2S0S_TX, | ||
78 | .flags = IORESOURCE_DMA, | ||
79 | }, | ||
80 | }; | ||
81 | |||
82 | struct platform_device s5pv310_device_i2s0 = { | ||
83 | .name = "samsung-i2s", | ||
84 | .id = 0, | ||
85 | .num_resources = ARRAY_SIZE(s5pv310_i2s0_resource), | ||
86 | .resource = s5pv310_i2s0_resource, | ||
87 | .dev = { | ||
88 | .platform_data = &i2sv5_pdata, | ||
89 | }, | ||
90 | }; | ||
91 | |||
92 | static const char *rclksrc_v3[] = { | ||
93 | [0] = "sclk_i2s", | ||
94 | [1] = "no_such_clock", | ||
95 | }; | ||
96 | |||
97 | static struct s3c_audio_pdata i2sv3_pdata = { | ||
98 | .cfg_gpio = s5pv310_cfg_i2s, | ||
99 | .type = { | ||
100 | .i2s = { | ||
101 | .quirks = QUIRK_NO_MUXPSR, | ||
102 | .src_clk = rclksrc_v3, | ||
103 | }, | ||
104 | }, | ||
105 | }; | ||
106 | |||
107 | static struct resource s5pv310_i2s1_resource[] = { | ||
108 | [0] = { | ||
109 | .start = S5PV310_PA_I2S1, | ||
110 | .end = S5PV310_PA_I2S1 + 0x100 - 1, | ||
111 | .flags = IORESOURCE_MEM, | ||
112 | }, | ||
113 | [1] = { | ||
114 | .start = DMACH_I2S1_TX, | ||
115 | .end = DMACH_I2S1_TX, | ||
116 | .flags = IORESOURCE_DMA, | ||
117 | }, | ||
118 | [2] = { | ||
119 | .start = DMACH_I2S1_RX, | ||
120 | .end = DMACH_I2S1_RX, | ||
121 | .flags = IORESOURCE_DMA, | ||
122 | }, | ||
123 | }; | ||
124 | |||
125 | struct platform_device s5pv310_device_i2s1 = { | ||
126 | .name = "samsung-i2s", | ||
127 | .id = 1, | ||
128 | .num_resources = ARRAY_SIZE(s5pv310_i2s1_resource), | ||
129 | .resource = s5pv310_i2s1_resource, | ||
130 | .dev = { | ||
131 | .platform_data = &i2sv3_pdata, | ||
132 | }, | ||
133 | }; | ||
134 | |||
135 | static struct resource s5pv310_i2s2_resource[] = { | ||
136 | [0] = { | ||
137 | .start = S5PV310_PA_I2S2, | ||
138 | .end = S5PV310_PA_I2S2 + 0x100 - 1, | ||
139 | .flags = IORESOURCE_MEM, | ||
140 | }, | ||
141 | [1] = { | ||
142 | .start = DMACH_I2S2_TX, | ||
143 | .end = DMACH_I2S2_TX, | ||
144 | .flags = IORESOURCE_DMA, | ||
145 | }, | ||
146 | [2] = { | ||
147 | .start = DMACH_I2S2_RX, | ||
148 | .end = DMACH_I2S2_RX, | ||
149 | .flags = IORESOURCE_DMA, | ||
150 | }, | ||
151 | }; | ||
152 | |||
153 | struct platform_device s5pv310_device_i2s2 = { | ||
154 | .name = "samsung-i2s", | ||
155 | .id = 2, | ||
156 | .num_resources = ARRAY_SIZE(s5pv310_i2s2_resource), | ||
157 | .resource = s5pv310_i2s2_resource, | ||
158 | .dev = { | ||
159 | .platform_data = &i2sv3_pdata, | ||
160 | }, | ||
161 | }; | ||
162 | |||
163 | /* PCM Controller platform_devices */ | ||
164 | |||
165 | static int s5pv310_pcm_cfg_gpio(struct platform_device *pdev) | ||
166 | { | ||
167 | switch (pdev->id) { | ||
168 | case 0: | ||
169 | s3c_gpio_cfgpin_range(S5PV310_GPZ(0), 5, S3C_GPIO_SFN(3)); | ||
170 | break; | ||
171 | case 1: | ||
172 | s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(3)); | ||
173 | break; | ||
174 | case 2: | ||
175 | s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 5, S3C_GPIO_SFN(3)); | ||
176 | break; | ||
177 | default: | ||
178 | printk(KERN_DEBUG "Invalid PCM Controller number!"); | ||
179 | return -EINVAL; | ||
180 | } | ||
181 | |||
182 | return 0; | ||
183 | } | ||
184 | |||
185 | static struct s3c_audio_pdata s3c_pcm_pdata = { | ||
186 | .cfg_gpio = s5pv310_pcm_cfg_gpio, | ||
187 | }; | ||
188 | |||
189 | static struct resource s5pv310_pcm0_resource[] = { | ||
190 | [0] = { | ||
191 | .start = S5PV310_PA_PCM0, | ||
192 | .end = S5PV310_PA_PCM0 + 0x100 - 1, | ||
193 | .flags = IORESOURCE_MEM, | ||
194 | }, | ||
195 | [1] = { | ||
196 | .start = DMACH_PCM0_TX, | ||
197 | .end = DMACH_PCM0_TX, | ||
198 | .flags = IORESOURCE_DMA, | ||
199 | }, | ||
200 | [2] = { | ||
201 | .start = DMACH_PCM0_RX, | ||
202 | .end = DMACH_PCM0_RX, | ||
203 | .flags = IORESOURCE_DMA, | ||
204 | }, | ||
205 | }; | ||
206 | |||
207 | struct platform_device s5pv310_device_pcm0 = { | ||
208 | .name = "samsung-pcm", | ||
209 | .id = 0, | ||
210 | .num_resources = ARRAY_SIZE(s5pv310_pcm0_resource), | ||
211 | .resource = s5pv310_pcm0_resource, | ||
212 | .dev = { | ||
213 | .platform_data = &s3c_pcm_pdata, | ||
214 | }, | ||
215 | }; | ||
216 | |||
217 | static struct resource s5pv310_pcm1_resource[] = { | ||
218 | [0] = { | ||
219 | .start = S5PV310_PA_PCM1, | ||
220 | .end = S5PV310_PA_PCM1 + 0x100 - 1, | ||
221 | .flags = IORESOURCE_MEM, | ||
222 | }, | ||
223 | [1] = { | ||
224 | .start = DMACH_PCM1_TX, | ||
225 | .end = DMACH_PCM1_TX, | ||
226 | .flags = IORESOURCE_DMA, | ||
227 | }, | ||
228 | [2] = { | ||
229 | .start = DMACH_PCM1_RX, | ||
230 | .end = DMACH_PCM1_RX, | ||
231 | .flags = IORESOURCE_DMA, | ||
232 | }, | ||
233 | }; | ||
234 | |||
235 | struct platform_device s5pv310_device_pcm1 = { | ||
236 | .name = "samsung-pcm", | ||
237 | .id = 1, | ||
238 | .num_resources = ARRAY_SIZE(s5pv310_pcm1_resource), | ||
239 | .resource = s5pv310_pcm1_resource, | ||
240 | .dev = { | ||
241 | .platform_data = &s3c_pcm_pdata, | ||
242 | }, | ||
243 | }; | ||
244 | |||
245 | static struct resource s5pv310_pcm2_resource[] = { | ||
246 | [0] = { | ||
247 | .start = S5PV310_PA_PCM2, | ||
248 | .end = S5PV310_PA_PCM2 + 0x100 - 1, | ||
249 | .flags = IORESOURCE_MEM, | ||
250 | }, | ||
251 | [1] = { | ||
252 | .start = DMACH_PCM2_TX, | ||
253 | .end = DMACH_PCM2_TX, | ||
254 | .flags = IORESOURCE_DMA, | ||
255 | }, | ||
256 | [2] = { | ||
257 | .start = DMACH_PCM2_RX, | ||
258 | .end = DMACH_PCM2_RX, | ||
259 | .flags = IORESOURCE_DMA, | ||
260 | }, | ||
261 | }; | ||
262 | |||
263 | struct platform_device s5pv310_device_pcm2 = { | ||
264 | .name = "samsung-pcm", | ||
265 | .id = 2, | ||
266 | .num_resources = ARRAY_SIZE(s5pv310_pcm2_resource), | ||
267 | .resource = s5pv310_pcm2_resource, | ||
268 | .dev = { | ||
269 | .platform_data = &s3c_pcm_pdata, | ||
270 | }, | ||
271 | }; | ||
272 | |||
273 | /* AC97 Controller platform devices */ | ||
274 | |||
275 | static int s5pv310_ac97_cfg_gpio(struct platform_device *pdev) | ||
276 | { | ||
277 | return s3c_gpio_cfgpin_range(S5PV310_GPC0(0), 5, S3C_GPIO_SFN(4)); | ||
278 | } | ||
279 | |||
280 | static struct resource s5pv310_ac97_resource[] = { | ||
281 | [0] = { | ||
282 | .start = S5PV310_PA_AC97, | ||
283 | .end = S5PV310_PA_AC97 + 0x100 - 1, | ||
284 | .flags = IORESOURCE_MEM, | ||
285 | }, | ||
286 | [1] = { | ||
287 | .start = DMACH_AC97_PCMOUT, | ||
288 | .end = DMACH_AC97_PCMOUT, | ||
289 | .flags = IORESOURCE_DMA, | ||
290 | }, | ||
291 | [2] = { | ||
292 | .start = DMACH_AC97_PCMIN, | ||
293 | .end = DMACH_AC97_PCMIN, | ||
294 | .flags = IORESOURCE_DMA, | ||
295 | }, | ||
296 | [3] = { | ||
297 | .start = DMACH_AC97_MICIN, | ||
298 | .end = DMACH_AC97_MICIN, | ||
299 | .flags = IORESOURCE_DMA, | ||
300 | }, | ||
301 | [4] = { | ||
302 | .start = IRQ_AC97, | ||
303 | .end = IRQ_AC97, | ||
304 | .flags = IORESOURCE_IRQ, | ||
305 | }, | ||
306 | }; | ||
307 | |||
308 | static struct s3c_audio_pdata s3c_ac97_pdata = { | ||
309 | .cfg_gpio = s5pv310_ac97_cfg_gpio, | ||
310 | }; | ||
311 | |||
312 | static u64 s5pv310_ac97_dmamask = DMA_BIT_MASK(32); | ||
313 | |||
314 | struct platform_device s5pv310_device_ac97 = { | ||
315 | .name = "samsung-ac97", | ||
316 | .id = -1, | ||
317 | .num_resources = ARRAY_SIZE(s5pv310_ac97_resource), | ||
318 | .resource = s5pv310_ac97_resource, | ||
319 | .dev = { | ||
320 | .platform_data = &s3c_ac97_pdata, | ||
321 | .dma_mask = &s5pv310_ac97_dmamask, | ||
322 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
323 | }, | ||
324 | }; | ||
325 | |||
326 | /* S/PDIF Controller platform_device */ | ||
327 | |||
328 | static int s5pv310_spdif_cfg_gpio(struct platform_device *pdev) | ||
329 | { | ||
330 | s3c_gpio_cfgpin_range(S5PV310_GPC1(0), 2, S3C_GPIO_SFN(3)); | ||
331 | |||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | static struct resource s5pv310_spdif_resource[] = { | ||
336 | [0] = { | ||
337 | .start = S5PV310_PA_SPDIF, | ||
338 | .end = S5PV310_PA_SPDIF + 0x100 - 1, | ||
339 | .flags = IORESOURCE_MEM, | ||
340 | }, | ||
341 | [1] = { | ||
342 | .start = DMACH_SPDIF, | ||
343 | .end = DMACH_SPDIF, | ||
344 | .flags = IORESOURCE_DMA, | ||
345 | }, | ||
346 | }; | ||
347 | |||
348 | static struct s3c_audio_pdata samsung_spdif_pdata = { | ||
349 | .cfg_gpio = s5pv310_spdif_cfg_gpio, | ||
350 | }; | ||
351 | |||
352 | static u64 s5pv310_spdif_dmamask = DMA_BIT_MASK(32); | ||
353 | |||
354 | struct platform_device s5pv310_device_spdif = { | ||
355 | .name = "samsung-spdif", | ||
356 | .id = -1, | ||
357 | .num_resources = ARRAY_SIZE(s5pv310_spdif_resource), | ||
358 | .resource = s5pv310_spdif_resource, | ||
359 | .dev = { | ||
360 | .platform_data = &samsung_spdif_pdata, | ||
361 | .dma_mask = &s5pv310_spdif_dmamask, | ||
362 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
363 | }, | ||
364 | }; | ||
diff --git a/arch/arm/mach-s5pv310/dev-pd.c b/arch/arm/mach-s5pv310/dev-pd.c deleted file mode 100644 index 58a50c2d0b67..000000000000 --- a/arch/arm/mach-s5pv310/dev-pd.c +++ /dev/null | |||
@@ -1,139 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/dev-pd.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * S5PV310 - Power Domain support | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/io.h> | ||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/platform_device.h> | ||
16 | #include <linux/delay.h> | ||
17 | |||
18 | #include <mach/regs-pmu.h> | ||
19 | |||
20 | #include <plat/pd.h> | ||
21 | |||
22 | static int s5pv310_pd_enable(struct device *dev) | ||
23 | { | ||
24 | struct samsung_pd_info *pdata = dev->platform_data; | ||
25 | u32 timeout; | ||
26 | |||
27 | __raw_writel(S5P_INT_LOCAL_PWR_EN, pdata->base); | ||
28 | |||
29 | /* Wait max 1ms */ | ||
30 | timeout = 10; | ||
31 | while ((__raw_readl(pdata->base + 0x4) & S5P_INT_LOCAL_PWR_EN) | ||
32 | != S5P_INT_LOCAL_PWR_EN) { | ||
33 | if (timeout == 0) { | ||
34 | printk(KERN_ERR "Power domain %s enable failed.\n", | ||
35 | dev_name(dev)); | ||
36 | return -ETIMEDOUT; | ||
37 | } | ||
38 | timeout--; | ||
39 | udelay(100); | ||
40 | } | ||
41 | |||
42 | return 0; | ||
43 | } | ||
44 | |||
45 | static int s5pv310_pd_disable(struct device *dev) | ||
46 | { | ||
47 | struct samsung_pd_info *pdata = dev->platform_data; | ||
48 | u32 timeout; | ||
49 | |||
50 | __raw_writel(0, pdata->base); | ||
51 | |||
52 | /* Wait max 1ms */ | ||
53 | timeout = 10; | ||
54 | while (__raw_readl(pdata->base + 0x4) & S5P_INT_LOCAL_PWR_EN) { | ||
55 | if (timeout == 0) { | ||
56 | printk(KERN_ERR "Power domain %s disable failed.\n", | ||
57 | dev_name(dev)); | ||
58 | return -ETIMEDOUT; | ||
59 | } | ||
60 | timeout--; | ||
61 | udelay(100); | ||
62 | } | ||
63 | |||
64 | return 0; | ||
65 | } | ||
66 | |||
67 | struct platform_device s5pv310_device_pd[] = { | ||
68 | { | ||
69 | .name = "samsung-pd", | ||
70 | .id = 0, | ||
71 | .dev = { | ||
72 | .platform_data = &(struct samsung_pd_info) { | ||
73 | .enable = s5pv310_pd_enable, | ||
74 | .disable = s5pv310_pd_disable, | ||
75 | .base = S5P_PMU_MFC_CONF, | ||
76 | }, | ||
77 | }, | ||
78 | }, { | ||
79 | .name = "samsung-pd", | ||
80 | .id = 1, | ||
81 | .dev = { | ||
82 | .platform_data = &(struct samsung_pd_info) { | ||
83 | .enable = s5pv310_pd_enable, | ||
84 | .disable = s5pv310_pd_disable, | ||
85 | .base = S5P_PMU_G3D_CONF, | ||
86 | }, | ||
87 | }, | ||
88 | }, { | ||
89 | .name = "samsung-pd", | ||
90 | .id = 2, | ||
91 | .dev = { | ||
92 | .platform_data = &(struct samsung_pd_info) { | ||
93 | .enable = s5pv310_pd_enable, | ||
94 | .disable = s5pv310_pd_disable, | ||
95 | .base = S5P_PMU_LCD0_CONF, | ||
96 | }, | ||
97 | }, | ||
98 | }, { | ||
99 | .name = "samsung-pd", | ||
100 | .id = 3, | ||
101 | .dev = { | ||
102 | .platform_data = &(struct samsung_pd_info) { | ||
103 | .enable = s5pv310_pd_enable, | ||
104 | .disable = s5pv310_pd_disable, | ||
105 | .base = S5P_PMU_LCD1_CONF, | ||
106 | }, | ||
107 | }, | ||
108 | }, { | ||
109 | .name = "samsung-pd", | ||
110 | .id = 4, | ||
111 | .dev = { | ||
112 | .platform_data = &(struct samsung_pd_info) { | ||
113 | .enable = s5pv310_pd_enable, | ||
114 | .disable = s5pv310_pd_disable, | ||
115 | .base = S5P_PMU_TV_CONF, | ||
116 | }, | ||
117 | }, | ||
118 | }, { | ||
119 | .name = "samsung-pd", | ||
120 | .id = 5, | ||
121 | .dev = { | ||
122 | .platform_data = &(struct samsung_pd_info) { | ||
123 | .enable = s5pv310_pd_enable, | ||
124 | .disable = s5pv310_pd_disable, | ||
125 | .base = S5P_PMU_CAM_CONF, | ||
126 | }, | ||
127 | }, | ||
128 | }, { | ||
129 | .name = "samsung-pd", | ||
130 | .id = 6, | ||
131 | .dev = { | ||
132 | .platform_data = &(struct samsung_pd_info) { | ||
133 | .enable = s5pv310_pd_enable, | ||
134 | .disable = s5pv310_pd_disable, | ||
135 | .base = S5P_PMU_GPS_CONF, | ||
136 | }, | ||
137 | }, | ||
138 | }, | ||
139 | }; | ||
diff --git a/arch/arm/mach-s5pv310/dev-sysmmu.c b/arch/arm/mach-s5pv310/dev-sysmmu.c deleted file mode 100644 index e1bb200ac0f0..000000000000 --- a/arch/arm/mach-s5pv310/dev-sysmmu.c +++ /dev/null | |||
@@ -1,187 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/dev-sysmmu.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/platform_device.h> | ||
12 | #include <linux/dma-mapping.h> | ||
13 | |||
14 | #include <mach/map.h> | ||
15 | #include <mach/irqs.h> | ||
16 | |||
17 | static struct resource s5pv310_sysmmu_resource[] = { | ||
18 | [0] = { | ||
19 | .start = S5PV310_PA_SYSMMU_MDMA, | ||
20 | .end = S5PV310_PA_SYSMMU_MDMA + SZ_64K - 1, | ||
21 | .flags = IORESOURCE_MEM, | ||
22 | }, | ||
23 | [1] = { | ||
24 | .start = IRQ_SYSMMU_MDMA0_0, | ||
25 | .end = IRQ_SYSMMU_MDMA0_0, | ||
26 | .flags = IORESOURCE_IRQ, | ||
27 | }, | ||
28 | [2] = { | ||
29 | .start = S5PV310_PA_SYSMMU_SSS, | ||
30 | .end = S5PV310_PA_SYSMMU_SSS + SZ_64K - 1, | ||
31 | .flags = IORESOURCE_MEM, | ||
32 | }, | ||
33 | [3] = { | ||
34 | .start = IRQ_SYSMMU_SSS_0, | ||
35 | .end = IRQ_SYSMMU_SSS_0, | ||
36 | .flags = IORESOURCE_IRQ, | ||
37 | }, | ||
38 | [4] = { | ||
39 | .start = S5PV310_PA_SYSMMU_FIMC0, | ||
40 | .end = S5PV310_PA_SYSMMU_FIMC0 + SZ_64K - 1, | ||
41 | .flags = IORESOURCE_MEM, | ||
42 | }, | ||
43 | [5] = { | ||
44 | .start = IRQ_SYSMMU_FIMC0_0, | ||
45 | .end = IRQ_SYSMMU_FIMC0_0, | ||
46 | .flags = IORESOURCE_IRQ, | ||
47 | }, | ||
48 | [6] = { | ||
49 | .start = S5PV310_PA_SYSMMU_FIMC1, | ||
50 | .end = S5PV310_PA_SYSMMU_FIMC1 + SZ_64K - 1, | ||
51 | .flags = IORESOURCE_MEM, | ||
52 | }, | ||
53 | [7] = { | ||
54 | .start = IRQ_SYSMMU_FIMC1_0, | ||
55 | .end = IRQ_SYSMMU_FIMC1_0, | ||
56 | .flags = IORESOURCE_IRQ, | ||
57 | }, | ||
58 | [8] = { | ||
59 | .start = S5PV310_PA_SYSMMU_FIMC2, | ||
60 | .end = S5PV310_PA_SYSMMU_FIMC2 + SZ_64K - 1, | ||
61 | .flags = IORESOURCE_MEM, | ||
62 | }, | ||
63 | [9] = { | ||
64 | .start = IRQ_SYSMMU_FIMC2_0, | ||
65 | .end = IRQ_SYSMMU_FIMC2_0, | ||
66 | .flags = IORESOURCE_IRQ, | ||
67 | }, | ||
68 | [10] = { | ||
69 | .start = S5PV310_PA_SYSMMU_FIMC3, | ||
70 | .end = S5PV310_PA_SYSMMU_FIMC3 + SZ_64K - 1, | ||
71 | .flags = IORESOURCE_MEM, | ||
72 | }, | ||
73 | [11] = { | ||
74 | .start = IRQ_SYSMMU_FIMC3_0, | ||
75 | .end = IRQ_SYSMMU_FIMC3_0, | ||
76 | .flags = IORESOURCE_IRQ, | ||
77 | }, | ||
78 | [12] = { | ||
79 | .start = S5PV310_PA_SYSMMU_JPEG, | ||
80 | .end = S5PV310_PA_SYSMMU_JPEG + SZ_64K - 1, | ||
81 | .flags = IORESOURCE_MEM, | ||
82 | }, | ||
83 | [13] = { | ||
84 | .start = IRQ_SYSMMU_JPEG_0, | ||
85 | .end = IRQ_SYSMMU_JPEG_0, | ||
86 | .flags = IORESOURCE_IRQ, | ||
87 | }, | ||
88 | [14] = { | ||
89 | .start = S5PV310_PA_SYSMMU_FIMD0, | ||
90 | .end = S5PV310_PA_SYSMMU_FIMD0 + SZ_64K - 1, | ||
91 | .flags = IORESOURCE_MEM, | ||
92 | }, | ||
93 | [15] = { | ||
94 | .start = IRQ_SYSMMU_LCD0_M0_0, | ||
95 | .end = IRQ_SYSMMU_LCD0_M0_0, | ||
96 | .flags = IORESOURCE_IRQ, | ||
97 | }, | ||
98 | [16] = { | ||
99 | .start = S5PV310_PA_SYSMMU_FIMD1, | ||
100 | .end = S5PV310_PA_SYSMMU_FIMD1 + SZ_64K - 1, | ||
101 | .flags = IORESOURCE_MEM, | ||
102 | }, | ||
103 | [17] = { | ||
104 | .start = IRQ_SYSMMU_LCD1_M1_0, | ||
105 | .end = IRQ_SYSMMU_LCD1_M1_0, | ||
106 | .flags = IORESOURCE_IRQ, | ||
107 | }, | ||
108 | [18] = { | ||
109 | .start = S5PV310_PA_SYSMMU_PCIe, | ||
110 | .end = S5PV310_PA_SYSMMU_PCIe + SZ_64K - 1, | ||
111 | .flags = IORESOURCE_MEM, | ||
112 | }, | ||
113 | [19] = { | ||
114 | .start = IRQ_SYSMMU_PCIE_0, | ||
115 | .end = IRQ_SYSMMU_PCIE_0, | ||
116 | .flags = IORESOURCE_IRQ, | ||
117 | }, | ||
118 | [20] = { | ||
119 | .start = S5PV310_PA_SYSMMU_G2D, | ||
120 | .end = S5PV310_PA_SYSMMU_G2D + SZ_64K - 1, | ||
121 | .flags = IORESOURCE_MEM, | ||
122 | }, | ||
123 | [21] = { | ||
124 | .start = IRQ_SYSMMU_2D_0, | ||
125 | .end = IRQ_SYSMMU_2D_0, | ||
126 | .flags = IORESOURCE_IRQ, | ||
127 | }, | ||
128 | [22] = { | ||
129 | .start = S5PV310_PA_SYSMMU_ROTATOR, | ||
130 | .end = S5PV310_PA_SYSMMU_ROTATOR + SZ_64K - 1, | ||
131 | .flags = IORESOURCE_MEM, | ||
132 | }, | ||
133 | [23] = { | ||
134 | .start = IRQ_SYSMMU_ROTATOR_0, | ||
135 | .end = IRQ_SYSMMU_ROTATOR_0, | ||
136 | .flags = IORESOURCE_IRQ, | ||
137 | }, | ||
138 | [24] = { | ||
139 | .start = S5PV310_PA_SYSMMU_MDMA2, | ||
140 | .end = S5PV310_PA_SYSMMU_MDMA2 + SZ_64K - 1, | ||
141 | .flags = IORESOURCE_MEM, | ||
142 | }, | ||
143 | [25] = { | ||
144 | .start = IRQ_SYSMMU_MDMA1_0, | ||
145 | .end = IRQ_SYSMMU_MDMA1_0, | ||
146 | .flags = IORESOURCE_IRQ, | ||
147 | }, | ||
148 | [26] = { | ||
149 | .start = S5PV310_PA_SYSMMU_TV, | ||
150 | .end = S5PV310_PA_SYSMMU_TV + SZ_64K - 1, | ||
151 | .flags = IORESOURCE_MEM, | ||
152 | }, | ||
153 | [27] = { | ||
154 | .start = IRQ_SYSMMU_TV_M0_0, | ||
155 | .end = IRQ_SYSMMU_TV_M0_0, | ||
156 | .flags = IORESOURCE_IRQ, | ||
157 | }, | ||
158 | [28] = { | ||
159 | .start = S5PV310_PA_SYSMMU_MFC_L, | ||
160 | .end = S5PV310_PA_SYSMMU_MFC_L + SZ_64K - 1, | ||
161 | .flags = IORESOURCE_MEM, | ||
162 | }, | ||
163 | [29] = { | ||
164 | .start = IRQ_SYSMMU_MFC_M0_0, | ||
165 | .end = IRQ_SYSMMU_MFC_M0_0, | ||
166 | .flags = IORESOURCE_IRQ, | ||
167 | }, | ||
168 | [30] = { | ||
169 | .start = S5PV310_PA_SYSMMU_MFC_R, | ||
170 | .end = S5PV310_PA_SYSMMU_MFC_R + SZ_64K - 1, | ||
171 | .flags = IORESOURCE_MEM, | ||
172 | }, | ||
173 | [31] = { | ||
174 | .start = IRQ_SYSMMU_MFC_M1_0, | ||
175 | .end = IRQ_SYSMMU_MFC_M1_0, | ||
176 | .flags = IORESOURCE_IRQ, | ||
177 | }, | ||
178 | }; | ||
179 | |||
180 | struct platform_device s5pv310_device_sysmmu = { | ||
181 | .name = "s5p-sysmmu", | ||
182 | .id = 32, | ||
183 | .num_resources = ARRAY_SIZE(s5pv310_sysmmu_resource), | ||
184 | .resource = s5pv310_sysmmu_resource, | ||
185 | }; | ||
186 | |||
187 | EXPORT_SYMBOL(s5pv310_device_sysmmu); | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c1.c b/arch/arm/mach-s5pv310/setup-i2c1.c deleted file mode 100644 index 9d07e4e2f14c..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c1.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c1.c | ||
3 | * | ||
4 | * Copyright (C) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C1 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c1_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPD1(2), 2, | ||
22 | S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c2.c b/arch/arm/mach-s5pv310/setup-i2c2.c deleted file mode 100644 index 4163b1233daf..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c2.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c2.c | ||
3 | * | ||
4 | * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C2 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c2_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPA0(6), 2, | ||
22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c3.c b/arch/arm/mach-s5pv310/setup-i2c3.c deleted file mode 100644 index 180f153d2a20..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c3.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c3.c | ||
3 | * | ||
4 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C3 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c3_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPA1(2), 2, | ||
22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c4.c b/arch/arm/mach-s5pv310/setup-i2c4.c deleted file mode 100644 index 909e8dfc5316..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c4.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c4.c | ||
3 | * | ||
4 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C4 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c4_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPB(2), 2, | ||
22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c5.c b/arch/arm/mach-s5pv310/setup-i2c5.c deleted file mode 100644 index 5d0fa4ac0283..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c5.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c5.c | ||
3 | * | ||
4 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C5 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c5_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPB(6), 2, | ||
22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c6.c b/arch/arm/mach-s5pv310/setup-i2c6.c deleted file mode 100644 index 34aafab92ac4..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c6.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c6.c | ||
3 | * | ||
4 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C6 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c6_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPC1(3), 2, | ||
22 | S3C_GPIO_SFN(4), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-i2c7.c b/arch/arm/mach-s5pv310/setup-i2c7.c deleted file mode 100644 index 9b25b8d18920..000000000000 --- a/arch/arm/mach-s5pv310/setup-i2c7.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-s5pv310/setup-i2c7.c | ||
3 | * | ||
4 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
5 | * | ||
6 | * I2C7 GPIO configuration. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | struct platform_device; /* don't need the contents */ | ||
14 | |||
15 | #include <linux/gpio.h> | ||
16 | #include <plat/iic.h> | ||
17 | #include <plat/gpio-cfg.h> | ||
18 | |||
19 | void s3c_i2c7_cfg_gpio(struct platform_device *dev) | ||
20 | { | ||
21 | s3c_gpio_cfgall_range(S5PV310_GPD0(2), 2, | ||
22 | S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); | ||
23 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-sdhci-gpio.c b/arch/arm/mach-s5pv310/setup-sdhci-gpio.c deleted file mode 100644 index 86d38cc49135..000000000000 --- a/arch/arm/mach-s5pv310/setup-sdhci-gpio.c +++ /dev/null | |||
@@ -1,152 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/setup-sdhci-gpio.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com/ | ||
5 | * | ||
6 | * S5PV310 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC) | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/types.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <linux/io.h> | ||
18 | #include <linux/gpio.h> | ||
19 | #include <linux/mmc/host.h> | ||
20 | #include <linux/mmc/card.h> | ||
21 | |||
22 | #include <plat/gpio-cfg.h> | ||
23 | #include <plat/regs-sdhci.h> | ||
24 | #include <plat/sdhci.h> | ||
25 | |||
26 | void s5pv310_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) | ||
27 | { | ||
28 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | ||
29 | unsigned int gpio; | ||
30 | |||
31 | /* Set all the necessary GPK0[0:1] pins to special-function 2 */ | ||
32 | for (gpio = S5PV310_GPK0(0); gpio < S5PV310_GPK0(2); gpio++) { | ||
33 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
34 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
35 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
36 | } | ||
37 | |||
38 | switch (width) { | ||
39 | case 8: | ||
40 | for (gpio = S5PV310_GPK1(3); gpio <= S5PV310_GPK1(6); gpio++) { | ||
41 | /* Data pin GPK1[3:6] to special-funtion 3 */ | ||
42 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3)); | ||
43 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
44 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
45 | } | ||
46 | case 4: | ||
47 | for (gpio = S5PV310_GPK0(3); gpio <= S5PV310_GPK0(6); gpio++) { | ||
48 | /* Data pin GPK0[3:6] to special-funtion 2 */ | ||
49 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
50 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
51 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
52 | } | ||
53 | default: | ||
54 | break; | ||
55 | } | ||
56 | |||
57 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | ||
58 | s3c_gpio_cfgpin(S5PV310_GPK0(2), S3C_GPIO_SFN(2)); | ||
59 | s3c_gpio_setpull(S5PV310_GPK0(2), S3C_GPIO_PULL_UP); | ||
60 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
61 | } | ||
62 | } | ||
63 | |||
64 | void s5pv310_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width) | ||
65 | { | ||
66 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | ||
67 | unsigned int gpio; | ||
68 | |||
69 | /* Set all the necessary GPK1[0:1] pins to special-function 2 */ | ||
70 | for (gpio = S5PV310_GPK1(0); gpio < S5PV310_GPK1(2); gpio++) { | ||
71 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
72 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
73 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
74 | } | ||
75 | |||
76 | for (gpio = S5PV310_GPK1(3); gpio <= S5PV310_GPK1(6); gpio++) { | ||
77 | /* Data pin GPK1[3:6] to special-function 2 */ | ||
78 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
79 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
80 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
81 | } | ||
82 | |||
83 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | ||
84 | s3c_gpio_cfgpin(S5PV310_GPK1(2), S3C_GPIO_SFN(2)); | ||
85 | s3c_gpio_setpull(S5PV310_GPK1(2), S3C_GPIO_PULL_UP); | ||
86 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
87 | } | ||
88 | } | ||
89 | |||
90 | void s5pv310_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width) | ||
91 | { | ||
92 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | ||
93 | unsigned int gpio; | ||
94 | |||
95 | /* Set all the necessary GPK2[0:1] pins to special-function 2 */ | ||
96 | for (gpio = S5PV310_GPK2(0); gpio < S5PV310_GPK2(2); gpio++) { | ||
97 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
98 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
99 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
100 | } | ||
101 | |||
102 | switch (width) { | ||
103 | case 8: | ||
104 | for (gpio = S5PV310_GPK3(3); gpio <= S5PV310_GPK3(6); gpio++) { | ||
105 | /* Data pin GPK3[3:6] to special-function 3 */ | ||
106 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3)); | ||
107 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
108 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
109 | } | ||
110 | case 4: | ||
111 | for (gpio = S5PV310_GPK2(3); gpio <= S5PV310_GPK2(6); gpio++) { | ||
112 | /* Data pin GPK2[3:6] to special-function 2 */ | ||
113 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
114 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
115 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
116 | } | ||
117 | default: | ||
118 | break; | ||
119 | } | ||
120 | |||
121 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | ||
122 | s3c_gpio_cfgpin(S5PV310_GPK2(2), S3C_GPIO_SFN(2)); | ||
123 | s3c_gpio_setpull(S5PV310_GPK2(2), S3C_GPIO_PULL_UP); | ||
124 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
125 | } | ||
126 | } | ||
127 | |||
128 | void s5pv310_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width) | ||
129 | { | ||
130 | struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; | ||
131 | unsigned int gpio; | ||
132 | |||
133 | /* Set all the necessary GPK3[0:1] pins to special-function 2 */ | ||
134 | for (gpio = S5PV310_GPK3(0); gpio < S5PV310_GPK3(2); gpio++) { | ||
135 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
136 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
137 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
138 | } | ||
139 | |||
140 | for (gpio = S5PV310_GPK3(3); gpio <= S5PV310_GPK3(6); gpio++) { | ||
141 | /* Data pin GPK3[3:6] to special-function 2 */ | ||
142 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
143 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); | ||
144 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
145 | } | ||
146 | |||
147 | if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { | ||
148 | s3c_gpio_cfgpin(S5PV310_GPK3(2), S3C_GPIO_SFN(2)); | ||
149 | s3c_gpio_setpull(S5PV310_GPK3(2), S3C_GPIO_PULL_UP); | ||
150 | s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
151 | } | ||
152 | } | ||
diff --git a/arch/arm/mach-s5pv310/setup-sdhci.c b/arch/arm/mach-s5pv310/setup-sdhci.c deleted file mode 100644 index db8358fc4662..000000000000 --- a/arch/arm/mach-s5pv310/setup-sdhci.c +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/setup-sdhci.c | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com/ | ||
5 | * | ||
6 | * S5PV310 - Helper functions for settign up SDHCI device(s) (HSMMC) | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/types.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <linux/io.h> | ||
18 | |||
19 | #include <linux/mmc/card.h> | ||
20 | #include <linux/mmc/host.h> | ||
21 | |||
22 | #include <plat/regs-sdhci.h> | ||
23 | |||
24 | /* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */ | ||
25 | |||
26 | char *s5pv310_hsmmc_clksrcs[4] = { | ||
27 | [0] = NULL, | ||
28 | [1] = NULL, | ||
29 | [2] = "sclk_mmc", /* mmc_bus */ | ||
30 | [3] = NULL, | ||
31 | }; | ||
32 | |||
33 | void s5pv310_setup_sdhci_cfg_card(struct platform_device *dev, void __iomem *r, | ||
34 | struct mmc_ios *ios, struct mmc_card *card) | ||
35 | { | ||
36 | u32 ctrl2, ctrl3; | ||
37 | |||
38 | /* don't need to alter anything acording to card-type */ | ||
39 | |||
40 | ctrl2 = readl(r + S3C_SDHCI_CONTROL2); | ||
41 | |||
42 | /* select base clock source to HCLK */ | ||
43 | |||
44 | ctrl2 &= S3C_SDHCI_CTRL2_SELBASECLK_MASK; | ||
45 | |||
46 | /* | ||
47 | * clear async mode, enable conflict mask, rx feedback ctrl, SD | ||
48 | * clk hold and no use debounce count | ||
49 | */ | ||
50 | |||
51 | ctrl2 |= (S3C64XX_SDHCI_CTRL2_ENSTAASYNCCLR | | ||
52 | S3C64XX_SDHCI_CTRL2_ENCMDCNFMSK | | ||
53 | S3C_SDHCI_CTRL2_ENFBCLKRX | | ||
54 | S3C_SDHCI_CTRL2_DFCNT_NONE | | ||
55 | S3C_SDHCI_CTRL2_ENCLKOUTHOLD); | ||
56 | |||
57 | /* Tx and Rx feedback clock delay control */ | ||
58 | |||
59 | if (ios->clock < 25 * 1000000) | ||
60 | ctrl3 = (S3C_SDHCI_CTRL3_FCSEL3 | | ||
61 | S3C_SDHCI_CTRL3_FCSEL2 | | ||
62 | S3C_SDHCI_CTRL3_FCSEL1 | | ||
63 | S3C_SDHCI_CTRL3_FCSEL0); | ||
64 | else | ||
65 | ctrl3 = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0); | ||
66 | |||
67 | writel(ctrl2, r + S3C_SDHCI_CONTROL2); | ||
68 | writel(ctrl3, r + S3C_SDHCI_CONTROL3); | ||
69 | } | ||