Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5db9c6a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: Make sure {read,write}s[bwl]() are always defined 



drivers/usb/musb/musb_io.h provides default implementations for
{read,write}s[bwl]() on most platforms, some of which will conflict soon
with platform-specific counterparts on m68k.

To avoid having to add more platform-specific checks to musb_io.h later,
make sure {read,write}s[bwl]() are always defined on m68k, and disable the
default implementations in musb_io.h on m68k, like is already done for
several other architectures.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
parent b637a6b1

arch/m68k/include/asm/io_mm.h

+7 −0
Original line number Diff line number Diff line
@@ -278,6 +278,13 @@ static inline void isa_delay(void) 
#define readl(addr)      in_le32(addr)

#define writel(val,addr) out_le32((addr),(val))



#define readsb(port, buf, nr)     raw_insb((port), (u8 *)(buf), (nr))

#define readsw(port, buf, nr)     raw_insw((port), (u16 *)(buf), (nr))

#define readsl(port, buf, nr)     raw_insl((port), (u32 *)(buf), (nr))

#define writesb(port, buf, nr)    raw_outsb((port), (u8 *)(buf), (nr))

#define writesw(port, buf, nr)    raw_outsw((port), (u16 *)(buf), (nr))

#define writesl(port, buf, nr)    raw_outsl((port), (u32 *)(buf), (nr))



#define mmiowb()



static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)

drivers/usb/musb/musb_io.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \

	&& !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \

	&& !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \

	&& !defined(CONFIG_MIPS)

	&& !defined(CONFIG_MIPS) && !defined(CONFIG_M68K)

static inline void readsl(const void __iomem *addr, void *buf, int len)

	{ insl((unsigned long)addr, buf, len); }

static inline void readsw(const void __iomem *addr, void *buf, int len)