mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH 12/12] ARM: i.MX: esdctl-v4: Use __iomem specifier for memory pointer
Date: Sat, 25 Jan 2014 23:34:28 +0400	[thread overview]
Message-ID: <1390678468-28378-12-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1390678468-28378-1-git-send-email-shc_work@mail.ru>

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-imx/esdctl-v4.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-imx/esdctl-v4.c b/arch/arm/mach-imx/esdctl-v4.c
index 6441ac9..0652b49 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;
 
 	/*
-- 
1.8.3.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-01-25 19:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-25 19:34 [PATCH 01/12] ARM: animeo_ip: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 02/12] ARM: guf-cupid: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 03/12] ARM: tqma6x: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 04/12] ARM: uncompress: Remove unused variable Alexander Shiyan
2014-01-25 19:34 ` [PATCH 05/12] ARM: PBL: Use __iomem specifier for memory pointer Alexander Shiyan
2014-01-25 19:34 ` [PATCH 06/12] lib: bootz: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 07/12] lib: bootm: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 08/12] ARM: at91: boot_test_cmd: " Alexander Shiyan
2014-01-29 17:50   ` Jean-Christophe PLAGNIOL-VILLARD
2014-01-25 19:34 ` [PATCH 09/12] ARM: at91: irq_fixup: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 10/12] ARM: i.MX: external_nand_boot: " Alexander Shiyan
2014-01-25 19:34 ` [PATCH 11/12] ARM: i.MX: esdctl: " Alexander Shiyan
2014-01-25 19:34 ` Alexander Shiyan [this message]
2014-01-29  9:23 ` [PATCH 01/12] ARM: animeo_ip: " Sascha Hauer
2014-01-29 17:51   ` Jean-Christophe PLAGNIOL-VILLARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390678468-28378-12-git-send-email-shc_work@mail.ru \
    --to=shc_work@mail.ru \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox