From: Greentime Hu <green.hu@gmail.com>
To: greentime@andestech.com, linux-kernel@vger.kernel.org,
arnd@arndb.de, linux-arch@vger.kernel.org, tglx@linutronix.de,
jason@lakedaemon.net, marc.zyngier@arm.com, robh+dt@kernel.org,
netdev@vger.kernel.org, deanbo422@gmail.com,
devicetree@vger.kernel.org, viro@zeniv.linux.org.uk,
dhowells@redhat.com, will.deacon@arm.com,
daniel.lezcano@linaro.org, linux-serial@vger.kernel.org,
geert.uytterhoeven@gmail.com, linus.walleij@linaro.org,
mark.rutland@arm.com, greg@kroah.com, ren_guo@c-sky.com,
rdunlap@infradead.org, davem@davemloft.net, jonas@southpole.se,
stefan.kristiansson@saunalahti.fi, shorne@gmail.com
Cc: green.hu@gmail.com
Subject: [PATCH v7 03/37] sparc: io: To use the define of ioremap_[nocache|wc|wb] in asm-generic/io.h
Date: Tue, 13 Feb 2018 17:09:07 +0800 [thread overview]
Message-ID: <4bb01fd533c66c357f3dc23a64f56414109a2aad.1518505384.git.greentime@andestech.com> (raw)
In-Reply-To: <cover.1518505384.git.greentime@andestech.com>
In-Reply-To: <cover.1518505384.git.greentime@andestech.com>
A commit for the nds32 architecture bootstrap("asm-generic/io.h: move
ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU")
will move the ioremap_nocache out of the CONFIG_MMU ifdef. This means that
in order to suppress re-definition errors we need to remove the #define
in io_32.h.
Also, the change adds a prototype for ioremap where size is size_t and
offset is phys_addr_t so fix that as well.
Signed-off-by: Greentime Hu <greentime@andestech.com>
---
arch/sparc/include/asm/io_32.h | 5 -----
arch/sparc/kernel/ioport.c | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index cd51a89b393c..df2dc1784673 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -127,12 +127,7 @@ static inline void sbus_memcpy_toio(volatile void __iomem *dst,
* Bus number may be embedded in the higher bits of the physical address.
* This is why we have no bus number argument to ioremap().
*/
-void __iomem *ioremap(unsigned long offset, unsigned long size);
-#define ioremap_nocache(X,Y) ioremap((X),(Y))
-#define ioremap_wc(X,Y) ioremap((X),(Y))
-#define ioremap_wt(X,Y) ioremap((X),(Y))
void iounmap(volatile void __iomem *addr);
-
/* Create a virtual mapping cookie for an IO port range */
void __iomem *ioport_map(unsigned long port, unsigned int nr);
void ioport_unmap(void __iomem *);
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 7eeef80c02f7..3bcef9ce74df 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -122,12 +122,12 @@ static void xres_free(struct xresource *xrp) {
*
* Bus type is always zero on IIep.
*/
-void __iomem *ioremap(unsigned long offset, unsigned long size)
+void __iomem *ioremap(phys_addr_t offset, size_t size)
{
char name[14];
sprintf(name, "phys_%08x", (u32)offset);
- return _sparc_alloc_io(0, offset, size, name);
+ return _sparc_alloc_io(0, (unsigned long)offset, size, name);
}
EXPORT_SYMBOL(ioremap);
--
2.16.1
next prev parent reply other threads:[~2018-02-13 9:09 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 9:09 [PATCH v7 00/37] Andes(nds32) Linux Kernel Port Greentime Hu
2018-02-13 9:09 ` [PATCH v7 01/37] openrisc: add ioremap_nocache declaration before include asm-generic/io.h and sync ioremap prototype with it Greentime Hu
2018-02-13 9:09 ` [PATCH v7 02/37] asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU Greentime Hu
2018-02-16 9:30 ` kbuild test robot
2018-02-16 10:47 ` kbuild test robot
2018-02-21 11:21 ` Greentime Hu
2018-02-21 11:37 ` Arnd Bergmann
2018-02-21 12:02 ` Greentime Hu
2018-02-13 9:09 ` Greentime Hu [this message]
2018-02-14 14:43 ` [PATCH v7 03/37] sparc: io: To use the define of ioremap_[nocache|wc|wb] in asm-generic/io.h Arnd Bergmann
2018-02-21 8:05 ` Greentime Hu
2018-02-21 12:27 ` Arnd Bergmann
2018-02-13 9:09 ` [PATCH v7 04/37] earlycon: add reg-offset to physical address before mapping Greentime Hu
2018-02-15 15:40 ` Rob Herring
2018-02-28 12:39 ` Greg Kroah-Hartman
2018-02-13 9:09 ` [PATCH v7 05/37] drivers/video/concole: add negative dependency for VGA_CONSOLE on nds32 Greentime Hu
2018-02-13 9:09 ` [PATCH v7 06/37] nds32: Assembly macros and definitions Greentime Hu
2018-02-13 9:09 ` [PATCH v7 07/37] nds32: Kernel booting and initialization Greentime Hu
2018-02-14 14:35 ` Arnd Bergmann
2018-02-13 9:09 ` [PATCH v7 08/37] nds32: Exception handling Greentime Hu
2018-02-14 14:31 ` Arnd Bergmann
2018-02-13 9:09 ` [PATCH v7 09/37] nds32: MMU definitions Greentime Hu
2018-02-13 9:09 ` [PATCH v7 10/37] nds32: MMU initialization Greentime Hu
2018-02-13 9:09 ` [PATCH v7 11/37] nds32: MMU fault handling and page table management Greentime Hu
2018-02-13 9:09 ` [PATCH v7 12/37] nds32: Cache and TLB routines Greentime Hu
2018-02-13 9:09 ` [PATCH v7 13/37] nds32: Process management Greentime Hu
2018-02-13 9:09 ` [PATCH v7 14/37] nds32: IRQ handling Greentime Hu
2018-02-13 9:09 ` [PATCH v7 15/37] nds32: Atomic operations Greentime Hu
2018-02-13 9:09 ` [PATCH v7 16/37] nds32: Device specific operations Greentime Hu
2018-02-13 9:09 ` [PATCH v7 17/37] nds32: DMA mapping API Greentime Hu
2018-02-13 9:09 ` [PATCH v7 18/37] nds32: ELF definitions Greentime Hu
2018-02-13 9:09 ` [PATCH v7 19/37] nds32: System calls handling Greentime Hu
2018-02-13 9:09 ` [PATCH v7 20/37] nds32: VDSO support Greentime Hu
2018-02-13 9:09 ` [PATCH v7 21/37] nds32: Signal handling support Greentime Hu
2018-02-13 9:09 ` [PATCH v7 22/37] nds32: Library functions Greentime Hu
2018-02-13 9:09 ` [PATCH v7 23/37] nds32: Debugging support Greentime Hu
2018-02-14 14:32 ` Arnd Bergmann
2018-02-13 9:09 ` [PATCH v7 24/37] nds32: L2 cache support Greentime Hu
2018-02-13 9:09 ` [PATCH v7 25/37] nds32: Loadable modules Greentime Hu
2018-02-13 9:09 ` [PATCH v7 26/37] nds32: Generic timers support Greentime Hu
2018-02-13 9:09 ` [PATCH v7 27/37] nds32: Device tree support Greentime Hu
2018-02-13 9:09 ` [PATCH v7 28/37] nds32: Miscellaneous header files Greentime Hu
2018-02-13 9:09 ` [PATCH v7 29/37] nds32: defconfig Greentime Hu
2018-02-13 9:09 ` [PATCH v7 30/37] nds32: Build infrastructure Greentime Hu
2018-02-14 14:34 ` Arnd Bergmann
2018-02-13 9:09 ` [PATCH v7 31/37] MAINTAINERS: Add nds32 Greentime Hu
2018-02-13 16:02 ` Joe Perches
2018-02-14 5:54 ` Greentime Hu
2018-02-13 9:09 ` [PATCH v7 32/37] dt-bindings: nds32 CPU Bindings Greentime Hu
2018-02-13 9:09 ` [PATCH v7 33/37] dt-bindings: nds32 L2 cache controller Bindings Greentime Hu
2018-02-13 9:09 ` [PATCH v7 34/37] dt-bindings: nds32 SoC Bindings Greentime Hu
2018-02-13 9:09 ` [PATCH v7 35/37] dt-bindings: interrupt-controller: Andestech Internal Vector Interrupt Controller Greentime Hu
2018-02-13 9:09 ` [PATCH v7 36/37] irqchip: Andestech Internal Vector Interrupt Controller driver Greentime Hu
2018-02-13 9:09 ` [PATCH v7 37/37] net: faraday add nds32 support Greentime Hu
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=4bb01fd533c66c357f3dc23a64f56414109a2aad.1518505384.git.greentime@andestech.com \
--to=green.hu@gmail.com \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=deanbo422@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dhowells@redhat.com \
--cc=geert.uytterhoeven@gmail.com \
--cc=greentime@andestech.com \
--cc=greg@kroah.com \
--cc=jason@lakedaemon.net \
--cc=jonas@southpole.se \
--cc=linus.walleij@linaro.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=ren_guo@c-sky.com \
--cc=robh+dt@kernel.org \
--cc=shorne@gmail.com \
--cc=stefan.kristiansson@saunalahti.fi \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=will.deacon@arm.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;
as well as URLs for NNTP newsgroup(s).