diff options
author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
---|---|---|
committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /arch/arm/mach-s3c2410/include | |
parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'arch/arm/mach-s3c2410/include')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/dma.h | 265 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio-core.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 103 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 70 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/hardware.h | 95 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 333 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h | 36 |
9 files changed, 185 insertions, 722 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h index 13358ce2128c..c3a2629e0ded 100644 --- a/arch/arm/mach-s3c2410/include/mach/dma.h +++ b/arch/arm/mach-s3c2410/include/mach/dma.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * Copyright (C) 2003,2004,2006 Simtec Electronics | 3 | * Copyright (C) 2003,2004,2006 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * Samsung S3C241XX DMA support | 6 | * Samsung S3C24XX DMA support |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 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 | 9 | * it under the terms of the GNU General Public License version 2 as |
@@ -13,8 +13,8 @@ | |||
13 | #ifndef __ASM_ARCH_DMA_H | 13 | #ifndef __ASM_ARCH_DMA_H |
14 | #define __ASM_ARCH_DMA_H __FILE__ | 14 | #define __ASM_ARCH_DMA_H __FILE__ |
15 | 15 | ||
16 | #include <plat/dma.h> | ||
16 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
17 | #include <mach/hardware.h> | ||
18 | 18 | ||
19 | #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ | 19 | #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ |
20 | 20 | ||
@@ -55,9 +55,9 @@ enum dma_ch { | |||
55 | 55 | ||
56 | /* we have 4 dma channels */ | 56 | /* we have 4 dma channels */ |
57 | #ifndef CONFIG_CPU_S3C2443 | 57 | #ifndef CONFIG_CPU_S3C2443 |
58 | #define S3C2410_DMA_CHANNELS (4) | 58 | #define S3C_DMA_CHANNELS (4) |
59 | #else | 59 | #else |
60 | #define S3C2410_DMA_CHANNELS (6) | 60 | #define S3C_DMA_CHANNELS (6) |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | /* types */ | 63 | /* types */ |
@@ -68,7 +68,6 @@ enum s3c2410_dma_state { | |||
68 | S3C2410_DMA_PAUSED | 68 | S3C2410_DMA_PAUSED |
69 | }; | 69 | }; |
70 | 70 | ||
71 | |||
72 | /* enum s3c2410_dma_loadst | 71 | /* enum s3c2410_dma_loadst |
73 | * | 72 | * |
74 | * This represents the state of the DMA engine, wrt to the loaded / running | 73 | * This represents the state of the DMA engine, wrt to the loaded / running |
@@ -104,32 +103,6 @@ enum s3c2410_dma_loadst { | |||
104 | S3C2410_DMALOAD_1LOADED_1RUNNING, | 103 | S3C2410_DMALOAD_1LOADED_1RUNNING, |
105 | }; | 104 | }; |
106 | 105 | ||
107 | enum s3c2410_dma_buffresult { | ||
108 | S3C2410_RES_OK, | ||
109 | S3C2410_RES_ERR, | ||
110 | S3C2410_RES_ABORT | ||
111 | }; | ||
112 | |||
113 | enum s3c2410_dmasrc { | ||
114 | S3C2410_DMASRC_HW, /* source is memory */ | ||
115 | S3C2410_DMASRC_MEM /* source is hardware */ | ||
116 | }; | ||
117 | |||
118 | /* enum s3c2410_chan_op | ||
119 | * | ||
120 | * operation codes passed to the DMA code by the user, and also used | ||
121 | * to inform the current channel owner of any changes to the system state | ||
122 | */ | ||
123 | |||
124 | enum s3c2410_chan_op { | ||
125 | S3C2410_DMAOP_START, | ||
126 | S3C2410_DMAOP_STOP, | ||
127 | S3C2410_DMAOP_PAUSE, | ||
128 | S3C2410_DMAOP_RESUME, | ||
129 | S3C2410_DMAOP_FLUSH, | ||
130 | S3C2410_DMAOP_TIMEOUT, /* internal signal to handler */ | ||
131 | S3C2410_DMAOP_STARTED, /* indicate channel started */ | ||
132 | }; | ||
133 | 106 | ||
134 | /* flags */ | 107 | /* flags */ |
135 | 108 | ||
@@ -139,17 +112,14 @@ enum s3c2410_chan_op { | |||
139 | 112 | ||
140 | /* dma buffer */ | 113 | /* dma buffer */ |
141 | 114 | ||
142 | struct s3c2410_dma_client { | 115 | struct s3c2410_dma_buf; |
143 | char *name; | ||
144 | }; | ||
145 | 116 | ||
146 | /* s3c2410_dma_buf_s | 117 | /* s3c2410_dma_buf |
147 | * | 118 | * |
148 | * internally used buffer structure to describe a queued or running | 119 | * internally used buffer structure to describe a queued or running |
149 | * buffer. | 120 | * buffer. |
150 | */ | 121 | */ |
151 | 122 | ||
152 | struct s3c2410_dma_buf; | ||
153 | struct s3c2410_dma_buf { | 123 | struct s3c2410_dma_buf { |
154 | struct s3c2410_dma_buf *next; | 124 | struct s3c2410_dma_buf *next; |
155 | int magic; /* magic */ | 125 | int magic; /* magic */ |
@@ -161,20 +131,6 @@ struct s3c2410_dma_buf { | |||
161 | 131 | ||
162 | /* [1] is this updated for both recv/send modes? */ | 132 | /* [1] is this updated for both recv/send modes? */ |
163 | 133 | ||
164 | struct s3c2410_dma_chan; | ||
165 | |||
166 | /* s3c2410_dma_cbfn_t | ||
167 | * | ||
168 | * buffer callback routine type | ||
169 | */ | ||
170 | |||
171 | typedef void (*s3c2410_dma_cbfn_t)(struct s3c2410_dma_chan *, | ||
172 | void *buf, int size, | ||
173 | enum s3c2410_dma_buffresult result); | ||
174 | |||
175 | typedef int (*s3c2410_dma_opfn_t)(struct s3c2410_dma_chan *, | ||
176 | enum s3c2410_chan_op ); | ||
177 | |||
178 | struct s3c2410_dma_stats { | 134 | struct s3c2410_dma_stats { |
179 | unsigned long loads; | 135 | unsigned long loads; |
180 | unsigned long timeout_longest; | 136 | unsigned long timeout_longest; |
@@ -206,10 +162,10 @@ struct s3c2410_dma_chan { | |||
206 | 162 | ||
207 | /* channel configuration */ | 163 | /* channel configuration */ |
208 | enum s3c2410_dmasrc source; | 164 | enum s3c2410_dmasrc source; |
165 | enum dma_ch req_ch; | ||
209 | unsigned long dev_addr; | 166 | unsigned long dev_addr; |
210 | unsigned long load_timeout; | 167 | unsigned long load_timeout; |
211 | unsigned int flags; /* channel flags */ | 168 | unsigned int flags; /* channel flags */ |
212 | unsigned int hw_cfg; /* last hw config */ | ||
213 | 169 | ||
214 | struct s3c24xx_dma_map *map; /* channel hw maps */ | 170 | struct s3c24xx_dma_map *map; /* channel hw maps */ |
215 | 171 | ||
@@ -236,213 +192,6 @@ struct s3c2410_dma_chan { | |||
236 | struct sys_device dev; | 192 | struct sys_device dev; |
237 | }; | 193 | }; |
238 | 194 | ||
239 | /* the currently allocated channel information */ | ||
240 | extern struct s3c2410_dma_chan s3c2410_chans[]; | ||
241 | |||
242 | /* note, we don't really use dma_device_t at the moment */ | ||
243 | typedef unsigned long dma_device_t; | 195 | typedef unsigned long dma_device_t; |
244 | 196 | ||
245 | /* functions --------------------------------------------------------------- */ | ||
246 | |||
247 | /* s3c2410_dma_request | ||
248 | * | ||
249 | * request a dma channel exclusivley | ||
250 | */ | ||
251 | |||
252 | extern int s3c2410_dma_request(unsigned int channel, | ||
253 | struct s3c2410_dma_client *, void *dev); | ||
254 | |||
255 | |||
256 | /* s3c2410_dma_ctrl | ||
257 | * | ||
258 | * change the state of the dma channel | ||
259 | */ | ||
260 | |||
261 | extern int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op); | ||
262 | |||
263 | /* s3c2410_dma_setflags | ||
264 | * | ||
265 | * set the channel's flags to a given state | ||
266 | */ | ||
267 | |||
268 | extern int s3c2410_dma_setflags(unsigned int channel, | ||
269 | unsigned int flags); | ||
270 | |||
271 | /* s3c2410_dma_free | ||
272 | * | ||
273 | * free the dma channel (will also abort any outstanding operations) | ||
274 | */ | ||
275 | |||
276 | extern int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *); | ||
277 | |||
278 | /* s3c2410_dma_enqueue | ||
279 | * | ||
280 | * place the given buffer onto the queue of operations for the channel. | ||
281 | * The buffer must be allocated from dma coherent memory, or the Dcache/WB | ||
282 | * drained before the buffer is given to the DMA system. | ||
283 | */ | ||
284 | |||
285 | extern int s3c2410_dma_enqueue(unsigned int channel, void *id, | ||
286 | dma_addr_t data, int size); | ||
287 | |||
288 | /* s3c2410_dma_config | ||
289 | * | ||
290 | * configure the dma channel | ||
291 | */ | ||
292 | |||
293 | extern int s3c2410_dma_config(unsigned int channel, int xferunit, int dcon); | ||
294 | |||
295 | /* s3c2410_dma_devconfig | ||
296 | * | ||
297 | * configure the device we're talking to | ||
298 | */ | ||
299 | |||
300 | extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source, | ||
301 | int hwcfg, unsigned long devaddr); | ||
302 | |||
303 | /* s3c2410_dma_getposition | ||
304 | * | ||
305 | * get the position that the dma transfer is currently at | ||
306 | */ | ||
307 | |||
308 | extern int s3c2410_dma_getposition(unsigned int channel, | ||
309 | dma_addr_t *src, dma_addr_t *dest); | ||
310 | |||
311 | extern int s3c2410_dma_set_opfn(unsigned int, s3c2410_dma_opfn_t rtn); | ||
312 | extern int s3c2410_dma_set_buffdone_fn(unsigned int, s3c2410_dma_cbfn_t rtn); | ||
313 | |||
314 | /* DMA Register definitions */ | ||
315 | |||
316 | #define S3C2410_DMA_DISRC (0x00) | ||
317 | #define S3C2410_DMA_DISRCC (0x04) | ||
318 | #define S3C2410_DMA_DIDST (0x08) | ||
319 | #define S3C2410_DMA_DIDSTC (0x0C) | ||
320 | #define S3C2410_DMA_DCON (0x10) | ||
321 | #define S3C2410_DMA_DSTAT (0x14) | ||
322 | #define S3C2410_DMA_DCSRC (0x18) | ||
323 | #define S3C2410_DMA_DCDST (0x1C) | ||
324 | #define S3C2410_DMA_DMASKTRIG (0x20) | ||
325 | #define S3C2412_DMA_DMAREQSEL (0x24) | ||
326 | #define S3C2443_DMA_DMAREQSEL (0x24) | ||
327 | |||
328 | #define S3C2410_DISRCC_INC (1<<0) | ||
329 | #define S3C2410_DISRCC_APB (1<<1) | ||
330 | |||
331 | #define S3C2410_DMASKTRIG_STOP (1<<2) | ||
332 | #define S3C2410_DMASKTRIG_ON (1<<1) | ||
333 | #define S3C2410_DMASKTRIG_SWTRIG (1<<0) | ||
334 | |||
335 | #define S3C2410_DCON_DEMAND (0<<31) | ||
336 | #define S3C2410_DCON_HANDSHAKE (1<<31) | ||
337 | #define S3C2410_DCON_SYNC_PCLK (0<<30) | ||
338 | #define S3C2410_DCON_SYNC_HCLK (1<<30) | ||
339 | |||
340 | #define S3C2410_DCON_INTREQ (1<<29) | ||
341 | |||
342 | #define S3C2410_DCON_CH0_XDREQ0 (0<<24) | ||
343 | #define S3C2410_DCON_CH0_UART0 (1<<24) | ||
344 | #define S3C2410_DCON_CH0_SDI (2<<24) | ||
345 | #define S3C2410_DCON_CH0_TIMER (3<<24) | ||
346 | #define S3C2410_DCON_CH0_USBEP1 (4<<24) | ||
347 | |||
348 | #define S3C2410_DCON_CH1_XDREQ1 (0<<24) | ||
349 | #define S3C2410_DCON_CH1_UART1 (1<<24) | ||
350 | #define S3C2410_DCON_CH1_I2SSDI (2<<24) | ||
351 | #define S3C2410_DCON_CH1_SPI (3<<24) | ||
352 | #define S3C2410_DCON_CH1_USBEP2 (4<<24) | ||
353 | |||
354 | #define S3C2410_DCON_CH2_I2SSDO (0<<24) | ||
355 | #define S3C2410_DCON_CH2_I2SSDI (1<<24) | ||
356 | #define S3C2410_DCON_CH2_SDI (2<<24) | ||
357 | #define S3C2410_DCON_CH2_TIMER (3<<24) | ||
358 | #define S3C2410_DCON_CH2_USBEP3 (4<<24) | ||
359 | |||
360 | #define S3C2410_DCON_CH3_UART2 (0<<24) | ||
361 | #define S3C2410_DCON_CH3_SDI (1<<24) | ||
362 | #define S3C2410_DCON_CH3_SPI (2<<24) | ||
363 | #define S3C2410_DCON_CH3_TIMER (3<<24) | ||
364 | #define S3C2410_DCON_CH3_USBEP4 (4<<24) | ||
365 | |||
366 | #define S3C2410_DCON_SRCSHIFT (24) | ||
367 | #define S3C2410_DCON_SRCMASK (7<<24) | ||
368 | |||
369 | #define S3C2410_DCON_BYTE (0<<20) | ||
370 | #define S3C2410_DCON_HALFWORD (1<<20) | ||
371 | #define S3C2410_DCON_WORD (2<<20) | ||
372 | |||
373 | #define S3C2410_DCON_AUTORELOAD (0<<22) | ||
374 | #define S3C2410_DCON_NORELOAD (1<<22) | ||
375 | #define S3C2410_DCON_HWTRIG (1<<23) | ||
376 | |||
377 | #ifdef CONFIG_CPU_S3C2440 | ||
378 | #define S3C2440_DIDSTC_CHKINT (1<<2) | ||
379 | |||
380 | #define S3C2440_DCON_CH0_I2SSDO (5<<24) | ||
381 | #define S3C2440_DCON_CH0_PCMIN (6<<24) | ||
382 | |||
383 | #define S3C2440_DCON_CH1_PCMOUT (5<<24) | ||
384 | #define S3C2440_DCON_CH1_SDI (6<<24) | ||
385 | |||
386 | #define S3C2440_DCON_CH2_PCMIN (5<<24) | ||
387 | #define S3C2440_DCON_CH2_MICIN (6<<24) | ||
388 | |||
389 | #define S3C2440_DCON_CH3_MICIN (5<<24) | ||
390 | #define S3C2440_DCON_CH3_PCMOUT (6<<24) | ||
391 | #endif | ||
392 | |||
393 | #ifdef CONFIG_CPU_S3C2412 | ||
394 | |||
395 | #define S3C2412_DMAREQSEL_SRC(x) ((x)<<1) | ||
396 | |||
397 | #define S3C2412_DMAREQSEL_HW (1) | ||
398 | |||
399 | #define S3C2412_DMAREQSEL_SPI0TX S3C2412_DMAREQSEL_SRC(0) | ||
400 | #define S3C2412_DMAREQSEL_SPI0RX S3C2412_DMAREQSEL_SRC(1) | ||
401 | #define S3C2412_DMAREQSEL_SPI1TX S3C2412_DMAREQSEL_SRC(2) | ||
402 | #define S3C2412_DMAREQSEL_SPI1RX S3C2412_DMAREQSEL_SRC(3) | ||
403 | #define S3C2412_DMAREQSEL_I2STX S3C2412_DMAREQSEL_SRC(4) | ||
404 | #define S3C2412_DMAREQSEL_I2SRX S3C2412_DMAREQSEL_SRC(5) | ||
405 | #define S3C2412_DMAREQSEL_TIMER S3C2412_DMAREQSEL_SRC(9) | ||
406 | #define S3C2412_DMAREQSEL_SDI S3C2412_DMAREQSEL_SRC(10) | ||
407 | #define S3C2412_DMAREQSEL_USBEP1 S3C2412_DMAREQSEL_SRC(13) | ||
408 | #define S3C2412_DMAREQSEL_USBEP2 S3C2412_DMAREQSEL_SRC(14) | ||
409 | #define S3C2412_DMAREQSEL_USBEP3 S3C2412_DMAREQSEL_SRC(15) | ||
410 | #define S3C2412_DMAREQSEL_USBEP4 S3C2412_DMAREQSEL_SRC(16) | ||
411 | #define S3C2412_DMAREQSEL_XDREQ0 S3C2412_DMAREQSEL_SRC(17) | ||
412 | #define S3C2412_DMAREQSEL_XDREQ1 S3C2412_DMAREQSEL_SRC(18) | ||
413 | #define S3C2412_DMAREQSEL_UART0_0 S3C2412_DMAREQSEL_SRC(19) | ||
414 | #define S3C2412_DMAREQSEL_UART0_1 S3C2412_DMAREQSEL_SRC(20) | ||
415 | #define S3C2412_DMAREQSEL_UART1_0 S3C2412_DMAREQSEL_SRC(21) | ||
416 | #define S3C2412_DMAREQSEL_UART1_1 S3C2412_DMAREQSEL_SRC(22) | ||
417 | #define S3C2412_DMAREQSEL_UART2_0 S3C2412_DMAREQSEL_SRC(23) | ||
418 | #define S3C2412_DMAREQSEL_UART2_1 S3C2412_DMAREQSEL_SRC(24) | ||
419 | |||
420 | #endif | ||
421 | |||
422 | #define S3C2443_DMAREQSEL_SRC(x) ((x)<<1) | ||
423 | |||
424 | #define S3C2443_DMAREQSEL_HW (1) | ||
425 | |||
426 | #define S3C2443_DMAREQSEL_SPI0TX S3C2443_DMAREQSEL_SRC(0) | ||
427 | #define S3C2443_DMAREQSEL_SPI0RX S3C2443_DMAREQSEL_SRC(1) | ||
428 | #define S3C2443_DMAREQSEL_SPI1TX S3C2443_DMAREQSEL_SRC(2) | ||
429 | #define S3C2443_DMAREQSEL_SPI1RX S3C2443_DMAREQSEL_SRC(3) | ||
430 | #define S3C2443_DMAREQSEL_I2STX S3C2443_DMAREQSEL_SRC(4) | ||
431 | #define S3C2443_DMAREQSEL_I2SRX S3C2443_DMAREQSEL_SRC(5) | ||
432 | #define S3C2443_DMAREQSEL_TIMER S3C2443_DMAREQSEL_SRC(9) | ||
433 | #define S3C2443_DMAREQSEL_SDI S3C2443_DMAREQSEL_SRC(10) | ||
434 | #define S3C2443_DMAREQSEL_XDREQ0 S3C2443_DMAREQSEL_SRC(17) | ||
435 | #define S3C2443_DMAREQSEL_XDREQ1 S3C2443_DMAREQSEL_SRC(18) | ||
436 | #define S3C2443_DMAREQSEL_UART0_0 S3C2443_DMAREQSEL_SRC(19) | ||
437 | #define S3C2443_DMAREQSEL_UART0_1 S3C2443_DMAREQSEL_SRC(20) | ||
438 | #define S3C2443_DMAREQSEL_UART1_0 S3C2443_DMAREQSEL_SRC(21) | ||
439 | #define S3C2443_DMAREQSEL_UART1_1 S3C2443_DMAREQSEL_SRC(22) | ||
440 | #define S3C2443_DMAREQSEL_UART2_0 S3C2443_DMAREQSEL_SRC(23) | ||
441 | #define S3C2443_DMAREQSEL_UART2_1 S3C2443_DMAREQSEL_SRC(24) | ||
442 | #define S3C2443_DMAREQSEL_UART3_0 S3C2443_DMAREQSEL_SRC(25) | ||
443 | #define S3C2443_DMAREQSEL_UART3_1 S3C2443_DMAREQSEL_SRC(26) | ||
444 | #define S3C2443_DMAREQSEL_PCMOUT S3C2443_DMAREQSEL_SRC(27) | ||
445 | #define S3C2443_DMAREQSEL_PCMIN S3C2443_DMAREQSEL_SRC(28) | ||
446 | #define S3C2443_DMAREQSEL_MICIN S3C2443_DMAREQSEL_SRC(29) | ||
447 | |||
448 | #endif /* __ASM_ARCH_DMA_H */ | 197 | #endif /* __ASM_ARCH_DMA_H */ |
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h index 6c9fbb99ef14..8fe192081d3a 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h | |||
@@ -24,7 +24,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin) | |||
24 | { | 24 | { |
25 | struct s3c_gpio_chip *chip; | 25 | struct s3c_gpio_chip *chip; |
26 | 26 | ||
27 | if (pin > S3C2410_GPG10) | 27 | if (pin > S3C2410_GPG(10)) |
28 | return NULL; | 28 | return NULL; |
29 | 29 | ||
30 | chip = &s3c24xx_gpios[pin/32]; | 30 | chip = &s3c24xx_gpios[pin/32]; |
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h new file mode 100644 index 000000000000..801dff13858d --- /dev/null +++ b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h | |||
@@ -0,0 +1,103 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/gpio-fns.h | ||
2 | * | ||
3 | * Copyright (c) 2003,2009 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | * S3C2410 - hardware | ||
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 | /* These functions are in the to-be-removed category and it is strongly | ||
14 | * encouraged not to use these in new code. They will be marked deprecated | ||
15 | * very soon. | ||
16 | * | ||
17 | * Most of the functionality can be either replaced by the gpiocfg calls | ||
18 | * for the s3c platform or by the generic GPIOlib API. | ||
19 | */ | ||
20 | |||
21 | /* external functions for GPIO support | ||
22 | * | ||
23 | * These allow various different clients to access the same GPIO | ||
24 | * registers without conflicting. If your driver only owns the entire | ||
25 | * GPIO register, then it is safe to ioremap/__raw_{read|write} to it. | ||
26 | */ | ||
27 | |||
28 | /* s3c2410_gpio_cfgpin | ||
29 | * | ||
30 | * set the configuration of the given pin to the value passed. | ||
31 | * | ||
32 | * eg: | ||
33 | * s3c2410_gpio_cfgpin(S3C2410_GPA(0), S3C2410_GPA0_ADDR0); | ||
34 | * s3c2410_gpio_cfgpin(S3C2410_GPE(8), S3C2410_GPE8_SDDAT1); | ||
35 | */ | ||
36 | |||
37 | extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function); | ||
38 | |||
39 | extern unsigned int s3c2410_gpio_getcfg(unsigned int pin); | ||
40 | |||
41 | /* s3c2410_gpio_getirq | ||
42 | * | ||
43 | * turn the given pin number into the corresponding IRQ number | ||
44 | * | ||
45 | * returns: | ||
46 | * < 0 = no interrupt for this pin | ||
47 | * >=0 = interrupt number for the pin | ||
48 | */ | ||
49 | |||
50 | extern int s3c2410_gpio_getirq(unsigned int pin); | ||
51 | |||
52 | #ifdef CONFIG_CPU_S3C2400 | ||
53 | |||
54 | extern int s3c2400_gpio_getirq(unsigned int pin); | ||
55 | |||
56 | #endif /* CONFIG_CPU_S3C2400 */ | ||
57 | |||
58 | /* s3c2410_gpio_irqfilter | ||
59 | * | ||
60 | * set the irq filtering on the given pin | ||
61 | * | ||
62 | * on = 0 => disable filtering | ||
63 | * 1 => enable filtering | ||
64 | * | ||
65 | * config = S3C2410_EINTFLT_PCLK or S3C2410_EINTFLT_EXTCLK orred with | ||
66 | * width of filter (0 through 63) | ||
67 | * | ||
68 | * | ||
69 | */ | ||
70 | |||
71 | extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | ||
72 | unsigned int config); | ||
73 | |||
74 | /* s3c2410_gpio_pullup | ||
75 | * | ||
76 | * configure the pull-up control on the given pin | ||
77 | * | ||
78 | * to = 1 => disable the pull-up | ||
79 | * 0 => enable the pull-up | ||
80 | * | ||
81 | * eg; | ||
82 | * | ||
83 | * s3c2410_gpio_pullup(S3C2410_GPB(0), 0); | ||
84 | * s3c2410_gpio_pullup(S3C2410_GPE(8), 0); | ||
85 | */ | ||
86 | |||
87 | extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to); | ||
88 | |||
89 | /* s3c2410_gpio_getpull | ||
90 | * | ||
91 | * Read the state of the pull-up on a given pin | ||
92 | * | ||
93 | * return: | ||
94 | * < 0 => error code | ||
95 | * 0 => enabled | ||
96 | * 1 => disabled | ||
97 | */ | ||
98 | |||
99 | extern int s3c2410_gpio_getpull(unsigned int pin); | ||
100 | |||
101 | extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to); | ||
102 | |||
103 | extern unsigned int s3c2410_gpio_getpin(unsigned int pin); | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h index ce1ec69806a1..2edbb9c88ab3 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | |||
@@ -11,6 +11,9 @@ | |||
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #ifndef __MACH_GPIONRS_H | ||
15 | #define __MACH_GPIONRS_H | ||
16 | |||
14 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) | 17 | #define S3C2410_GPIONO(bank,offset) ((bank) + (offset)) |
15 | 18 | ||
16 | #define S3C2410_GPIO_BANKA (32*0) | 19 | #define S3C2410_GPIO_BANKA (32*0) |
@@ -21,3 +24,70 @@ | |||
21 | #define S3C2410_GPIO_BANKF (32*5) | 24 | #define S3C2410_GPIO_BANKF (32*5) |
22 | #define S3C2410_GPIO_BANKG (32*6) | 25 | #define S3C2410_GPIO_BANKG (32*6) |
23 | #define S3C2410_GPIO_BANKH (32*7) | 26 | #define S3C2410_GPIO_BANKH (32*7) |
27 | |||
28 | /* GPIO bank sizes */ | ||
29 | #define S3C2410_GPIO_A_NR (32) | ||
30 | #define S3C2410_GPIO_B_NR (32) | ||
31 | #define S3C2410_GPIO_C_NR (32) | ||
32 | #define S3C2410_GPIO_D_NR (32) | ||
33 | #define S3C2410_GPIO_E_NR (32) | ||
34 | #define S3C2410_GPIO_F_NR (32) | ||
35 | #define S3C2410_GPIO_G_NR (32) | ||
36 | #define S3C2410_GPIO_H_NR (32) | ||
37 | |||
38 | #if CONFIG_S3C_GPIO_SPACE != 0 | ||
39 | #error CONFIG_S3C_GPIO_SPACE cannot be zero at the moment | ||
40 | #endif | ||
41 | |||
42 | #define S3C2410_GPIO_NEXT(__gpio) \ | ||
43 | ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 0) | ||
44 | |||
45 | #ifndef __ASSEMBLY__ | ||
46 | |||
47 | enum s3c_gpio_number { | ||
48 | S3C2410_GPIO_A_START = 0, | ||
49 | S3C2410_GPIO_B_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_A), | ||
50 | S3C2410_GPIO_C_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_B), | ||
51 | S3C2410_GPIO_D_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_C), | ||
52 | S3C2410_GPIO_E_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_D), | ||
53 | S3C2410_GPIO_F_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_E), | ||
54 | S3C2410_GPIO_G_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_F), | ||
55 | S3C2410_GPIO_H_START = S3C2410_GPIO_NEXT(S3C2410_GPIO_G), | ||
56 | }; | ||
57 | |||
58 | #endif /* __ASSEMBLY__ */ | ||
59 | |||
60 | /* S3C2410 GPIO number definitions. */ | ||
61 | |||
62 | #define S3C2410_GPA(_nr) (S3C2410_GPIO_A_START + (_nr)) | ||
63 | #define S3C2410_GPB(_nr) (S3C2410_GPIO_B_START + (_nr)) | ||
64 | #define S3C2410_GPC(_nr) (S3C2410_GPIO_C_START + (_nr)) | ||
65 | #define S3C2410_GPD(_nr) (S3C2410_GPIO_D_START + (_nr)) | ||
66 | #define S3C2410_GPE(_nr) (S3C2410_GPIO_E_START + (_nr)) | ||
67 | #define S3C2410_GPF(_nr) (S3C2410_GPIO_F_START + (_nr)) | ||
68 | #define S3C2410_GPG(_nr) (S3C2410_GPIO_G_START + (_nr)) | ||
69 | #define S3C2410_GPH(_nr) (S3C2410_GPIO_H_START + (_nr)) | ||
70 | |||
71 | /* compatibility until drivers can be modified */ | ||
72 | |||
73 | #define S3C2410_GPA0 S3C2410_GPA(0) | ||
74 | #define S3C2410_GPA1 S3C2410_GPA(1) | ||
75 | #define S3C2410_GPA3 S3C2410_GPA(3) | ||
76 | #define S3C2410_GPA7 S3C2410_GPA(7) | ||
77 | |||
78 | #define S3C2410_GPE0 S3C2410_GPE(0) | ||
79 | #define S3C2410_GPE1 S3C2410_GPE(1) | ||
80 | #define S3C2410_GPE2 S3C2410_GPE(2) | ||
81 | #define S3C2410_GPE3 S3C2410_GPE(3) | ||
82 | #define S3C2410_GPE4 S3C2410_GPE(4) | ||
83 | #define S3C2410_GPE5 S3C2410_GPE(5) | ||
84 | #define S3C2410_GPE6 S3C2410_GPE(6) | ||
85 | #define S3C2410_GPE7 S3C2410_GPE(7) | ||
86 | #define S3C2410_GPE8 S3C2410_GPE(8) | ||
87 | #define S3C2410_GPE9 S3C2410_GPE(9) | ||
88 | #define S3C2410_GPE10 S3C2410_GPE(10) | ||
89 | |||
90 | #define S3C2410_GPH10 S3C2410_GPH(10) | ||
91 | |||
92 | #endif /* __MACH_GPIONRS_H */ | ||
93 | |||
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 51a88cf9526b..15f0b3e7ce69 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h | |||
@@ -24,5 +24,6 @@ | |||
24 | 24 | ||
25 | #include <asm-generic/gpio.h> | 25 | #include <asm-generic/gpio.h> |
26 | #include <mach/gpio-nrs.h> | 26 | #include <mach/gpio-nrs.h> |
27 | #include <mach/gpio-fns.h> | ||
27 | 28 | ||
28 | #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) | 29 | #define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32) |
diff --git a/arch/arm/mach-s3c2410/include/mach/hardware.h b/arch/arm/mach-s3c2410/include/mach/hardware.h index 74d5a1a4024c..aef5631eac58 100644 --- a/arch/arm/mach-s3c2410/include/mach/hardware.h +++ b/arch/arm/mach-s3c2410/include/mach/hardware.h | |||
@@ -15,101 +15,6 @@ | |||
15 | 15 | ||
16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
17 | 17 | ||
18 | /* external functions for GPIO support | ||
19 | * | ||
20 | * These allow various different clients to access the same GPIO | ||
21 | * registers without conflicting. If your driver only owns the entire | ||
22 | * GPIO register, then it is safe to ioremap/__raw_{read|write} to it. | ||
23 | */ | ||
24 | |||
25 | /* s3c2410_gpio_cfgpin | ||
26 | * | ||
27 | * set the configuration of the given pin to the value passed. | ||
28 | * | ||
29 | * eg: | ||
30 | * s3c2410_gpio_cfgpin(S3C2410_GPA0, S3C2410_GPA0_ADDR0); | ||
31 | * s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1); | ||
32 | */ | ||
33 | |||
34 | extern void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function); | ||
35 | |||
36 | extern unsigned int s3c2410_gpio_getcfg(unsigned int pin); | ||
37 | |||
38 | /* s3c2410_gpio_getirq | ||
39 | * | ||
40 | * turn the given pin number into the corresponding IRQ number | ||
41 | * | ||
42 | * returns: | ||
43 | * < 0 = no interrupt for this pin | ||
44 | * >=0 = interrupt number for the pin | ||
45 | */ | ||
46 | |||
47 | extern int s3c2410_gpio_getirq(unsigned int pin); | ||
48 | |||
49 | /* s3c2410_gpio_irq2pin | ||
50 | * | ||
51 | * turn the given irq number into the corresponding GPIO number | ||
52 | * | ||
53 | * returns: | ||
54 | * < 0 = no pin | ||
55 | * >=0 = gpio pin number | ||
56 | */ | ||
57 | |||
58 | extern int s3c2410_gpio_irq2pin(unsigned int irq); | ||
59 | |||
60 | #ifdef CONFIG_CPU_S3C2400 | ||
61 | |||
62 | extern int s3c2400_gpio_getirq(unsigned int pin); | ||
63 | |||
64 | #endif /* CONFIG_CPU_S3C2400 */ | ||
65 | |||
66 | /* s3c2410_gpio_irqfilter | ||
67 | * | ||
68 | * set the irq filtering on the given pin | ||
69 | * | ||
70 | * on = 0 => disable filtering | ||
71 | * 1 => enable filtering | ||
72 | * | ||
73 | * config = S3C2410_EINTFLT_PCLK or S3C2410_EINTFLT_EXTCLK orred with | ||
74 | * width of filter (0 through 63) | ||
75 | * | ||
76 | * | ||
77 | */ | ||
78 | |||
79 | extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | ||
80 | unsigned int config); | ||
81 | |||
82 | /* s3c2410_gpio_pullup | ||
83 | * | ||
84 | * configure the pull-up control on the given pin | ||
85 | * | ||
86 | * to = 1 => disable the pull-up | ||
87 | * 0 => enable the pull-up | ||
88 | * | ||
89 | * eg; | ||
90 | * | ||
91 | * s3c2410_gpio_pullup(S3C2410_GPB0, 0); | ||
92 | * s3c2410_gpio_pullup(S3C2410_GPE8, 0); | ||
93 | */ | ||
94 | |||
95 | extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to); | ||
96 | |||
97 | /* s3c2410_gpio_getpull | ||
98 | * | ||
99 | * Read the state of the pull-up on a given pin | ||
100 | * | ||
101 | * return: | ||
102 | * < 0 => error code | ||
103 | * 0 => enabled | ||
104 | * 1 => disabled | ||
105 | */ | ||
106 | |||
107 | extern int s3c2410_gpio_getpull(unsigned int pin); | ||
108 | |||
109 | extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to); | ||
110 | |||
111 | extern unsigned int s3c2410_gpio_getpin(unsigned int pin); | ||
112 | |||
113 | extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg); | 18 | extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg); |
114 | 19 | ||
115 | #ifdef CONFIG_CPU_S3C2440 | 20 | #ifdef CONFIG_CPU_S3C2440 |
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h index 255fdfeaf957..e99b212cb1ca 100644 --- a/arch/arm/mach-s3c2410/include/mach/map.h +++ b/arch/arm/mach-s3c2410/include/mach/map.h | |||
@@ -84,7 +84,6 @@ | |||
84 | 84 | ||
85 | #define S3C24XX_PA_IRQ S3C2410_PA_IRQ | 85 | #define S3C24XX_PA_IRQ S3C2410_PA_IRQ |
86 | #define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL | 86 | #define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL |
87 | #define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST | ||
88 | #define S3C24XX_PA_DMA S3C2410_PA_DMA | 87 | #define S3C24XX_PA_DMA S3C2410_PA_DMA |
89 | #define S3C24XX_PA_CLKPWR S3C2410_PA_CLKPWR | 88 | #define S3C24XX_PA_CLKPWR S3C2410_PA_CLKPWR |
90 | #define S3C24XX_PA_LCD S3C2410_PA_LCD | 89 | #define S3C24XX_PA_LCD S3C2410_PA_LCD |
@@ -102,6 +101,7 @@ | |||
102 | 101 | ||
103 | #define S3C_PA_IIC S3C2410_PA_IIC | 102 | #define S3C_PA_IIC S3C2410_PA_IIC |
104 | #define S3C_PA_UART S3C24XX_PA_UART | 103 | #define S3C_PA_UART S3C24XX_PA_UART |
104 | #define S3C_PA_USBHOST S3C2410_PA_USBHOST | ||
105 | #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC | 105 | #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC |
106 | 106 | ||
107 | #endif /* __ASM_ARCH_MAP_H */ | 107 | #endif /* __ASM_ARCH_MAP_H */ |
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h index 35a03df473fc..b278d0c45ccf 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h | |||
@@ -69,104 +69,58 @@ | |||
69 | #define S3C2400_GPACON S3C2410_GPIOREG(0x00) | 69 | #define S3C2400_GPACON S3C2410_GPIOREG(0x00) |
70 | #define S3C2400_GPADAT S3C2410_GPIOREG(0x04) | 70 | #define S3C2400_GPADAT S3C2410_GPIOREG(0x04) |
71 | 71 | ||
72 | #define S3C2410_GPA0 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 0) | ||
73 | #define S3C2410_GPA0_OUT (0<<0) | ||
74 | #define S3C2410_GPA0_ADDR0 (1<<0) | 72 | #define S3C2410_GPA0_ADDR0 (1<<0) |
75 | 73 | ||
76 | #define S3C2410_GPA1 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 1) | ||
77 | #define S3C2410_GPA1_OUT (0<<1) | ||
78 | #define S3C2410_GPA1_ADDR16 (1<<1) | 74 | #define S3C2410_GPA1_ADDR16 (1<<1) |
79 | 75 | ||
80 | #define S3C2410_GPA2 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 2) | ||
81 | #define S3C2410_GPA2_OUT (0<<2) | ||
82 | #define S3C2410_GPA2_ADDR17 (1<<2) | 76 | #define S3C2410_GPA2_ADDR17 (1<<2) |
83 | 77 | ||
84 | #define S3C2410_GPA3 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 3) | ||
85 | #define S3C2410_GPA3_OUT (0<<3) | ||
86 | #define S3C2410_GPA3_ADDR18 (1<<3) | 78 | #define S3C2410_GPA3_ADDR18 (1<<3) |
87 | 79 | ||
88 | #define S3C2410_GPA4 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 4) | ||
89 | #define S3C2410_GPA4_OUT (0<<4) | ||
90 | #define S3C2410_GPA4_ADDR19 (1<<4) | 80 | #define S3C2410_GPA4_ADDR19 (1<<4) |
91 | 81 | ||
92 | #define S3C2410_GPA5 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 5) | ||
93 | #define S3C2410_GPA5_OUT (0<<5) | ||
94 | #define S3C2410_GPA5_ADDR20 (1<<5) | 82 | #define S3C2410_GPA5_ADDR20 (1<<5) |
95 | 83 | ||
96 | #define S3C2410_GPA6 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 6) | ||
97 | #define S3C2410_GPA6_OUT (0<<6) | ||
98 | #define S3C2410_GPA6_ADDR21 (1<<6) | 84 | #define S3C2410_GPA6_ADDR21 (1<<6) |
99 | 85 | ||
100 | #define S3C2410_GPA7 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 7) | ||
101 | #define S3C2410_GPA7_OUT (0<<7) | ||
102 | #define S3C2410_GPA7_ADDR22 (1<<7) | 86 | #define S3C2410_GPA7_ADDR22 (1<<7) |
103 | 87 | ||
104 | #define S3C2410_GPA8 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 8) | ||
105 | #define S3C2410_GPA8_OUT (0<<8) | ||
106 | #define S3C2410_GPA8_ADDR23 (1<<8) | 88 | #define S3C2410_GPA8_ADDR23 (1<<8) |
107 | 89 | ||
108 | #define S3C2410_GPA9 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 9) | ||
109 | #define S3C2410_GPA9_OUT (0<<9) | ||
110 | #define S3C2410_GPA9_ADDR24 (1<<9) | 90 | #define S3C2410_GPA9_ADDR24 (1<<9) |
111 | 91 | ||
112 | #define S3C2410_GPA10 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 10) | ||
113 | #define S3C2410_GPA10_OUT (0<<10) | ||
114 | #define S3C2410_GPA10_ADDR25 (1<<10) | 92 | #define S3C2410_GPA10_ADDR25 (1<<10) |
115 | #define S3C2400_GPA10_SCKE (1<<10) | 93 | #define S3C2400_GPA10_SCKE (1<<10) |
116 | 94 | ||
117 | #define S3C2410_GPA11 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 11) | ||
118 | #define S3C2410_GPA11_OUT (0<<11) | ||
119 | #define S3C2410_GPA11_ADDR26 (1<<11) | 95 | #define S3C2410_GPA11_ADDR26 (1<<11) |
120 | #define S3C2400_GPA11_nCAS0 (1<<11) | 96 | #define S3C2400_GPA11_nCAS0 (1<<11) |
121 | 97 | ||
122 | #define S3C2410_GPA12 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 12) | ||
123 | #define S3C2410_GPA12_OUT (0<<12) | ||
124 | #define S3C2410_GPA12_nGCS1 (1<<12) | 98 | #define S3C2410_GPA12_nGCS1 (1<<12) |
125 | #define S3C2400_GPA12_nCAS1 (1<<12) | 99 | #define S3C2400_GPA12_nCAS1 (1<<12) |
126 | 100 | ||
127 | #define S3C2410_GPA13 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 13) | ||
128 | #define S3C2410_GPA13_OUT (0<<13) | ||
129 | #define S3C2410_GPA13_nGCS2 (1<<13) | 101 | #define S3C2410_GPA13_nGCS2 (1<<13) |
130 | #define S3C2400_GPA13_nGCS1 (1<<13) | 102 | #define S3C2400_GPA13_nGCS1 (1<<13) |
131 | 103 | ||
132 | #define S3C2410_GPA14 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 14) | ||
133 | #define S3C2410_GPA14_OUT (0<<14) | ||
134 | #define S3C2410_GPA14_nGCS3 (1<<14) | 104 | #define S3C2410_GPA14_nGCS3 (1<<14) |
135 | #define S3C2400_GPA14_nGCS2 (1<<14) | 105 | #define S3C2400_GPA14_nGCS2 (1<<14) |
136 | 106 | ||
137 | #define S3C2410_GPA15 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 15) | ||
138 | #define S3C2410_GPA15_OUT (0<<15) | ||
139 | #define S3C2410_GPA15_nGCS4 (1<<15) | 107 | #define S3C2410_GPA15_nGCS4 (1<<15) |
140 | #define S3C2400_GPA15_nGCS3 (1<<15) | 108 | #define S3C2400_GPA15_nGCS3 (1<<15) |
141 | 109 | ||
142 | #define S3C2410_GPA16 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 16) | ||
143 | #define S3C2410_GPA16_OUT (0<<16) | ||
144 | #define S3C2410_GPA16_nGCS5 (1<<16) | 110 | #define S3C2410_GPA16_nGCS5 (1<<16) |
145 | #define S3C2400_GPA16_nGCS4 (1<<16) | 111 | #define S3C2400_GPA16_nGCS4 (1<<16) |
146 | 112 | ||
147 | #define S3C2410_GPA17 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 17) | ||
148 | #define S3C2410_GPA17_OUT (0<<17) | ||
149 | #define S3C2410_GPA17_CLE (1<<17) | 113 | #define S3C2410_GPA17_CLE (1<<17) |
150 | #define S3C2400_GPA17_nGCS5 (1<<17) | 114 | #define S3C2400_GPA17_nGCS5 (1<<17) |
151 | 115 | ||
152 | #define S3C2410_GPA18 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 18) | ||
153 | #define S3C2410_GPA18_OUT (0<<18) | ||
154 | #define S3C2410_GPA18_ALE (1<<18) | 116 | #define S3C2410_GPA18_ALE (1<<18) |
155 | 117 | ||
156 | #define S3C2410_GPA19 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 19) | ||
157 | #define S3C2410_GPA19_OUT (0<<19) | ||
158 | #define S3C2410_GPA19_nFWE (1<<19) | 118 | #define S3C2410_GPA19_nFWE (1<<19) |
159 | 119 | ||
160 | #define S3C2410_GPA20 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 20) | ||
161 | #define S3C2410_GPA20_OUT (0<<20) | ||
162 | #define S3C2410_GPA20_nFRE (1<<20) | 120 | #define S3C2410_GPA20_nFRE (1<<20) |
163 | 121 | ||
164 | #define S3C2410_GPA21 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 21) | ||
165 | #define S3C2410_GPA21_OUT (0<<21) | ||
166 | #define S3C2410_GPA21_nRSTOUT (1<<21) | 122 | #define S3C2410_GPA21_nRSTOUT (1<<21) |
167 | 123 | ||
168 | #define S3C2410_GPA22 S3C2410_GPIONO(S3C2410_GPIO_BANKA, 22) | ||
169 | #define S3C2410_GPA22_OUT (0<<22) | ||
170 | #define S3C2410_GPA22_nFCE (1<<22) | 124 | #define S3C2410_GPA22_nFCE (1<<22) |
171 | 125 | ||
172 | /* 0x08 and 0x0c are reserved on S3C2410 */ | 126 | /* 0x08 and 0x0c are reserved on S3C2410 */ |
@@ -194,107 +148,69 @@ | |||
194 | 148 | ||
195 | /* no i/o pin in port b can have value 3 (unless it is a s3c2443) ! */ | 149 | /* no i/o pin in port b can have value 3 (unless it is a s3c2443) ! */ |
196 | 150 | ||
197 | #define S3C2410_GPB0 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 0) | ||
198 | #define S3C2410_GPB0_INP (0x00 << 0) | ||
199 | #define S3C2410_GPB0_OUTP (0x01 << 0) | ||
200 | #define S3C2410_GPB0_TOUT0 (0x02 << 0) | 151 | #define S3C2410_GPB0_TOUT0 (0x02 << 0) |
201 | #define S3C2400_GPB0_DATA16 (0x02 << 0) | 152 | #define S3C2400_GPB0_DATA16 (0x02 << 0) |
202 | 153 | ||
203 | #define S3C2410_GPB1 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 1) | ||
204 | #define S3C2410_GPB1_INP (0x00 << 2) | ||
205 | #define S3C2410_GPB1_OUTP (0x01 << 2) | ||
206 | #define S3C2410_GPB1_TOUT1 (0x02 << 2) | 154 | #define S3C2410_GPB1_TOUT1 (0x02 << 2) |
207 | #define S3C2400_GPB1_DATA17 (0x02 << 2) | 155 | #define S3C2400_GPB1_DATA17 (0x02 << 2) |
208 | 156 | ||
209 | #define S3C2410_GPB2 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 2) | ||
210 | #define S3C2410_GPB2_INP (0x00 << 4) | ||
211 | #define S3C2410_GPB2_OUTP (0x01 << 4) | ||
212 | #define S3C2410_GPB2_TOUT2 (0x02 << 4) | 157 | #define S3C2410_GPB2_TOUT2 (0x02 << 4) |
213 | #define S3C2400_GPB2_DATA18 (0x02 << 4) | 158 | #define S3C2400_GPB2_DATA18 (0x02 << 4) |
214 | #define S3C2400_GPB2_TCLK1 (0x03 << 4) | 159 | #define S3C2400_GPB2_TCLK1 (0x03 << 4) |
215 | 160 | ||
216 | #define S3C2410_GPB3 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 3) | ||
217 | #define S3C2410_GPB3_INP (0x00 << 6) | ||
218 | #define S3C2410_GPB3_OUTP (0x01 << 6) | ||
219 | #define S3C2410_GPB3_TOUT3 (0x02 << 6) | 161 | #define S3C2410_GPB3_TOUT3 (0x02 << 6) |
220 | #define S3C2400_GPB3_DATA19 (0x02 << 6) | 162 | #define S3C2400_GPB3_DATA19 (0x02 << 6) |
221 | #define S3C2400_GPB3_TXD1 (0x03 << 6) | 163 | #define S3C2400_GPB3_TXD1 (0x03 << 6) |
222 | 164 | ||
223 | #define S3C2410_GPB4 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 4) | ||
224 | #define S3C2410_GPB4_INP (0x00 << 8) | ||
225 | #define S3C2410_GPB4_OUTP (0x01 << 8) | ||
226 | #define S3C2410_GPB4_TCLK0 (0x02 << 8) | 165 | #define S3C2410_GPB4_TCLK0 (0x02 << 8) |
227 | #define S3C2400_GPB4_DATA20 (0x02 << 8) | 166 | #define S3C2400_GPB4_DATA20 (0x02 << 8) |
228 | #define S3C2410_GPB4_MASK (0x03 << 8) | 167 | #define S3C2410_GPB4_MASK (0x03 << 8) |
229 | #define S3C2400_GPB4_RXD1 (0x03 << 8) | 168 | #define S3C2400_GPB4_RXD1 (0x03 << 8) |
230 | #define S3C2400_GPB4_MASK (0x03 << 8) | 169 | #define S3C2400_GPB4_MASK (0x03 << 8) |
231 | 170 | ||
232 | #define S3C2410_GPB5 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 5) | ||
233 | #define S3C2410_GPB5_INP (0x00 << 10) | ||
234 | #define S3C2410_GPB5_OUTP (0x01 << 10) | ||
235 | #define S3C2410_GPB5_nXBACK (0x02 << 10) | 171 | #define S3C2410_GPB5_nXBACK (0x02 << 10) |
236 | #define S3C2443_GPB5_XBACK (0x03 << 10) | 172 | #define S3C2443_GPB5_XBACK (0x03 << 10) |
237 | #define S3C2400_GPB5_DATA21 (0x02 << 10) | 173 | #define S3C2400_GPB5_DATA21 (0x02 << 10) |
238 | #define S3C2400_GPB5_nCTS1 (0x03 << 10) | 174 | #define S3C2400_GPB5_nCTS1 (0x03 << 10) |
239 | 175 | ||
240 | #define S3C2410_GPB6 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 6) | ||
241 | #define S3C2410_GPB6_INP (0x00 << 12) | ||
242 | #define S3C2410_GPB6_OUTP (0x01 << 12) | ||
243 | #define S3C2410_GPB6_nXBREQ (0x02 << 12) | 176 | #define S3C2410_GPB6_nXBREQ (0x02 << 12) |
244 | #define S3C2443_GPB6_XBREQ (0x03 << 12) | 177 | #define S3C2443_GPB6_XBREQ (0x03 << 12) |
245 | #define S3C2400_GPB6_DATA22 (0x02 << 12) | 178 | #define S3C2400_GPB6_DATA22 (0x02 << 12) |
246 | #define S3C2400_GPB6_nRTS1 (0x03 << 12) | 179 | #define S3C2400_GPB6_nRTS1 (0x03 << 12) |
247 | 180 | ||
248 | #define S3C2410_GPB7 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 7) | ||
249 | #define S3C2410_GPB7_INP (0x00 << 14) | ||
250 | #define S3C2410_GPB7_OUTP (0x01 << 14) | ||
251 | #define S3C2410_GPB7_nXDACK1 (0x02 << 14) | 181 | #define S3C2410_GPB7_nXDACK1 (0x02 << 14) |
252 | #define S3C2443_GPB7_XDACK1 (0x03 << 14) | 182 | #define S3C2443_GPB7_XDACK1 (0x03 << 14) |
253 | #define S3C2400_GPB7_DATA23 (0x02 << 14) | 183 | #define S3C2400_GPB7_DATA23 (0x02 << 14) |
254 | 184 | ||
255 | #define S3C2410_GPB8 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 8) | ||
256 | #define S3C2410_GPB8_INP (0x00 << 16) | ||
257 | #define S3C2410_GPB8_OUTP (0x01 << 16) | ||
258 | #define S3C2410_GPB8_nXDREQ1 (0x02 << 16) | 185 | #define S3C2410_GPB8_nXDREQ1 (0x02 << 16) |
259 | #define S3C2400_GPB8_DATA24 (0x02 << 16) | 186 | #define S3C2400_GPB8_DATA24 (0x02 << 16) |
260 | 187 | ||
261 | #define S3C2410_GPB9 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 9) | ||
262 | #define S3C2410_GPB9_INP (0x00 << 18) | ||
263 | #define S3C2410_GPB9_OUTP (0x01 << 18) | ||
264 | #define S3C2410_GPB9_nXDACK0 (0x02 << 18) | 188 | #define S3C2410_GPB9_nXDACK0 (0x02 << 18) |
265 | #define S3C2443_GPB9_XDACK0 (0x03 << 18) | 189 | #define S3C2443_GPB9_XDACK0 (0x03 << 18) |
266 | #define S3C2400_GPB9_DATA25 (0x02 << 18) | 190 | #define S3C2400_GPB9_DATA25 (0x02 << 18) |
267 | #define S3C2400_GPB9_I2SSDI (0x03 << 18) | 191 | #define S3C2400_GPB9_I2SSDI (0x03 << 18) |
268 | 192 | ||
269 | #define S3C2410_GPB10 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 10) | ||
270 | #define S3C2410_GPB10_INP (0x00 << 20) | ||
271 | #define S3C2410_GPB10_OUTP (0x01 << 20) | ||
272 | #define S3C2410_GPB10_nXDRE0 (0x02 << 20) | 193 | #define S3C2410_GPB10_nXDRE0 (0x02 << 20) |
273 | #define S3C2443_GPB10_XDREQ0 (0x03 << 20) | 194 | #define S3C2443_GPB10_XDREQ0 (0x03 << 20) |
274 | #define S3C2400_GPB10_DATA26 (0x02 << 20) | 195 | #define S3C2400_GPB10_DATA26 (0x02 << 20) |
275 | #define S3C2400_GPB10_nSS (0x03 << 20) | 196 | #define S3C2400_GPB10_nSS (0x03 << 20) |
276 | 197 | ||
277 | #define S3C2400_GPB11 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 11) | ||
278 | #define S3C2400_GPB11_INP (0x00 << 22) | 198 | #define S3C2400_GPB11_INP (0x00 << 22) |
279 | #define S3C2400_GPB11_OUTP (0x01 << 22) | 199 | #define S3C2400_GPB11_OUTP (0x01 << 22) |
280 | #define S3C2400_GPB11_DATA27 (0x02 << 22) | 200 | #define S3C2400_GPB11_DATA27 (0x02 << 22) |
281 | 201 | ||
282 | #define S3C2400_GPB12 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 12) | ||
283 | #define S3C2400_GPB12_INP (0x00 << 24) | 202 | #define S3C2400_GPB12_INP (0x00 << 24) |
284 | #define S3C2400_GPB12_OUTP (0x01 << 24) | 203 | #define S3C2400_GPB12_OUTP (0x01 << 24) |
285 | #define S3C2400_GPB12_DATA28 (0x02 << 24) | 204 | #define S3C2400_GPB12_DATA28 (0x02 << 24) |
286 | 205 | ||
287 | #define S3C2400_GPB13 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 13) | ||
288 | #define S3C2400_GPB13_INP (0x00 << 26) | 206 | #define S3C2400_GPB13_INP (0x00 << 26) |
289 | #define S3C2400_GPB13_OUTP (0x01 << 26) | 207 | #define S3C2400_GPB13_OUTP (0x01 << 26) |
290 | #define S3C2400_GPB13_DATA29 (0x02 << 26) | 208 | #define S3C2400_GPB13_DATA29 (0x02 << 26) |
291 | 209 | ||
292 | #define S3C2400_GPB14 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 14) | ||
293 | #define S3C2400_GPB14_INP (0x00 << 28) | 210 | #define S3C2400_GPB14_INP (0x00 << 28) |
294 | #define S3C2400_GPB14_OUTP (0x01 << 28) | 211 | #define S3C2400_GPB14_OUTP (0x01 << 28) |
295 | #define S3C2400_GPB14_DATA30 (0x02 << 28) | 212 | #define S3C2400_GPB14_DATA30 (0x02 << 28) |
296 | 213 | ||
297 | #define S3C2400_GPB15 S3C2410_GPIONO(S3C2410_GPIO_BANKB, 15) | ||
298 | #define S3C2400_GPB15_INP (0x00 << 30) | 214 | #define S3C2400_GPB15_INP (0x00 << 30) |
299 | #define S3C2400_GPB15_OUTP (0x01 << 30) | 215 | #define S3C2400_GPB15_OUTP (0x01 << 30) |
300 | #define S3C2400_GPB15_DATA31 (0x02 << 30) | 216 | #define S3C2400_GPB15_DATA31 (0x02 << 30) |
@@ -315,99 +231,51 @@ | |||
315 | #define S3C2400_GPCDAT S3C2410_GPIOREG(0x18) | 231 | #define S3C2400_GPCDAT S3C2410_GPIOREG(0x18) |
316 | #define S3C2400_GPCUP S3C2410_GPIOREG(0x1C) | 232 | #define S3C2400_GPCUP S3C2410_GPIOREG(0x1C) |
317 | 233 | ||
318 | #define S3C2410_GPC0 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 0) | ||
319 | #define S3C2410_GPC0_INP (0x00 << 0) | ||
320 | #define S3C2410_GPC0_OUTP (0x01 << 0) | ||
321 | #define S3C2410_GPC0_LEND (0x02 << 0) | 234 | #define S3C2410_GPC0_LEND (0x02 << 0) |
322 | #define S3C2400_GPC0_VD0 (0x02 << 0) | 235 | #define S3C2400_GPC0_VD0 (0x02 << 0) |
323 | 236 | ||
324 | #define S3C2410_GPC1 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 1) | ||
325 | #define S3C2410_GPC1_INP (0x00 << 2) | ||
326 | #define S3C2410_GPC1_OUTP (0x01 << 2) | ||
327 | #define S3C2410_GPC1_VCLK (0x02 << 2) | 237 | #define S3C2410_GPC1_VCLK (0x02 << 2) |
328 | #define S3C2400_GPC1_VD1 (0x02 << 2) | 238 | #define S3C2400_GPC1_VD1 (0x02 << 2) |
329 | 239 | ||
330 | #define S3C2410_GPC2 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 2) | ||
331 | #define S3C2410_GPC2_INP (0x00 << 4) | ||
332 | #define S3C2410_GPC2_OUTP (0x01 << 4) | ||
333 | #define S3C2410_GPC2_VLINE (0x02 << 4) | 240 | #define S3C2410_GPC2_VLINE (0x02 << 4) |
334 | #define S3C2400_GPC2_VD2 (0x02 << 4) | 241 | #define S3C2400_GPC2_VD2 (0x02 << 4) |
335 | 242 | ||
336 | #define S3C2410_GPC3 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 3) | ||
337 | #define S3C2410_GPC3_INP (0x00 << 6) | ||
338 | #define S3C2410_GPC3_OUTP (0x01 << 6) | ||
339 | #define S3C2410_GPC3_VFRAME (0x02 << 6) | 243 | #define S3C2410_GPC3_VFRAME (0x02 << 6) |
340 | #define S3C2400_GPC3_VD3 (0x02 << 6) | 244 | #define S3C2400_GPC3_VD3 (0x02 << 6) |
341 | 245 | ||
342 | #define S3C2410_GPC4 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 4) | ||
343 | #define S3C2410_GPC4_INP (0x00 << 8) | ||
344 | #define S3C2410_GPC4_OUTP (0x01 << 8) | ||
345 | #define S3C2410_GPC4_VM (0x02 << 8) | 246 | #define S3C2410_GPC4_VM (0x02 << 8) |
346 | #define S3C2400_GPC4_VD4 (0x02 << 8) | 247 | #define S3C2400_GPC4_VD4 (0x02 << 8) |
347 | 248 | ||
348 | #define S3C2410_GPC5 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 5) | ||
349 | #define S3C2410_GPC5_INP (0x00 << 10) | ||
350 | #define S3C2410_GPC5_OUTP (0x01 << 10) | ||
351 | #define S3C2410_GPC5_LCDVF0 (0x02 << 10) | 249 | #define S3C2410_GPC5_LCDVF0 (0x02 << 10) |
352 | #define S3C2400_GPC5_VD5 (0x02 << 10) | 250 | #define S3C2400_GPC5_VD5 (0x02 << 10) |
353 | 251 | ||
354 | #define S3C2410_GPC6 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 6) | ||
355 | #define S3C2410_GPC6_INP (0x00 << 12) | ||
356 | #define S3C2410_GPC6_OUTP (0x01 << 12) | ||
357 | #define S3C2410_GPC6_LCDVF1 (0x02 << 12) | 252 | #define S3C2410_GPC6_LCDVF1 (0x02 << 12) |
358 | #define S3C2400_GPC6_VD6 (0x02 << 12) | 253 | #define S3C2400_GPC6_VD6 (0x02 << 12) |
359 | 254 | ||
360 | #define S3C2410_GPC7 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 7) | ||
361 | #define S3C2410_GPC7_INP (0x00 << 14) | ||
362 | #define S3C2410_GPC7_OUTP (0x01 << 14) | ||
363 | #define S3C2410_GPC7_LCDVF2 (0x02 << 14) | 255 | #define S3C2410_GPC7_LCDVF2 (0x02 << 14) |
364 | #define S3C2400_GPC7_VD7 (0x02 << 14) | 256 | #define S3C2400_GPC7_VD7 (0x02 << 14) |
365 | 257 | ||
366 | #define S3C2410_GPC8 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 8) | ||
367 | #define S3C2410_GPC8_INP (0x00 << 16) | ||
368 | #define S3C2410_GPC8_OUTP (0x01 << 16) | ||
369 | #define S3C2410_GPC8_VD0 (0x02 << 16) | 258 | #define S3C2410_GPC8_VD0 (0x02 << 16) |
370 | #define S3C2400_GPC8_VD8 (0x02 << 16) | 259 | #define S3C2400_GPC8_VD8 (0x02 << 16) |
371 | 260 | ||
372 | #define S3C2410_GPC9 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 9) | ||
373 | #define S3C2410_GPC9_INP (0x00 << 18) | ||
374 | #define S3C2410_GPC9_OUTP (0x01 << 18) | ||
375 | #define S3C2410_GPC9_VD1 (0x02 << 18) | 261 | #define S3C2410_GPC9_VD1 (0x02 << 18) |
376 | #define S3C2400_GPC9_VD9 (0x02 << 18) | 262 | #define S3C2400_GPC9_VD9 (0x02 << 18) |
377 | 263 | ||
378 | #define S3C2410_GPC10 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 10) | ||
379 | #define S3C2410_GPC10_INP (0x00 << 20) | ||
380 | #define S3C2410_GPC10_OUTP (0x01 << 20) | ||
381 | #define S3C2410_GPC10_VD2 (0x02 << 20) | 264 | #define S3C2410_GPC10_VD2 (0x02 << 20) |
382 | #define S3C2400_GPC10_VD10 (0x02 << 20) | 265 | #define S3C2400_GPC10_VD10 (0x02 << 20) |
383 | 266 | ||
384 | #define S3C2410_GPC11 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 11) | ||
385 | #define S3C2410_GPC11_INP (0x00 << 22) | ||
386 | #define S3C2410_GPC11_OUTP (0x01 << 22) | ||
387 | #define S3C2410_GPC11_VD3 (0x02 << 22) | 267 | #define S3C2410_GPC11_VD3 (0x02 << 22) |
388 | #define S3C2400_GPC11_VD11 (0x02 << 22) | 268 | #define S3C2400_GPC11_VD11 (0x02 << 22) |
389 | 269 | ||
390 | #define S3C2410_GPC12 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 12) | ||
391 | #define S3C2410_GPC12_INP (0x00 << 24) | ||
392 | #define S3C2410_GPC12_OUTP (0x01 << 24) | ||
393 | #define S3C2410_GPC12_VD4 (0x02 << 24) | 270 | #define S3C2410_GPC12_VD4 (0x02 << 24) |
394 | #define S3C2400_GPC12_VD12 (0x02 << 24) | 271 | #define S3C2400_GPC12_VD12 (0x02 << 24) |
395 | 272 | ||
396 | #define S3C2410_GPC13 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 13) | ||
397 | #define S3C2410_GPC13_INP (0x00 << 26) | ||
398 | #define S3C2410_GPC13_OUTP (0x01 << 26) | ||
399 | #define S3C2410_GPC13_VD5 (0x02 << 26) | 273 | #define S3C2410_GPC13_VD5 (0x02 << 26) |
400 | #define S3C2400_GPC13_VD13 (0x02 << 26) | 274 | #define S3C2400_GPC13_VD13 (0x02 << 26) |
401 | 275 | ||
402 | #define S3C2410_GPC14 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 14) | ||
403 | #define S3C2410_GPC14_INP (0x00 << 28) | ||
404 | #define S3C2410_GPC14_OUTP (0x01 << 28) | ||
405 | #define S3C2410_GPC14_VD6 (0x02 << 28) | 276 | #define S3C2410_GPC14_VD6 (0x02 << 28) |
406 | #define S3C2400_GPC14_VD14 (0x02 << 28) | 277 | #define S3C2400_GPC14_VD14 (0x02 << 28) |
407 | 278 | ||
408 | #define S3C2410_GPC15 S3C2410_GPIONO(S3C2410_GPIO_BANKC, 15) | ||
409 | #define S3C2410_GPC15_INP (0x00 << 30) | ||
410 | #define S3C2410_GPC15_OUTP (0x01 << 30) | ||
411 | #define S3C2410_GPC15_VD7 (0x02 << 30) | 279 | #define S3C2410_GPC15_VD7 (0x02 << 30) |
412 | #define S3C2400_GPC15_VD15 (0x02 << 30) | 280 | #define S3C2400_GPC15_VD15 (0x02 << 30) |
413 | 281 | ||
@@ -432,99 +300,51 @@ | |||
432 | #define S3C2400_GPDDAT S3C2410_GPIOREG(0x24) | 300 | #define S3C2400_GPDDAT S3C2410_GPIOREG(0x24) |
433 | #define S3C2400_GPDUP S3C2410_GPIOREG(0x28) | 301 | #define S3C2400_GPDUP S3C2410_GPIOREG(0x28) |
434 | 302 | ||
435 | #define S3C2410_GPD0 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 0) | ||
436 | #define S3C2410_GPD0_INP (0x00 << 0) | ||
437 | #define S3C2410_GPD0_OUTP (0x01 << 0) | ||
438 | #define S3C2410_GPD0_VD8 (0x02 << 0) | 303 | #define S3C2410_GPD0_VD8 (0x02 << 0) |
439 | #define S3C2400_GPD0_VFRAME (0x02 << 0) | 304 | #define S3C2400_GPD0_VFRAME (0x02 << 0) |
440 | #define S3C2442_GPD0_nSPICS1 (0x03 << 0) | 305 | #define S3C2442_GPD0_nSPICS1 (0x03 << 0) |
441 | 306 | ||
442 | #define S3C2410_GPD1 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 1) | ||
443 | #define S3C2410_GPD1_INP (0x00 << 2) | ||
444 | #define S3C2410_GPD1_OUTP (0x01 << 2) | ||
445 | #define S3C2410_GPD1_VD9 (0x02 << 2) | 307 | #define S3C2410_GPD1_VD9 (0x02 << 2) |
446 | #define S3C2400_GPD1_VM (0x02 << 2) | 308 | #define S3C2400_GPD1_VM (0x02 << 2) |
447 | #define S3C2442_GPD1_SPICLK1 (0x03 << 2) | 309 | #define S3C2442_GPD1_SPICLK1 (0x03 << 2) |
448 | 310 | ||
449 | #define S3C2410_GPD2 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 2) | ||
450 | #define S3C2410_GPD2_INP (0x00 << 4) | ||
451 | #define S3C2410_GPD2_OUTP (0x01 << 4) | ||
452 | #define S3C2410_GPD2_VD10 (0x02 << 4) | 311 | #define S3C2410_GPD2_VD10 (0x02 << 4) |
453 | #define S3C2400_GPD2_VLINE (0x02 << 4) | 312 | #define S3C2400_GPD2_VLINE (0x02 << 4) |
454 | 313 | ||
455 | #define S3C2410_GPD3 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 3) | ||
456 | #define S3C2410_GPD3_INP (0x00 << 6) | ||
457 | #define S3C2410_GPD3_OUTP (0x01 << 6) | ||
458 | #define S3C2410_GPD3_VD11 (0x02 << 6) | 314 | #define S3C2410_GPD3_VD11 (0x02 << 6) |
459 | #define S3C2400_GPD3_VCLK (0x02 << 6) | 315 | #define S3C2400_GPD3_VCLK (0x02 << 6) |
460 | 316 | ||
461 | #define S3C2410_GPD4 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 4) | ||
462 | #define S3C2410_GPD4_INP (0x00 << 8) | ||
463 | #define S3C2410_GPD4_OUTP (0x01 << 8) | ||
464 | #define S3C2410_GPD4_VD12 (0x02 << 8) | 317 | #define S3C2410_GPD4_VD12 (0x02 << 8) |
465 | #define S3C2400_GPD4_LEND (0x02 << 8) | 318 | #define S3C2400_GPD4_LEND (0x02 << 8) |
466 | 319 | ||
467 | #define S3C2410_GPD5 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 5) | ||
468 | #define S3C2410_GPD5_INP (0x00 << 10) | ||
469 | #define S3C2410_GPD5_OUTP (0x01 << 10) | ||
470 | #define S3C2410_GPD5_VD13 (0x02 << 10) | 320 | #define S3C2410_GPD5_VD13 (0x02 << 10) |
471 | #define S3C2400_GPD5_TOUT0 (0x02 << 10) | 321 | #define S3C2400_GPD5_TOUT0 (0x02 << 10) |
472 | 322 | ||
473 | #define S3C2410_GPD6 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 6) | ||
474 | #define S3C2410_GPD6_INP (0x00 << 12) | ||
475 | #define S3C2410_GPD6_OUTP (0x01 << 12) | ||
476 | #define S3C2410_GPD6_VD14 (0x02 << 12) | 323 | #define S3C2410_GPD6_VD14 (0x02 << 12) |
477 | #define S3C2400_GPD6_TOUT1 (0x02 << 12) | 324 | #define S3C2400_GPD6_TOUT1 (0x02 << 12) |
478 | 325 | ||
479 | #define S3C2410_GPD7 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 7) | ||
480 | #define S3C2410_GPD7_INP (0x00 << 14) | ||
481 | #define S3C2410_GPD7_OUTP (0x01 << 14) | ||
482 | #define S3C2410_GPD7_VD15 (0x02 << 14) | 326 | #define S3C2410_GPD7_VD15 (0x02 << 14) |
483 | #define S3C2400_GPD7_TOUT2 (0x02 << 14) | 327 | #define S3C2400_GPD7_TOUT2 (0x02 << 14) |
484 | 328 | ||
485 | #define S3C2410_GPD8 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 8) | ||
486 | #define S3C2410_GPD8_INP (0x00 << 16) | ||
487 | #define S3C2410_GPD8_OUTP (0x01 << 16) | ||
488 | #define S3C2410_GPD8_VD16 (0x02 << 16) | 329 | #define S3C2410_GPD8_VD16 (0x02 << 16) |
489 | #define S3C2400_GPD8_TOUT3 (0x02 << 16) | 330 | #define S3C2400_GPD8_TOUT3 (0x02 << 16) |
490 | 331 | ||
491 | #define S3C2410_GPD9 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 9) | ||
492 | #define S3C2410_GPD9_INP (0x00 << 18) | ||
493 | #define S3C2410_GPD9_OUTP (0x01 << 18) | ||
494 | #define S3C2410_GPD9_VD17 (0x02 << 18) | 332 | #define S3C2410_GPD9_VD17 (0x02 << 18) |
495 | #define S3C2400_GPD9_TCLK0 (0x02 << 18) | 333 | #define S3C2400_GPD9_TCLK0 (0x02 << 18) |
496 | #define S3C2410_GPD9_MASK (0x03 << 18) | 334 | #define S3C2410_GPD9_MASK (0x03 << 18) |
497 | 335 | ||
498 | #define S3C2410_GPD10 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 10) | ||
499 | #define S3C2410_GPD10_INP (0x00 << 20) | ||
500 | #define S3C2410_GPD10_OUTP (0x01 << 20) | ||
501 | #define S3C2410_GPD10_VD18 (0x02 << 20) | 336 | #define S3C2410_GPD10_VD18 (0x02 << 20) |
502 | #define S3C2400_GPD10_nWAIT (0x02 << 20) | 337 | #define S3C2400_GPD10_nWAIT (0x02 << 20) |
503 | 338 | ||
504 | #define S3C2410_GPD11 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 11) | ||
505 | #define S3C2410_GPD11_INP (0x00 << 22) | ||
506 | #define S3C2410_GPD11_OUTP (0x01 << 22) | ||
507 | #define S3C2410_GPD11_VD19 (0x02 << 22) | 339 | #define S3C2410_GPD11_VD19 (0x02 << 22) |
508 | 340 | ||
509 | #define S3C2410_GPD12 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 12) | ||
510 | #define S3C2410_GPD12_INP (0x00 << 24) | ||
511 | #define S3C2410_GPD12_OUTP (0x01 << 24) | ||
512 | #define S3C2410_GPD12_VD20 (0x02 << 24) | 341 | #define S3C2410_GPD12_VD20 (0x02 << 24) |
513 | 342 | ||
514 | #define S3C2410_GPD13 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 13) | ||
515 | #define S3C2410_GPD13_INP (0x00 << 26) | ||
516 | #define S3C2410_GPD13_OUTP (0x01 << 26) | ||
517 | #define S3C2410_GPD13_VD21 (0x02 << 26) | 343 | #define S3C2410_GPD13_VD21 (0x02 << 26) |
518 | 344 | ||
519 | #define S3C2410_GPD14 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 14) | ||
520 | #define S3C2410_GPD14_INP (0x00 << 28) | ||
521 | #define S3C2410_GPD14_OUTP (0x01 << 28) | ||
522 | #define S3C2410_GPD14_VD22 (0x02 << 28) | 345 | #define S3C2410_GPD14_VD22 (0x02 << 28) |
523 | #define S3C2410_GPD14_nSS1 (0x03 << 28) | 346 | #define S3C2410_GPD14_nSS1 (0x03 << 28) |
524 | 347 | ||
525 | #define S3C2410_GPD15 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 15) | ||
526 | #define S3C2410_GPD15_INP (0x00 << 30) | ||
527 | #define S3C2410_GPD15_OUTP (0x01 << 30) | ||
528 | #define S3C2410_GPD15_VD23 (0x02 << 30) | 348 | #define S3C2410_GPD15_VD23 (0x02 << 30) |
529 | #define S3C2410_GPD15_nSS0 (0x03 << 30) | 349 | #define S3C2410_GPD15_nSS0 (0x03 << 30) |
530 | 350 | ||
@@ -550,34 +370,22 @@ | |||
550 | #define S3C2400_GPEDAT S3C2410_GPIOREG(0x30) | 370 | #define S3C2400_GPEDAT S3C2410_GPIOREG(0x30) |
551 | #define S3C2400_GPEUP S3C2410_GPIOREG(0x34) | 371 | #define S3C2400_GPEUP S3C2410_GPIOREG(0x34) |
552 | 372 | ||
553 | #define S3C2410_GPE0 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 0) | ||
554 | #define S3C2410_GPE0_INP (0x00 << 0) | ||
555 | #define S3C2410_GPE0_OUTP (0x01 << 0) | ||
556 | #define S3C2410_GPE0_I2SLRCK (0x02 << 0) | 373 | #define S3C2410_GPE0_I2SLRCK (0x02 << 0) |
557 | #define S3C2443_GPE0_AC_nRESET (0x03 << 0) | 374 | #define S3C2443_GPE0_AC_nRESET (0x03 << 0) |
558 | #define S3C2400_GPE0_EINT0 (0x02 << 0) | 375 | #define S3C2400_GPE0_EINT0 (0x02 << 0) |
559 | #define S3C2410_GPE0_MASK (0x03 << 0) | 376 | #define S3C2410_GPE0_MASK (0x03 << 0) |
560 | 377 | ||
561 | #define S3C2410_GPE1 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 1) | ||
562 | #define S3C2410_GPE1_INP (0x00 << 2) | ||
563 | #define S3C2410_GPE1_OUTP (0x01 << 2) | ||
564 | #define S3C2410_GPE1_I2SSCLK (0x02 << 2) | 378 | #define S3C2410_GPE1_I2SSCLK (0x02 << 2) |
565 | #define S3C2443_GPE1_AC_SYNC (0x03 << 2) | 379 | #define S3C2443_GPE1_AC_SYNC (0x03 << 2) |
566 | #define S3C2400_GPE1_EINT1 (0x02 << 2) | 380 | #define S3C2400_GPE1_EINT1 (0x02 << 2) |
567 | #define S3C2400_GPE1_nSS (0x03 << 2) | 381 | #define S3C2400_GPE1_nSS (0x03 << 2) |
568 | #define S3C2410_GPE1_MASK (0x03 << 2) | 382 | #define S3C2410_GPE1_MASK (0x03 << 2) |
569 | 383 | ||
570 | #define S3C2410_GPE2 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 2) | ||
571 | #define S3C2410_GPE2_INP (0x00 << 4) | ||
572 | #define S3C2410_GPE2_OUTP (0x01 << 4) | ||
573 | #define S3C2410_GPE2_CDCLK (0x02 << 4) | 384 | #define S3C2410_GPE2_CDCLK (0x02 << 4) |
574 | #define S3C2443_GPE2_AC_BITCLK (0x03 << 4) | 385 | #define S3C2443_GPE2_AC_BITCLK (0x03 << 4) |
575 | #define S3C2400_GPE2_EINT2 (0x02 << 4) | 386 | #define S3C2400_GPE2_EINT2 (0x02 << 4) |
576 | #define S3C2400_GPE2_I2SSDI (0x03 << 4) | 387 | #define S3C2400_GPE2_I2SSDI (0x03 << 4) |
577 | 388 | ||
578 | #define S3C2410_GPE3 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 3) | ||
579 | #define S3C2410_GPE3_INP (0x00 << 6) | ||
580 | #define S3C2410_GPE3_OUTP (0x01 << 6) | ||
581 | #define S3C2410_GPE3_I2SSDI (0x02 << 6) | 389 | #define S3C2410_GPE3_I2SSDI (0x02 << 6) |
582 | #define S3C2443_GPE3_AC_SDI (0x03 << 6) | 390 | #define S3C2443_GPE3_AC_SDI (0x03 << 6) |
583 | #define S3C2400_GPE3_EINT3 (0x02 << 6) | 391 | #define S3C2400_GPE3_EINT3 (0x02 << 6) |
@@ -585,9 +393,6 @@ | |||
585 | #define S3C2410_GPE3_nSS0 (0x03 << 6) | 393 | #define S3C2410_GPE3_nSS0 (0x03 << 6) |
586 | #define S3C2410_GPE3_MASK (0x03 << 6) | 394 | #define S3C2410_GPE3_MASK (0x03 << 6) |
587 | 395 | ||
588 | #define S3C2410_GPE4 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 4) | ||
589 | #define S3C2410_GPE4_INP (0x00 << 8) | ||
590 | #define S3C2410_GPE4_OUTP (0x01 << 8) | ||
591 | #define S3C2410_GPE4_I2SSDO (0x02 << 8) | 396 | #define S3C2410_GPE4_I2SSDO (0x02 << 8) |
592 | #define S3C2443_GPE4_AC_SDO (0x03 << 8) | 397 | #define S3C2443_GPE4_AC_SDO (0x03 << 8) |
593 | #define S3C2400_GPE4_EINT4 (0x02 << 8) | 398 | #define S3C2400_GPE4_EINT4 (0x02 << 8) |
@@ -595,81 +400,48 @@ | |||
595 | #define S3C2410_GPE4_I2SSDI (0x03 << 8) | 400 | #define S3C2410_GPE4_I2SSDI (0x03 << 8) |
596 | #define S3C2410_GPE4_MASK (0x03 << 8) | 401 | #define S3C2410_GPE4_MASK (0x03 << 8) |
597 | 402 | ||
598 | #define S3C2410_GPE5 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 5) | ||
599 | #define S3C2410_GPE5_INP (0x00 << 10) | ||
600 | #define S3C2410_GPE5_OUTP (0x01 << 10) | ||
601 | #define S3C2410_GPE5_SDCLK (0x02 << 10) | 403 | #define S3C2410_GPE5_SDCLK (0x02 << 10) |
602 | #define S3C2443_GPE5_SD1_CLK (0x02 << 10) | 404 | #define S3C2443_GPE5_SD1_CLK (0x02 << 10) |
603 | #define S3C2400_GPE5_EINT5 (0x02 << 10) | 405 | #define S3C2400_GPE5_EINT5 (0x02 << 10) |
604 | #define S3C2400_GPE5_TCLK1 (0x03 << 10) | 406 | #define S3C2400_GPE5_TCLK1 (0x03 << 10) |
605 | 407 | ||
606 | #define S3C2410_GPE6 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 6) | ||
607 | #define S3C2410_GPE6_INP (0x00 << 12) | ||
608 | #define S3C2410_GPE6_OUTP (0x01 << 12) | ||
609 | #define S3C2410_GPE6_SDCMD (0x02 << 12) | 408 | #define S3C2410_GPE6_SDCMD (0x02 << 12) |
610 | #define S3C2443_GPE6_SD1_CMD (0x02 << 12) | 409 | #define S3C2443_GPE6_SD1_CMD (0x02 << 12) |
611 | #define S3C2443_GPE6_AC_BITCLK (0x03 << 12) | 410 | #define S3C2443_GPE6_AC_BITCLK (0x03 << 12) |
612 | #define S3C2400_GPE6_EINT6 (0x02 << 12) | 411 | #define S3C2400_GPE6_EINT6 (0x02 << 12) |
613 | 412 | ||
614 | #define S3C2410_GPE7 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 7) | ||
615 | #define S3C2410_GPE7_INP (0x00 << 14) | ||
616 | #define S3C2410_GPE7_OUTP (0x01 << 14) | ||
617 | #define S3C2410_GPE7_SDDAT0 (0x02 << 14) | 413 | #define S3C2410_GPE7_SDDAT0 (0x02 << 14) |
618 | #define S3C2443_GPE5_SD1_DAT0 (0x02 << 14) | 414 | #define S3C2443_GPE5_SD1_DAT0 (0x02 << 14) |
619 | #define S3C2443_GPE7_AC_SDI (0x03 << 14) | 415 | #define S3C2443_GPE7_AC_SDI (0x03 << 14) |
620 | #define S3C2400_GPE7_EINT7 (0x02 << 14) | 416 | #define S3C2400_GPE7_EINT7 (0x02 << 14) |
621 | 417 | ||
622 | #define S3C2410_GPE8 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 8) | ||
623 | #define S3C2410_GPE8_INP (0x00 << 16) | ||
624 | #define S3C2410_GPE8_OUTP (0x01 << 16) | ||
625 | #define S3C2410_GPE8_SDDAT1 (0x02 << 16) | 418 | #define S3C2410_GPE8_SDDAT1 (0x02 << 16) |
626 | #define S3C2443_GPE8_SD1_DAT1 (0x02 << 16) | 419 | #define S3C2443_GPE8_SD1_DAT1 (0x02 << 16) |
627 | #define S3C2443_GPE8_AC_SDO (0x03 << 16) | 420 | #define S3C2443_GPE8_AC_SDO (0x03 << 16) |
628 | #define S3C2400_GPE8_nXDACK0 (0x02 << 16) | 421 | #define S3C2400_GPE8_nXDACK0 (0x02 << 16) |
629 | 422 | ||
630 | #define S3C2410_GPE9 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 9) | ||
631 | #define S3C2410_GPE9_INP (0x00 << 18) | ||
632 | #define S3C2410_GPE9_OUTP (0x01 << 18) | ||
633 | #define S3C2410_GPE9_SDDAT2 (0x02 << 18) | 423 | #define S3C2410_GPE9_SDDAT2 (0x02 << 18) |
634 | #define S3C2443_GPE9_SD1_DAT2 (0x02 << 18) | 424 | #define S3C2443_GPE9_SD1_DAT2 (0x02 << 18) |
635 | #define S3C2443_GPE9_AC_SYNC (0x03 << 18) | 425 | #define S3C2443_GPE9_AC_SYNC (0x03 << 18) |
636 | #define S3C2400_GPE9_nXDACK1 (0x02 << 18) | 426 | #define S3C2400_GPE9_nXDACK1 (0x02 << 18) |
637 | #define S3C2400_GPE9_nXBACK (0x03 << 18) | 427 | #define S3C2400_GPE9_nXBACK (0x03 << 18) |
638 | 428 | ||
639 | #define S3C2410_GPE10 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 10) | ||
640 | #define S3C2410_GPE10_INP (0x00 << 20) | ||
641 | #define S3C2410_GPE10_OUTP (0x01 << 20) | ||
642 | #define S3C2410_GPE10_SDDAT3 (0x02 << 20) | 429 | #define S3C2410_GPE10_SDDAT3 (0x02 << 20) |
643 | #define S3C2443_GPE10_SD1_DAT3 (0x02 << 20) | 430 | #define S3C2443_GPE10_SD1_DAT3 (0x02 << 20) |
644 | #define S3C2443_GPE10_AC_nRESET (0x03 << 20) | 431 | #define S3C2443_GPE10_AC_nRESET (0x03 << 20) |
645 | #define S3C2400_GPE10_nXDREQ0 (0x02 << 20) | 432 | #define S3C2400_GPE10_nXDREQ0 (0x02 << 20) |
646 | 433 | ||
647 | #define S3C2410_GPE11 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 11) | ||
648 | #define S3C2410_GPE11_INP (0x00 << 22) | ||
649 | #define S3C2410_GPE11_OUTP (0x01 << 22) | ||
650 | #define S3C2410_GPE11_SPIMISO0 (0x02 << 22) | 434 | #define S3C2410_GPE11_SPIMISO0 (0x02 << 22) |
651 | #define S3C2400_GPE11_nXDREQ1 (0x02 << 22) | 435 | #define S3C2400_GPE11_nXDREQ1 (0x02 << 22) |
652 | #define S3C2400_GPE11_nXBREQ (0x03 << 22) | 436 | #define S3C2400_GPE11_nXBREQ (0x03 << 22) |
653 | 437 | ||
654 | #define S3C2410_GPE12 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 12) | ||
655 | #define S3C2410_GPE12_INP (0x00 << 24) | ||
656 | #define S3C2410_GPE12_OUTP (0x01 << 24) | ||
657 | #define S3C2410_GPE12_SPIMOSI0 (0x02 << 24) | 438 | #define S3C2410_GPE12_SPIMOSI0 (0x02 << 24) |
658 | 439 | ||
659 | #define S3C2410_GPE13 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 13) | ||
660 | #define S3C2410_GPE13_INP (0x00 << 26) | ||
661 | #define S3C2410_GPE13_OUTP (0x01 << 26) | ||
662 | #define S3C2410_GPE13_SPICLK0 (0x02 << 26) | 440 | #define S3C2410_GPE13_SPICLK0 (0x02 << 26) |
663 | 441 | ||
664 | #define S3C2410_GPE14 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 14) | ||
665 | #define S3C2410_GPE14_INP (0x00 << 28) | ||
666 | #define S3C2410_GPE14_OUTP (0x01 << 28) | ||
667 | #define S3C2410_GPE14_IICSCL (0x02 << 28) | 442 | #define S3C2410_GPE14_IICSCL (0x02 << 28) |
668 | #define S3C2410_GPE14_MASK (0x03 << 28) | 443 | #define S3C2410_GPE14_MASK (0x03 << 28) |
669 | 444 | ||
670 | #define S3C2410_GPE15 S3C2410_GPIONO(S3C2410_GPIO_BANKE, 15) | ||
671 | #define S3C2410_GPE15_INP (0x00 << 30) | ||
672 | #define S3C2410_GPE15_OUTP (0x01 << 30) | ||
673 | #define S3C2410_GPE15_IICSDA (0x02 << 30) | 445 | #define S3C2410_GPE15_IICSDA (0x02 << 30) |
674 | #define S3C2410_GPE15_MASK (0x03 << 30) | 446 | #define S3C2410_GPE15_MASK (0x03 << 30) |
675 | 447 | ||
@@ -705,55 +477,31 @@ | |||
705 | #define S3C2400_GPFDAT S3C2410_GPIOREG(0x3C) | 477 | #define S3C2400_GPFDAT S3C2410_GPIOREG(0x3C) |
706 | #define S3C2400_GPFUP S3C2410_GPIOREG(0x40) | 478 | #define S3C2400_GPFUP S3C2410_GPIOREG(0x40) |
707 | 479 | ||
708 | #define S3C2410_GPF0 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 0) | ||
709 | #define S3C2410_GPF0_INP (0x00 << 0) | ||
710 | #define S3C2410_GPF0_OUTP (0x01 << 0) | ||
711 | #define S3C2410_GPF0_EINT0 (0x02 << 0) | 480 | #define S3C2410_GPF0_EINT0 (0x02 << 0) |
712 | #define S3C2400_GPF0_RXD0 (0x02 << 0) | 481 | #define S3C2400_GPF0_RXD0 (0x02 << 0) |
713 | 482 | ||
714 | #define S3C2410_GPF1 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 1) | ||
715 | #define S3C2410_GPF1_INP (0x00 << 2) | ||
716 | #define S3C2410_GPF1_OUTP (0x01 << 2) | ||
717 | #define S3C2410_GPF1_EINT1 (0x02 << 2) | 483 | #define S3C2410_GPF1_EINT1 (0x02 << 2) |
718 | #define S3C2400_GPF1_RXD1 (0x02 << 2) | 484 | #define S3C2400_GPF1_RXD1 (0x02 << 2) |
719 | #define S3C2400_GPF1_IICSDA (0x03 << 2) | 485 | #define S3C2400_GPF1_IICSDA (0x03 << 2) |
720 | 486 | ||
721 | #define S3C2410_GPF2 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 2) | ||
722 | #define S3C2410_GPF2_INP (0x00 << 4) | ||
723 | #define S3C2410_GPF2_OUTP (0x01 << 4) | ||
724 | #define S3C2410_GPF2_EINT2 (0x02 << 4) | 487 | #define S3C2410_GPF2_EINT2 (0x02 << 4) |
725 | #define S3C2400_GPF2_TXD0 (0x02 << 4) | 488 | #define S3C2400_GPF2_TXD0 (0x02 << 4) |
726 | 489 | ||
727 | #define S3C2410_GPF3 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 3) | ||
728 | #define S3C2410_GPF3_INP (0x00 << 6) | ||
729 | #define S3C2410_GPF3_OUTP (0x01 << 6) | ||
730 | #define S3C2410_GPF3_EINT3 (0x02 << 6) | 490 | #define S3C2410_GPF3_EINT3 (0x02 << 6) |
731 | #define S3C2400_GPF3_TXD1 (0x02 << 6) | 491 | #define S3C2400_GPF3_TXD1 (0x02 << 6) |
732 | #define S3C2400_GPF3_IICSCL (0x03 << 6) | 492 | #define S3C2400_GPF3_IICSCL (0x03 << 6) |
733 | 493 | ||
734 | #define S3C2410_GPF4 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 4) | ||
735 | #define S3C2410_GPF4_INP (0x00 << 8) | ||
736 | #define S3C2410_GPF4_OUTP (0x01 << 8) | ||
737 | #define S3C2410_GPF4_EINT4 (0x02 << 8) | 494 | #define S3C2410_GPF4_EINT4 (0x02 << 8) |
738 | #define S3C2400_GPF4_nRTS0 (0x02 << 8) | 495 | #define S3C2400_GPF4_nRTS0 (0x02 << 8) |
739 | #define S3C2400_GPF4_nXBACK (0x03 << 8) | 496 | #define S3C2400_GPF4_nXBACK (0x03 << 8) |
740 | 497 | ||
741 | #define S3C2410_GPF5 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 5) | ||
742 | #define S3C2410_GPF5_INP (0x00 << 10) | ||
743 | #define S3C2410_GPF5_OUTP (0x01 << 10) | ||
744 | #define S3C2410_GPF5_EINT5 (0x02 << 10) | 498 | #define S3C2410_GPF5_EINT5 (0x02 << 10) |
745 | #define S3C2400_GPF5_nCTS0 (0x02 << 10) | 499 | #define S3C2400_GPF5_nCTS0 (0x02 << 10) |
746 | #define S3C2400_GPF5_nXBREQ (0x03 << 10) | 500 | #define S3C2400_GPF5_nXBREQ (0x03 << 10) |
747 | 501 | ||
748 | #define S3C2410_GPF6 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 6) | ||
749 | #define S3C2410_GPF6_INP (0x00 << 12) | ||
750 | #define S3C2410_GPF6_OUTP (0x01 << 12) | ||
751 | #define S3C2410_GPF6_EINT6 (0x02 << 12) | 502 | #define S3C2410_GPF6_EINT6 (0x02 << 12) |
752 | #define S3C2400_GPF6_CLKOUT (0x02 << 12) | 503 | #define S3C2400_GPF6_CLKOUT (0x02 << 12) |
753 | 504 | ||
754 | #define S3C2410_GPF7 S3C2410_GPIONO(S3C2410_GPIO_BANKF, 7) | ||
755 | #define S3C2410_GPF7_INP (0x00 << 14) | ||
756 | #define S3C2410_GPF7_OUTP (0x01 << 14) | ||
757 | #define S3C2410_GPF7_EINT7 (0x02 << 14) | 505 | #define S3C2410_GPF7_EINT7 (0x02 << 14) |
758 | 506 | ||
759 | #define S3C2410_GPF_PUPDIS(x) (1<<(x)) | 507 | #define S3C2410_GPF_PUPDIS(x) (1<<(x)) |
@@ -778,117 +526,69 @@ | |||
778 | #define S3C2400_GPGDAT S3C2410_GPIOREG(0x48) | 526 | #define S3C2400_GPGDAT S3C2410_GPIOREG(0x48) |
779 | #define S3C2400_GPGUP S3C2410_GPIOREG(0x4C) | 527 | #define S3C2400_GPGUP S3C2410_GPIOREG(0x4C) |
780 | 528 | ||
781 | #define S3C2410_GPG0 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 0) | ||
782 | #define S3C2410_GPG0_INP (0x00 << 0) | ||
783 | #define S3C2410_GPG0_OUTP (0x01 << 0) | ||
784 | #define S3C2410_GPG0_EINT8 (0x02 << 0) | 529 | #define S3C2410_GPG0_EINT8 (0x02 << 0) |
785 | #define S3C2400_GPG0_I2SLRCK (0x02 << 0) | 530 | #define S3C2400_GPG0_I2SLRCK (0x02 << 0) |
786 | 531 | ||
787 | #define S3C2410_GPG1 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 1) | ||
788 | #define S3C2410_GPG1_INP (0x00 << 2) | ||
789 | #define S3C2410_GPG1_OUTP (0x01 << 2) | ||
790 | #define S3C2410_GPG1_EINT9 (0x02 << 2) | 532 | #define S3C2410_GPG1_EINT9 (0x02 << 2) |
791 | #define S3C2400_GPG1_I2SSCLK (0x02 << 2) | 533 | #define S3C2400_GPG1_I2SSCLK (0x02 << 2) |
792 | 534 | ||
793 | #define S3C2410_GPG2 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 2) | ||
794 | #define S3C2410_GPG2_INP (0x00 << 4) | ||
795 | #define S3C2410_GPG2_OUTP (0x01 << 4) | ||
796 | #define S3C2410_GPG2_EINT10 (0x02 << 4) | 535 | #define S3C2410_GPG2_EINT10 (0x02 << 4) |
797 | #define S3C2410_GPG2_nSS0 (0x03 << 4) | 536 | #define S3C2410_GPG2_nSS0 (0x03 << 4) |
798 | #define S3C2400_GPG2_CDCLK (0x02 << 4) | 537 | #define S3C2400_GPG2_CDCLK (0x02 << 4) |
799 | 538 | ||
800 | #define S3C2410_GPG3 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 3) | ||
801 | #define S3C2410_GPG3_INP (0x00 << 6) | ||
802 | #define S3C2410_GPG3_OUTP (0x01 << 6) | ||
803 | #define S3C2410_GPG3_EINT11 (0x02 << 6) | 539 | #define S3C2410_GPG3_EINT11 (0x02 << 6) |
804 | #define S3C2410_GPG3_nSS1 (0x03 << 6) | 540 | #define S3C2410_GPG3_nSS1 (0x03 << 6) |
805 | #define S3C2400_GPG3_I2SSDO (0x02 << 6) | 541 | #define S3C2400_GPG3_I2SSDO (0x02 << 6) |
806 | #define S3C2400_GPG3_I2SSDI (0x03 << 6) | 542 | #define S3C2400_GPG3_I2SSDI (0x03 << 6) |
807 | 543 | ||
808 | #define S3C2410_GPG4 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 4) | ||
809 | #define S3C2410_GPG4_INP (0x00 << 8) | ||
810 | #define S3C2410_GPG4_OUTP (0x01 << 8) | ||
811 | #define S3C2410_GPG4_EINT12 (0x02 << 8) | 544 | #define S3C2410_GPG4_EINT12 (0x02 << 8) |
812 | #define S3C2400_GPG4_MMCCLK (0x02 << 8) | 545 | #define S3C2400_GPG4_MMCCLK (0x02 << 8) |
813 | #define S3C2400_GPG4_I2SSDI (0x03 << 8) | 546 | #define S3C2400_GPG4_I2SSDI (0x03 << 8) |
814 | #define S3C2410_GPG4_LCDPWREN (0x03 << 8) | 547 | #define S3C2410_GPG4_LCDPWREN (0x03 << 8) |
815 | #define S3C2443_GPG4_LCDPWRDN (0x03 << 8) | 548 | #define S3C2443_GPG4_LCDPWRDN (0x03 << 8) |
816 | 549 | ||
817 | #define S3C2410_GPG5 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 5) | ||
818 | #define S3C2410_GPG5_INP (0x00 << 10) | ||
819 | #define S3C2410_GPG5_OUTP (0x01 << 10) | ||
820 | #define S3C2410_GPG5_EINT13 (0x02 << 10) | 550 | #define S3C2410_GPG5_EINT13 (0x02 << 10) |
821 | #define S3C2400_GPG5_MMCCMD (0x02 << 10) | 551 | #define S3C2400_GPG5_MMCCMD (0x02 << 10) |
822 | #define S3C2400_GPG5_IICSDA (0x03 << 10) | 552 | #define S3C2400_GPG5_IICSDA (0x03 << 10) |
823 | #define S3C2410_GPG5_SPIMISO1 (0x03 << 10) /* not s3c2443 */ | 553 | #define S3C2410_GPG5_SPIMISO1 (0x03 << 10) /* not s3c2443 */ |
824 | 554 | ||
825 | #define S3C2410_GPG6 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 6) | ||
826 | #define S3C2410_GPG6_INP (0x00 << 12) | ||
827 | #define S3C2410_GPG6_OUTP (0x01 << 12) | ||
828 | #define S3C2410_GPG6_EINT14 (0x02 << 12) | 555 | #define S3C2410_GPG6_EINT14 (0x02 << 12) |
829 | #define S3C2400_GPG6_MMCDAT (0x02 << 12) | 556 | #define S3C2400_GPG6_MMCDAT (0x02 << 12) |
830 | #define S3C2400_GPG6_IICSCL (0x03 << 12) | 557 | #define S3C2400_GPG6_IICSCL (0x03 << 12) |
831 | #define S3C2410_GPG6_SPIMOSI1 (0x03 << 12) | 558 | #define S3C2410_GPG6_SPIMOSI1 (0x03 << 12) |
832 | 559 | ||
833 | #define S3C2410_GPG7 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 7) | ||
834 | #define S3C2410_GPG7_INP (0x00 << 14) | ||
835 | #define S3C2410_GPG7_OUTP (0x01 << 14) | ||
836 | #define S3C2410_GPG7_EINT15 (0x02 << 14) | 560 | #define S3C2410_GPG7_EINT15 (0x02 << 14) |
837 | #define S3C2410_GPG7_SPICLK1 (0x03 << 14) | 561 | #define S3C2410_GPG7_SPICLK1 (0x03 << 14) |
838 | #define S3C2400_GPG7_SPIMISO (0x02 << 14) | 562 | #define S3C2400_GPG7_SPIMISO (0x02 << 14) |
839 | #define S3C2400_GPG7_IICSDA (0x03 << 14) | 563 | #define S3C2400_GPG7_IICSDA (0x03 << 14) |
840 | 564 | ||
841 | #define S3C2410_GPG8 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 8) | ||
842 | #define S3C2410_GPG8_INP (0x00 << 16) | ||
843 | #define S3C2410_GPG8_OUTP (0x01 << 16) | ||
844 | #define S3C2410_GPG8_EINT16 (0x02 << 16) | 565 | #define S3C2410_GPG8_EINT16 (0x02 << 16) |
845 | #define S3C2400_GPG8_SPIMOSI (0x02 << 16) | 566 | #define S3C2400_GPG8_SPIMOSI (0x02 << 16) |
846 | #define S3C2400_GPG8_IICSCL (0x03 << 16) | 567 | #define S3C2400_GPG8_IICSCL (0x03 << 16) |
847 | 568 | ||
848 | #define S3C2410_GPG9 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 9) | ||
849 | #define S3C2410_GPG9_INP (0x00 << 18) | ||
850 | #define S3C2410_GPG9_OUTP (0x01 << 18) | ||
851 | #define S3C2410_GPG9_EINT17 (0x02 << 18) | 569 | #define S3C2410_GPG9_EINT17 (0x02 << 18) |
852 | #define S3C2400_GPG9_SPICLK (0x02 << 18) | 570 | #define S3C2400_GPG9_SPICLK (0x02 << 18) |
853 | #define S3C2400_GPG9_MMCCLK (0x03 << 18) | 571 | #define S3C2400_GPG9_MMCCLK (0x03 << 18) |
854 | 572 | ||
855 | #define S3C2410_GPG10 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 10) | ||
856 | #define S3C2410_GPG10_INP (0x00 << 20) | ||
857 | #define S3C2410_GPG10_OUTP (0x01 << 20) | ||
858 | #define S3C2410_GPG10_EINT18 (0x02 << 20) | 573 | #define S3C2410_GPG10_EINT18 (0x02 << 20) |
859 | 574 | ||
860 | #define S3C2410_GPG11 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 11) | ||
861 | #define S3C2410_GPG11_INP (0x00 << 22) | ||
862 | #define S3C2410_GPG11_OUTP (0x01 << 22) | ||
863 | #define S3C2410_GPG11_EINT19 (0x02 << 22) | 575 | #define S3C2410_GPG11_EINT19 (0x02 << 22) |
864 | #define S3C2410_GPG11_TCLK1 (0x03 << 22) | 576 | #define S3C2410_GPG11_TCLK1 (0x03 << 22) |
865 | #define S3C2443_GPG11_CF_nIREQ (0x03 << 22) | 577 | #define S3C2443_GPG11_CF_nIREQ (0x03 << 22) |
866 | 578 | ||
867 | #define S3C2410_GPG12 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 12) | ||
868 | #define S3C2410_GPG12_INP (0x00 << 24) | ||
869 | #define S3C2410_GPG12_OUTP (0x01 << 24) | ||
870 | #define S3C2410_GPG12_EINT20 (0x02 << 24) | 579 | #define S3C2410_GPG12_EINT20 (0x02 << 24) |
871 | #define S3C2410_GPG12_XMON (0x03 << 24) | 580 | #define S3C2410_GPG12_XMON (0x03 << 24) |
872 | #define S3C2442_GPG12_nSPICS0 (0x03 << 24) | 581 | #define S3C2442_GPG12_nSPICS0 (0x03 << 24) |
873 | #define S3C2443_GPG12_nINPACK (0x03 << 24) | 582 | #define S3C2443_GPG12_nINPACK (0x03 << 24) |
874 | 583 | ||
875 | #define S3C2410_GPG13 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 13) | ||
876 | #define S3C2410_GPG13_INP (0x00 << 26) | ||
877 | #define S3C2410_GPG13_OUTP (0x01 << 26) | ||
878 | #define S3C2410_GPG13_EINT21 (0x02 << 26) | 584 | #define S3C2410_GPG13_EINT21 (0x02 << 26) |
879 | #define S3C2410_GPG13_nXPON (0x03 << 26) | 585 | #define S3C2410_GPG13_nXPON (0x03 << 26) |
880 | #define S3C2443_GPG13_CF_nREG (0x03 << 26) | 586 | #define S3C2443_GPG13_CF_nREG (0x03 << 26) |
881 | 587 | ||
882 | #define S3C2410_GPG14 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 14) | ||
883 | #define S3C2410_GPG14_INP (0x00 << 28) | ||
884 | #define S3C2410_GPG14_OUTP (0x01 << 28) | ||
885 | #define S3C2410_GPG14_EINT22 (0x02 << 28) | 588 | #define S3C2410_GPG14_EINT22 (0x02 << 28) |
886 | #define S3C2410_GPG14_YMON (0x03 << 28) | 589 | #define S3C2410_GPG14_YMON (0x03 << 28) |
887 | #define S3C2443_GPG14_CF_RESET (0x03 << 28) | 590 | #define S3C2443_GPG14_CF_RESET (0x03 << 28) |
888 | 591 | ||
889 | #define S3C2410_GPG15 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 15) | ||
890 | #define S3C2410_GPG15_INP (0x00 << 30) | ||
891 | #define S3C2410_GPG15_OUTP (0x01 << 30) | ||
892 | #define S3C2410_GPG15_EINT23 (0x02 << 30) | 592 | #define S3C2410_GPG15_EINT23 (0x02 << 30) |
893 | #define S3C2410_GPG15_nYPON (0x03 << 30) | 593 | #define S3C2410_GPG15_nYPON (0x03 << 30) |
894 | #define S3C2443_GPG15_CF_PWR (0x03 << 30) | 594 | #define S3C2443_GPG15_CF_PWR (0x03 << 30) |
@@ -907,62 +607,29 @@ | |||
907 | #define S3C2410_GPHDAT S3C2410_GPIOREG(0x74) | 607 | #define S3C2410_GPHDAT S3C2410_GPIOREG(0x74) |
908 | #define S3C2410_GPHUP S3C2410_GPIOREG(0x78) | 608 | #define S3C2410_GPHUP S3C2410_GPIOREG(0x78) |
909 | 609 | ||
910 | #define S3C2410_GPH0 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 0) | ||
911 | #define S3C2410_GPH0_INP (0x00 << 0) | ||
912 | #define S3C2410_GPH0_OUTP (0x01 << 0) | ||
913 | #define S3C2410_GPH0_nCTS0 (0x02 << 0) | 610 | #define S3C2410_GPH0_nCTS0 (0x02 << 0) |
914 | 611 | ||
915 | #define S3C2410_GPH1 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 1) | ||
916 | #define S3C2410_GPH1_INP (0x00 << 2) | ||
917 | #define S3C2410_GPH1_OUTP (0x01 << 2) | ||
918 | #define S3C2410_GPH1_nRTS0 (0x02 << 2) | 612 | #define S3C2410_GPH1_nRTS0 (0x02 << 2) |
919 | 613 | ||
920 | #define S3C2410_GPH2 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 2) | ||
921 | #define S3C2410_GPH2_INP (0x00 << 4) | ||
922 | #define S3C2410_GPH2_OUTP (0x01 << 4) | ||
923 | #define S3C2410_GPH2_TXD0 (0x02 << 4) | 614 | #define S3C2410_GPH2_TXD0 (0x02 << 4) |
924 | 615 | ||
925 | #define S3C2410_GPH3 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 3) | ||
926 | #define S3C2410_GPH3_INP (0x00 << 6) | ||
927 | #define S3C2410_GPH3_OUTP (0x01 << 6) | ||
928 | #define S3C2410_GPH3_RXD0 (0x02 << 6) | 616 | #define S3C2410_GPH3_RXD0 (0x02 << 6) |
929 | 617 | ||
930 | #define S3C2410_GPH4 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 4) | ||
931 | #define S3C2410_GPH4_INP (0x00 << 8) | ||
932 | #define S3C2410_GPH4_OUTP (0x01 << 8) | ||
933 | #define S3C2410_GPH4_TXD1 (0x02 << 8) | 618 | #define S3C2410_GPH4_TXD1 (0x02 << 8) |
934 | 619 | ||
935 | #define S3C2410_GPH5 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 5) | ||
936 | #define S3C2410_GPH5_INP (0x00 << 10) | ||
937 | #define S3C2410_GPH5_OUTP (0x01 << 10) | ||
938 | #define S3C2410_GPH5_RXD1 (0x02 << 10) | 620 | #define S3C2410_GPH5_RXD1 (0x02 << 10) |
939 | 621 | ||
940 | #define S3C2410_GPH6 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 6) | ||
941 | #define S3C2410_GPH6_INP (0x00 << 12) | ||
942 | #define S3C2410_GPH6_OUTP (0x01 << 12) | ||
943 | #define S3C2410_GPH6_TXD2 (0x02 << 12) | 622 | #define S3C2410_GPH6_TXD2 (0x02 << 12) |
944 | #define S3C2410_GPH6_nRTS1 (0x03 << 12) | 623 | #define S3C2410_GPH6_nRTS1 (0x03 << 12) |
945 | 624 | ||
946 | #define S3C2410_GPH7 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 7) | ||
947 | #define S3C2410_GPH7_INP (0x00 << 14) | ||
948 | #define S3C2410_GPH7_OUTP (0x01 << 14) | ||
949 | #define S3C2410_GPH7_RXD2 (0x02 << 14) | 625 | #define S3C2410_GPH7_RXD2 (0x02 << 14) |
950 | #define S3C2410_GPH7_nCTS1 (0x03 << 14) | 626 | #define S3C2410_GPH7_nCTS1 (0x03 << 14) |
951 | 627 | ||
952 | #define S3C2410_GPH8 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 8) | ||
953 | #define S3C2410_GPH8_INP (0x00 << 16) | ||
954 | #define S3C2410_GPH8_OUTP (0x01 << 16) | ||
955 | #define S3C2410_GPH8_UCLK (0x02 << 16) | 628 | #define S3C2410_GPH8_UCLK (0x02 << 16) |
956 | 629 | ||
957 | #define S3C2410_GPH9 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 9) | ||
958 | #define S3C2410_GPH9_INP (0x00 << 18) | ||
959 | #define S3C2410_GPH9_OUTP (0x01 << 18) | ||
960 | #define S3C2410_GPH9_CLKOUT0 (0x02 << 18) | 630 | #define S3C2410_GPH9_CLKOUT0 (0x02 << 18) |
961 | #define S3C2442_GPH9_nSPICS0 (0x03 << 18) | 631 | #define S3C2442_GPH9_nSPICS0 (0x03 << 18) |
962 | 632 | ||
963 | #define S3C2410_GPH10 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 10) | ||
964 | #define S3C2410_GPH10_INP (0x00 << 20) | ||
965 | #define S3C2410_GPH10_OUTP (0x01 << 20) | ||
966 | #define S3C2410_GPH10_CLKOUT1 (0x02 << 20) | 633 | #define S3C2410_GPH10_CLKOUT1 (0x02 << 20) |
967 | 634 | ||
968 | /* The S3C2412 and S3C2413 move the GPJ register set to after | 635 | /* The S3C2412 and S3C2413 move the GPJ register set to after |
diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index b8687f71c304..6faadcee7729 100644 --- a/arch/arm/mach-s3c2410/include/mach/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h | |||
@@ -11,21 +11,13 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
14 | #include <linux/io.h> | 14 | #include <plat/watchdog-reset.h> |
15 | |||
16 | #include <plat/regs-watchdog.h> | ||
17 | #include <mach/regs-clock.h> | ||
18 | |||
19 | #include <linux/clk.h> | ||
20 | #include <linux/err.h> | ||
21 | 15 | ||
22 | extern void (*s3c24xx_reset_hook)(void); | 16 | extern void (*s3c24xx_reset_hook)(void); |
23 | 17 | ||
24 | static void | 18 | static void |
25 | arch_reset(char mode, const char *cmd) | 19 | arch_reset(char mode, const char *cmd) |
26 | { | 20 | { |
27 | struct clk *wdtclk; | ||
28 | |||
29 | if (mode == 's') { | 21 | if (mode == 's') { |
30 | cpu_reset(0); | 22 | cpu_reset(0); |
31 | } | 23 | } |
@@ -33,31 +25,7 @@ arch_reset(char mode, const char *cmd) | |||
33 | if (s3c24xx_reset_hook) | 25 | if (s3c24xx_reset_hook) |
34 | s3c24xx_reset_hook(); | 26 | s3c24xx_reset_hook(); |
35 | 27 | ||
36 | printk("arch_reset: attempting watchdog reset\n"); | 28 | arch_wdt_reset(); |
37 | |||
38 | __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ | ||
39 | |||
40 | wdtclk = clk_get(NULL, "watchdog"); | ||
41 | if (!IS_ERR(wdtclk)) { | ||
42 | clk_enable(wdtclk); | ||
43 | } else | ||
44 | printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__); | ||
45 | |||
46 | /* put initial values into count and data */ | ||
47 | __raw_writel(0x80, S3C2410_WTCNT); | ||
48 | __raw_writel(0x80, S3C2410_WTDAT); | ||
49 | |||
50 | /* set the watchdog to go and reset... */ | ||
51 | __raw_writel(S3C2410_WTCON_ENABLE|S3C2410_WTCON_DIV16|S3C2410_WTCON_RSTEN | | ||
52 | S3C2410_WTCON_PRESCALE(0x20), S3C2410_WTCON); | ||
53 | |||
54 | /* wait for reset to assert... */ | ||
55 | mdelay(500); | ||
56 | |||
57 | printk(KERN_ERR "Watchdog reset failed to assert reset\n"); | ||
58 | |||
59 | /* delay to allow the serial port to show the message */ | ||
60 | mdelay(50); | ||
61 | 29 | ||
62 | /* we'll take a jump through zero as a poor second */ | 30 | /* we'll take a jump through zero as a poor second */ |
63 | cpu_reset(0); | 31 | cpu_reset(0); |