public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Chen Gang <gang.chen.5i5j@gmail.com>
To: Liqin Chen <liqin.linux@gmail.com>, lennox.wu@gmail.com
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] arch/score/include/asm/io.h: Add generic io map functions when MMU enabled
Date: Wed, 18 Jun 2014 13:06:40 +0800	[thread overview]
Message-ID: <53A11E60.5030704@gmail.com> (raw)

score did not implement some io map functions when MMU enabled, so need
add generic io map functions, just like some other architectures have
done (e.g. sparc64, s390, and mn10300), or will cause compiling issue.

The related error (allmodconfig under score):

    CC      drivers/clocksource/sh_cmt.o
  drivers/clocksource/sh_cmt.c: In function 'sh_cmt_map_memory':
  drivers/clocksource/sh_cmt.c:932:2: error: implicit declaration of function 'ioremap_nocache' [-Werror=implicit-function-declaration]
    cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
    ^
  drivers/clocksource/sh_cmt.c:932:15: warning: assignment makes pointer from integer without a cast
    cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
                 ^
  drivers/clocksource/sh_cmt.c: In function 'sh_cmt_map_memory_legacy':
  drivers/clocksource/sh_cmt.c:953:18: warning: assignment makes pointer from integer without a cast
    cmt->mapbase_ch = ioremap_nocache(res->start, resource_size(res));
                    ^
  drivers/clocksource/sh_cmt.c:963:15: warning: assignment makes pointer from integer without a cast
    cmt->mapbase = ioremap_nocache(res2 ? res2->start :
                 ^
  drivers/clocksource/sh_cmt.c:968:3: error: implicit declaration of function 'iounmap' [-Werror=implicit-function-declaration]
     iounmap(cmt->mapbase_ch);
     ^
  cc1: some warnings being treated as errors
  make[2]: *** [drivers/clocksource/sh_cmt.o] Error 1
  make[1]: *** [drivers/clocksource] Error 2
  make: *** [drivers] Error 2

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 arch/score/include/asm/io.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/score/include/asm/io.h b/arch/score/include/asm/io.h
index 574c8827..d67aeea 100644
--- a/arch/score/include/asm/io.h
+++ b/arch/score/include/asm/io.h
@@ -3,6 +3,22 @@
 
 #include <asm-generic/io.h>
 
+#ifdef CONFIG_MMU
+static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
+{
+	return (void __iomem *) (unsigned long)offset;
+}
+
+#define __ioremap(offset, size, flags)	ioremap(offset, size)
+
+#define ioremap_nocache ioremap
+#define ioremap_wc ioremap_nocache
+
+static inline void iounmap(void __iomem *addr)
+{
+}
+#endif
+
 #define virt_to_bus	virt_to_phys
 #define bus_to_virt	phys_to_virt
 #endif /* _ASM_SCORE_IO_H */
-- 
1.9.2.459.g68773ac

             reply	other threads:[~2014-06-18  5:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-18  5:06 Chen Gang [this message]
2014-06-18 19:59 ` [PATCH] arch/score/include/asm/io.h: Add generic io map functions when MMU enabled Lennox Wu
2014-06-19  1:26   ` Chen Gang

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=53A11E60.5030704@gmail.com \
    --to=gang.chen.5i5j@gmail.com \
    --cc=lennox.wu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liqin.linux@gmail.com \
    /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