diff options
Diffstat (limited to 'arch/arm/plat-spear/include/plat/uncompress.h')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/uncompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-spear/include/plat/uncompress.h b/arch/arm/plat-spear/include/plat/uncompress.h index 99ba6789cc97..1bf84527aee4 100644 --- a/arch/arm/plat-spear/include/plat/uncompress.h +++ b/arch/arm/plat-spear/include/plat/uncompress.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/amba/serial.h> | 15 | #include <linux/amba/serial.h> |
| 16 | #include <mach/spear.h> | 16 | #include <mach/hardware.h> |
| 17 | 17 | ||
| 18 | #ifndef __PLAT_UNCOMPRESS_H | 18 | #ifndef __PLAT_UNCOMPRESS_H |
| 19 | #define __PLAT_UNCOMPRESS_H | 19 | #define __PLAT_UNCOMPRESS_H |
| @@ -24,10 +24,10 @@ static inline void putc(int c) | |||
| 24 | { | 24 | { |
| 25 | void __iomem *base = (void __iomem *)SPEAR_DBG_UART_BASE; | 25 | void __iomem *base = (void __iomem *)SPEAR_DBG_UART_BASE; |
| 26 | 26 | ||
| 27 | while (readl(base + UART01x_FR) & UART01x_FR_TXFF) | 27 | while (readl_relaxed(base + UART01x_FR) & UART01x_FR_TXFF) |
| 28 | barrier(); | 28 | barrier(); |
| 29 | 29 | ||
| 30 | writel(c, base + UART01x_DR); | 30 | writel_relaxed(c, base + UART01x_DR); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | static inline void flush(void) | 33 | static inline void flush(void) |
