Merge git://git.denx.de/u-boot-nds32

This commit is contained in:
Tom Rini 2017-09-28 09:03:05 -04:00
commit 9969306971

View file

@ -125,26 +125,26 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen);
#define __iormb() dmb() #define __iormb() dmb()
#define __iowmb() dmb() #define __iowmb() dmb()
static inline void writeb(unsigned char val, unsigned char *addr) static inline void writeb(u8 val, volatile void __iomem *addr)
{ {
__iowmb(); __iowmb();
__arch_putb(val, addr); __arch_putb(val, addr);
} }
static inline void writew(unsigned short val, unsigned short *addr) static inline void writew(u16 val, volatile void __iomem *addr)
{ {
__iowmb(); __iowmb();
__arch_putw(val, addr); __arch_putw(val, addr);
} }
static inline void writel(unsigned int val, unsigned int *addr) static inline void writel(u32 val, volatile void __iomem *addr)
{ {
__iowmb(); __iowmb();
__arch_putl(val, addr); __arch_putl(val, addr);
} }
static inline unsigned char readb(unsigned char *addr) static inline u8 readb(const volatile void __iomem *addr)
{ {
u8 val; u8 val;
@ -153,7 +153,7 @@ static inline unsigned char readb(unsigned char *addr)
return val; return val;
} }
static inline unsigned short readw(unsigned short *addr) static inline u16 readw(const volatile void __iomem *addr)
{ {
u16 val; u16 val;
@ -162,7 +162,7 @@ static inline unsigned short readw(unsigned short *addr)
return val; return val;
} }
static inline unsigned int readl(unsigned int *addr) static inline u32 readl(const volatile void __iomem *addr)
{ {
u32 val; u32 val;