Skip to content

Commit

Permalink
ARM: nomadik: use __iomem pointers for MMIO
Browse files Browse the repository at this point in the history
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.

Acked-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: STEricsson <STEricsson_nomadik_linux@list.st.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Sep 19, 2012
1 parent a1b478e commit c8d9aab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-nomadik/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- NOMADIK_IO_VIRTUAL + NOMADIK_IO_PHYSICAL)

/* used in asm code, so no casts */
#define IO_ADDRESS(x) ((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)
#define IO_ADDRESS(x) IOMEM((x) - NOMADIK_IO_PHYSICAL + NOMADIK_IO_VIRTUAL)

/*
* Base address defination for Nomadik Onchip Logic Block
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-nomadik/include/mach/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
struct amba_device;
#include <linux/amba/serial.h>

#define NOMADIK_UART_DR 0x101FB000
#define NOMADIK_UART_LCRH 0x101FB02c
#define NOMADIK_UART_CR 0x101FB030
#define NOMADIK_UART_FR 0x101FB018
#define NOMADIK_UART_DR (void __iomem *)0x101FB000
#define NOMADIK_UART_LCRH (void __iomem *)0x101FB02c
#define NOMADIK_UART_CR (void __iomem *)0x101FB030
#define NOMADIK_UART_FR (void __iomem *)0x101FB018

static void putc(const char c)
{
Expand Down

0 comments on commit c8d9aab

Please sign in to comment.