* [GIT PULL] Renesas ARM-based SoC fixes for v3.7
@ 2012-10-17 4:36 Simon Horman
2012-10-17 4:36 ` [PATCH 1/2] ARM: shmobile: armadillo800eva: __io abuse cleanup Simon Horman
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Simon Horman @ 2012-10-17 4:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following fix for the KZM-A9-GT board for 3.6.
They both resolve fallout from recent IOMEM() changes.
----------------------------------------------------------------
The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git fixes
for you to fetch changes up to 11f93576b0b50bf391ffafa544b85e541f5e59a5:
ARM: shmobile: r8a7779: use __iomem pointers for MMIO (2012-10-16 08:58:56 +0900)
----------------------------------------------------------------
Kuninori Morimoto (2):
ARM: shmobile: armadillo800eva: __io abuse cleanup
ARM: shmobile: r8a7779: use __iomem pointers for MMIO
arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
arch/arm/mach-shmobile/clock-r8a7779.c | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] ARM: shmobile: armadillo800eva: __io abuse cleanup
2012-10-17 4:36 [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
@ 2012-10-17 4:36 ` Simon Horman
2012-10-17 4:36 ` [PATCH 2/2] ARM: shmobile: r8a7779: use __iomem pointers for MMIO Simon Horman
2012-10-17 4:40 ` [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2012-10-17 4:36 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
a2a47ca36642e3995e982957bc42678cf11ca6ac
(ARM: __io abuse cleanup) cleanuped __io() -> IOMEM(),
but armadillo800eva was a outside of a target,
since "merge window" timing issue.
This patch cleanup it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2912eab..3cc8b1c 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1196,7 +1196,7 @@ static void __init eva_init(void)
#ifdef CONFIG_CACHE_L2X0
/* Early BRESP enable, Shared attribute override enable, 32K*8way */
- l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
+ l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
#endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: shmobile: r8a7779: use __iomem pointers for MMIO
2012-10-17 4:36 [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2012-10-17 4:36 ` [PATCH 1/2] ARM: shmobile: armadillo800eva: __io abuse cleanup Simon Horman
@ 2012-10-17 4:36 ` Simon Horman
2012-10-17 4:40 ` [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2012-10-17 4:36 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
0a4b04dc299dfb691827a4001b3d8d7e443b71c9
(ARM: shmobile: use __iomem pointers for MMIO)
modified iomem pointers so that IOMEM() macro will be used,
but clock-r8a7779.c was out of target.
This patch fixes it up.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7779.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 3cafb6a..37b2a31 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -24,17 +24,17 @@
#include <linux/clkdev.h>
#include <mach/common.h>
-#define FRQMR 0xffc80014
-#define MSTPCR0 0xffc80030
-#define MSTPCR1 0xffc80034
-#define MSTPCR3 0xffc8003c
-#define MSTPSR1 0xffc80044
-#define MSTPSR4 0xffc80048
-#define MSTPSR6 0xffc8004c
-#define MSTPCR4 0xffc80050
-#define MSTPCR5 0xffc80054
-#define MSTPCR6 0xffc80058
-#define MSTPCR7 0xffc80040
+#define FRQMR IOMEM(0xffc80014)
+#define MSTPCR0 IOMEM(0xffc80030)
+#define MSTPCR1 IOMEM(0xffc80034)
+#define MSTPCR3 IOMEM(0xffc8003c)
+#define MSTPSR1 IOMEM(0xffc80044)
+#define MSTPSR4 IOMEM(0xffc80048)
+#define MSTPSR6 IOMEM(0xffc8004c)
+#define MSTPCR4 IOMEM(0xffc80050)
+#define MSTPCR5 IOMEM(0xffc80054)
+#define MSTPCR6 IOMEM(0xffc80058)
+#define MSTPCR7 IOMEM(0xffc80040)
/* ioremap() through clock mapping mandatory to avoid
* collision with ARM coherent DMA virtual memory range.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [GIT PULL] Renesas ARM-based SoC fixes for v3.7
2012-10-17 4:36 [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2012-10-17 4:36 ` [PATCH 1/2] ARM: shmobile: armadillo800eva: __io abuse cleanup Simon Horman
2012-10-17 4:36 ` [PATCH 2/2] ARM: shmobile: r8a7779: use __iomem pointers for MMIO Simon Horman
@ 2012-10-17 4:40 ` Simon Horman
2012-10-17 15:08 ` Olof Johansson
2 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2012-10-17 4:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 17, 2012 at 01:36:23PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
>
> please consider the following fix for the KZM-A9-GT board for 3.6.
Sorry, cut-and paste error. The line above should read:
please consider the following fixes for 3.7.
> They both resolve fallout from recent IOMEM() changes.
>
> ----------------------------------------------------------------
> The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
>
> Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git fixes
>
> for you to fetch changes up to 11f93576b0b50bf391ffafa544b85e541f5e59a5:
>
> ARM: shmobile: r8a7779: use __iomem pointers for MMIO (2012-10-16 08:58:56 +0900)
>
> ----------------------------------------------------------------
> Kuninori Morimoto (2):
> ARM: shmobile: armadillo800eva: __io abuse cleanup
> ARM: shmobile: r8a7779: use __iomem pointers for MMIO
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
> arch/arm/mach-shmobile/clock-r8a7779.c | 22 +++++++++++-----------
> 2 files changed, 12 insertions(+), 12 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] Renesas ARM-based SoC fixes for v3.7
2012-10-17 4:40 ` [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
@ 2012-10-17 15:08 ` Olof Johansson
0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-10-17 15:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 16, 2012 at 9:40 PM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Oct 17, 2012 at 01:36:23PM +0900, Simon Horman wrote:
>> Hi Olof, Hi Arnd,
>>
>> please consider the following fix for the KZM-A9-GT board for 3.6.
>
> Sorry, cut-and paste error. The line above should read:
>
> please consider the following fixes for 3.7.
>
>> They both resolve fallout from recent IOMEM() changes.
>>
>> ----------------------------------------------------------------
>> The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
>>
>> Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git fixes
Pulled into fixes, thanks!
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-17 15:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-17 4:36 [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2012-10-17 4:36 ` [PATCH 1/2] ARM: shmobile: armadillo800eva: __io abuse cleanup Simon Horman
2012-10-17 4:36 ` [PATCH 2/2] ARM: shmobile: r8a7779: use __iomem pointers for MMIO Simon Horman
2012-10-17 4:40 ` [GIT PULL] Renesas ARM-based SoC fixes for v3.7 Simon Horman
2012-10-17 15:08 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox