summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-01-25 23:34:28 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-29 10:18:42 +0100
commitf986b957354949eca175d8190d79a4506ad6be62 (patch)
tree6d76a0b914e60e3d8db14598dab6a5cf9ace3010 /arch
parent1a1c929ee9619bcc2f5b54c90f82530bd4787cd6 (diff)
downloadbarebox-f986b957354949eca175d8190d79a4506ad6be62.tar.gz
barebox-f986b957354949eca175d8190d79a4506ad6be62.tar.xz
ARM: i.MX: esdctl-v4: Use __iomem specifier for memory pointer
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/esdctl-v4.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/esdctl-v4.c b/arch/arm/mach-imx/esdctl-v4.c
index 6441ac9ce0..0652b492ec 100644
--- a/arch/arm/mach-imx/esdctl-v4.c
+++ b/arch/arm/mach-imx/esdctl-v4.c
@@ -25,7 +25,7 @@
void imx_esdctlv4_do_write_leveling(void)
{
u32 val;
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
/* switch RAMs to write-leveling mode */
@@ -80,7 +80,7 @@ void imx_esdctlv4_do_write_leveling(void)
void imx_esdctlv4_do_dqs_gating(void)
{
u32 val;
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
/* configure ESDCTL comparator to use MPR pattern */
writel(ESDCTL_V4_PDCMPR2_MPR_FULL_CMP | ESDCTL_V4_PDCMPR2_MPR_CMP,
@@ -127,7 +127,7 @@ void imx_esdctlv4_do_dqs_gating(void)
void imx_esdctlv4_do_zq_calibration(void)
{
u32 val;
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
/*
* configure ZQ parameters
@@ -156,7 +156,7 @@ void imx_esdctlv4_do_zq_calibration(void)
*/
void imx_esdctlv4_start_ddr3_sdram(int cs)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
u32 val;
u32 val_cs1;
@@ -206,7 +206,7 @@ void imx_esdctlv4_start_ddr3_sdram(int cs)
void imx_esdctlv4_do_read_delay_line_calibration(void)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
u32 val;
/* configure ESDCTL comparator to use MPR pattern */
@@ -262,7 +262,7 @@ void imx_esdctlv4_do_read_delay_line_calibration(void)
void imx_esdctlv4_do_write_delay_line_calibration(void)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
void __iomem *adr;
u32 val;
@@ -275,7 +275,7 @@ void imx_esdctlv4_do_write_delay_line_calibration(void)
/* write test-pattern to RAM */
/* ESCTL uses this address for calibration */
- adr = (void *)MX53_CSD0_BASE_ADDR + 0x10000000;
+ adr = IOMEM(MX53_CSD0_BASE_ADDR) + 0x10000000;
writel(0, adr + 0x00);
writel(0, adr + 0x0c);
writel(0, adr + 0x10);
@@ -328,7 +328,7 @@ void imx_esdctlv4_do_write_delay_line_calibration(void)
/*
* write magic values to RAM for testing purposes
*/
-static void imx_esdctlv4_write_magic_values(void *adr)
+static void imx_esdctlv4_write_magic_values(void __iomem *adr)
{
/*
* Freescale asks for first access to be a write to properly
@@ -348,7 +348,7 @@ static void imx_esdctlv4_write_magic_values(void *adr)
/*
* check if given DRAM addresses match expected values for row/col configuration
*/
-static u32 check_ram_address_line(void *adr, u32 compare, u32 mask)
+static u32 check_ram_address_line(void __iomem *adr, u32 compare, u32 mask)
{
u32 val;
@@ -366,7 +366,7 @@ static u32 check_ram_address_line(void *adr, u32 compare, u32 mask)
*/
void imx_esdctlv4_set_tRFC_timing(void)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
u32 val, trfc, r2, esdcfg;
/* determine chip-density */
@@ -433,7 +433,7 @@ void imx_esdctlv4_set_tRFC_timing(void)
*/
void imx_esdctlv4_detect_sdrams(void)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
u32 esdctl0;
esdctl0 = readl(base + ESDCTL_V4_ESDCTL0);
@@ -451,7 +451,7 @@ void imx_esdctlv4_detect_sdrams(void)
void imx_esdctlv4_init(void)
{
- void __iomem *base = (void *)MX53_ESDCTL_BASE_ADDR;
+ void __iomem *base = IOMEM(MX53_ESDCTL_BASE_ADDR);
u32 val, r1, esdctl0, mask, rows, cols;
/*