diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-02-12 23:58:53 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-23 08:57:56 -0500 |
commit | f363c407b42c467d06675c852e55f26adb959915 (patch) | |
tree | 695ffaf47ee7db5adfa9dd23976b5df77bd738c5 /drivers/pcmcia | |
parent | 1a269ade22bb65d0afc0d20e0a19602453fae04a (diff) |
ARM: at91: make sdram/ddr register base soc independent
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/at91_cf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 4902206f53d9..1dd68f502634 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <mach/board.h> | 27 | #include <mach/board.h> |
28 | #include <mach/at91rm9200_mc.h> | 28 | #include <mach/at91rm9200_mc.h> |
29 | #include <mach/at91_ramc.h> | ||
29 | 30 | ||
30 | 31 | ||
31 | /* | 32 | /* |
@@ -156,7 +157,7 @@ static int at91_cf_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io) | |||
156 | /* | 157 | /* |
157 | * Use 16 bit accesses unless/until we need 8-bit i/o space. | 158 | * Use 16 bit accesses unless/until we need 8-bit i/o space. |
158 | */ | 159 | */ |
159 | csr = at91_sys_read(AT91_SMC_CSR(cf->board->chipselect)) & ~AT91_SMC_DBW; | 160 | csr = at91_ramc_read(0, AT91_SMC_CSR(cf->board->chipselect)) & ~AT91_SMC_DBW; |
160 | 161 | ||
161 | /* | 162 | /* |
162 | * NOTE: this CF controller ignores IOIS16, so we can't really do | 163 | * NOTE: this CF controller ignores IOIS16, so we can't really do |
@@ -175,7 +176,7 @@ static int at91_cf_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io) | |||
175 | csr |= AT91_SMC_DBW_16; | 176 | csr |= AT91_SMC_DBW_16; |
176 | pr_debug("%s: 16bit i/o bus\n", driver_name); | 177 | pr_debug("%s: 16bit i/o bus\n", driver_name); |
177 | } | 178 | } |
178 | at91_sys_write(AT91_SMC_CSR(cf->board->chipselect), csr); | 179 | at91_ramc_write(0, AT91_SMC_CSR(cf->board->chipselect), csr); |
179 | 180 | ||
180 | io->start = cf->socket.io_offset; | 181 | io->start = cf->socket.io_offset; |
181 | io->stop = io->start + SZ_2K - 1; | 182 | io->stop = io->start + SZ_2K - 1; |