Commit 69648ae8 authored by Olof Johansson's avatar Olof Johansson

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

From Simon Horman:
"Please consider the following fix for the KZM-A9-GT board for 3.7.
 They both resolve fallout from recent IOMEM() changes."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7779: use __iomem pointers for MMIO
  ARM: shmobile: armadillo800eva: __io abuse cleanup
parents 3d76f9f5 11f93576
...@@ -1196,7 +1196,7 @@ static void __init eva_init(void) ...@@ -1196,7 +1196,7 @@ static void __init eva_init(void)
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
/* Early BRESP enable, Shared attribute override enable, 32K*8way */ /* Early BRESP enable, Shared attribute override enable, 32K*8way */
l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff); l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
#endif #endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <mach/common.h> #include <mach/common.h>
#define FRQMR 0xffc80014 #define FRQMR IOMEM(0xffc80014)
#define MSTPCR0 0xffc80030 #define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 0xffc80034 #define MSTPCR1 IOMEM(0xffc80034)
#define MSTPCR3 0xffc8003c #define MSTPCR3 IOMEM(0xffc8003c)
#define MSTPSR1 0xffc80044 #define MSTPSR1 IOMEM(0xffc80044)
#define MSTPSR4 0xffc80048 #define MSTPSR4 IOMEM(0xffc80048)
#define MSTPSR6 0xffc8004c #define MSTPSR6 IOMEM(0xffc8004c)
#define MSTPCR4 0xffc80050 #define MSTPCR4 IOMEM(0xffc80050)
#define MSTPCR5 0xffc80054 #define MSTPCR5 IOMEM(0xffc80054)
#define MSTPCR6 0xffc80058 #define MSTPCR6 IOMEM(0xffc80058)
#define MSTPCR7 0xffc80040 #define MSTPCR7 IOMEM(0xffc80040)
/* ioremap() through clock mapping mandatory to avoid /* ioremap() through clock mapping mandatory to avoid
* collision with ARM coherent DMA virtual memory range. * collision with ARM coherent DMA virtual memory range.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment