Hello Maintainers:
If the related 4 patches for io.h pass your checking, it seems OK to
merge them into one patch, the diff like below:
--------------------------------diff begin------------------------------
diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h
index 4010f1f..5506d86 100644
--- a/arch/m32r/include/asm/io.h
+++ b/arch/m32r/include/asm/io.h
@@ -67,6 +67,7 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
extern void iounmap(volatile void __iomem *addr);
#define ioremap_nocache(off,size) ioremap(off,size)
+#define ioremap_wc ioremap_nocache
/*
* IO bus memory addresses are also 1:1 with the physical address
@@ -162,12 +163,30 @@ static inline void _writel(unsigned long l, unsigned long addr)
#define __raw_writew writew
#define __raw_writel writel
-#define ioread8 read
+#define ioread8 readb
#define ioread16 readw
+#define ioread16be(addr) __be16_to_cpu(__raw_readw(addr))
#define ioread32 readl
+#define ioread32be(addr) __be32_to_cpu(__raw_readl(addr))
#define iowrite8 writeb
#define iowrite16 writew
+#define iowrite16be(v, addr) __raw_writew(__cpu_to_be16(v), addr)
#define iowrite32 writel
+#define iowrite32be(v, addr) __raw_writel(__cpu_to_be32(v), addr)
+
+#define ioread8_rep(p, dst, count) \
+ insb((unsigned long) (p), (dst), (count))
+#define ioread16_rep(p, dst, count) \
+ insw((unsigned long) (p), (dst), (count))
+#define ioread32_rep(p, dst, count) \
+ insl((unsigned long) (p), (dst), (count))
+
+#define iowrite8_rep(p, src, count) \
+ outsb((unsigned long) (p), (src), (count))
+#define iowrite16_rep(p, src, count) \
+ outsw((unsigned long) (p), (src), (count))
+#define iowrite32_rep(p, src, count) \
+ outsl((unsigned long) (p), (src), (count))
#define mmiowb()
--------------------------------diff end--------------------------------
Thanks.
On 06/27/2013 12:37 PM, Chen Gang wrote:
> add generic ioread*_rep() and iowrite*_rep(), or compiling failed.
>
> The related error (with allmodconfig):
>
> CC [M] drivers/mtd/nand/nand_base.o
> drivers/mtd/nand/nand_base.c: In function ‘nand_write_buf’:
> drivers/mtd/nand/nand_base.c:216:2: error: implicit declaration of function ‘iowrite8_rep’ [-Werror=implicit-function-declaration]
> drivers/mtd/nand/nand_base.c: In function ‘nand_read_buf’:
> drivers/mtd/nand/nand_base.c:231:2: error: implicit declaration of function ‘ioread8_rep’ [-Werror=implicit-function-declaration]
> drivers/mtd/nand/nand_base.c: In function ‘nand_write_buf16’:
> drivers/mtd/nand/nand_base.c:247:2: error: implicit declaration of function ‘iowrite16_rep’ [-Werror=implicit-function-declaration]
> drivers/mtd/nand/nand_base.c: In function ‘nand_read_buf16’:
> drivers/mtd/nand/nand_base.c:263:2: error: implicit declaration of function ‘ioread16_rep’ [-Werror=implicit-function-declaration]
>
>
> Signed-off-by: Chen Gang <gang.chen@xxxxxxxxxxx>
> ---
> arch/m32r/include/asm/io.h | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h
> index 4010f1f..167d6ed 100644
> --- a/arch/m32r/include/asm/io.h
> +++ b/arch/m32r/include/asm/io.h
> @@ -169,6 +169,20 @@ static inline void _writel(unsigned long l, unsigned long addr)
> #define iowrite16 writew
> #define iowrite32 writel
>
> +#define ioread8_rep(p, dst, count) \
> + insb((unsigned long) (p), (dst), (count))
> +#define ioread16_rep(p, dst, count) \
> + insw((unsigned long) (p), (dst), (count))
> +#define ioread32_rep(p, dst, count) \
> + insl((unsigned long) (p), (dst), (count))
> +
> +#define iowrite8_rep(p, src, count) \
> + outsb((unsigned long) (p), (src), (count))
> +#define iowrite16_rep(p, src, count) \
> + outsw((unsigned long) (p), (src), (count))
> +#define iowrite32_rep(p, src, count) \
> + outsl((unsigned long) (p), (src), (count))
> +
> #define mmiowb()
>
> #define flush_write_buffers() do { } while (0) /* M32R_FIXME */
>
--
Chen Gang
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
