aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 11:46:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 11:46:18 -0400
commitd56a669ca59c37ed0a7282a251b2f2f22533343a (patch)
treecef7bd4699754057474cc96430864f690f1786e0 /arch
parent836ee4874e201a5907f9658fb2bf3527dd952d30 (diff)
parent04fca0e390e80d88c2f959aef86e0bb7f26fea01 (diff)
Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull second batch of devicetree updates from Rob Herring: "As Grant mentioned in the first devicetree pull request, here is the 2nd batch of DT changes for 4.1. The main remaining item here is the endianness bindings and related 8250 driver support. - DT endianness specification bindings - big-endian 8250 serial support - DT overlay unittest updates - various DT doc updates - compile fixes for OF_IRQ=n" * tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: frv: add io{read,write}{16,32}be functions mn10300: add io{read,write}{16,32}be functions Documentation: DT bindings: add doc for Altera's SoCFPGA platform of: base: improve of_get_next_child() kernel-doc Doc: dt: arch_timer: discourage clock-frequency use of: unittest: overlay: Keep track of created overlays of/fdt: fix allocation size for device node path serial: of_serial: Support big-endian register accesses serial: 8250: Add support for big-endian MMIO accesses of: Document {little,big,native}-endian bindings of/fdt: Add endianness helper function for early init code of: Add helper function to check MMIO register endianness of/fdt: Remove "reg" data prints from early_init_dt_scan_memory of: add vendor prefix for Artesyn of: Add dummy of_irq_to_resource_table() for IRQ_OF=n of: OF_IRQ should depend on IRQ_DOMAIN
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/include/asm/io.h5
-rw-r--r--arch/mn10300/include/asm/io.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h
index 99bb7efaf9b7..0b78bc89e840 100644
--- a/arch/frv/include/asm/io.h
+++ b/arch/frv/include/asm/io.h
@@ -342,6 +342,11 @@ static inline void iowrite32(u32 val, void __iomem *p)
342 __flush_PCI_writes(); 342 __flush_PCI_writes();
343} 343}
344 344
345#define ioread16be(addr) be16_to_cpu(ioread16(addr))
346#define ioread32be(addr) be32_to_cpu(ioread32(addr))
347#define iowrite16be(v, addr) iowrite16(cpu_to_be16(v), (addr))
348#define iowrite32be(v, addr) iowrite32(cpu_to_be32(v), (addr))
349
345static inline void ioread8_rep(void __iomem *p, void *dst, unsigned long count) 350static inline void ioread8_rep(void __iomem *p, void *dst, unsigned long count)
346{ 351{
347 io_insb((unsigned long) p, dst, count); 352 io_insb((unsigned long) p, dst, count);
diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h
index 897ba3c12b32..cc4a2ba9e228 100644
--- a/arch/mn10300/include/asm/io.h
+++ b/arch/mn10300/include/asm/io.h
@@ -197,6 +197,11 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
197#define iowrite16(v, addr) writew((v), (addr)) 197#define iowrite16(v, addr) writew((v), (addr))
198#define iowrite32(v, addr) writel((v), (addr)) 198#define iowrite32(v, addr) writel((v), (addr))
199 199
200#define ioread16be(addr) be16_to_cpu(readw(addr))
201#define ioread32be(addr) be32_to_cpu(readl(addr))
202#define iowrite16be(v, addr) writew(cpu_to_be16(v), (addr))
203#define iowrite32be(v, addr) writel(cpu_to_be32(v), (addr))
204
200#define ioread8_rep(p, dst, count) \ 205#define ioread8_rep(p, dst, count) \
201 insb((unsigned long) (p), (dst), (count)) 206 insb((unsigned long) (p), (dst), (count))
202#define ioread16_rep(p, dst, count) \ 207#define ioread16_rep(p, dst, count) \