* [PATCH 1/2] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
2016-01-28 15:17 [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Geert Uytterhoeven
@ 2016-01-28 15:17 ` Geert Uytterhoeven
2016-01-28 15:17 ` [PATCH 2/2] ARM: shmobile: emev2: " Geert Uytterhoeven
2016-02-02 14:07 ` [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Simon Horman
2 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2016-01-28 15:17 UTC (permalink / raw)
To: linux-arm-kernel
Commit 37201ba5c99d0be8 ("ARM: shmobile: r8a7740: Migrate to generic l2c
OF initialization") removed the last user of the legacy "IOMEM()" macro
on r8a7740-based systems. Hence there's no longer a need to set up a
transparent mapping of system I/O registers. Remove the mapping and the
legacy machine_desc.map_io() callback.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 496569f9d578b863..b0f3ce80bb1df294 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -27,25 +27,6 @@
#include "common.h"
-static struct map_desc r8a7740_io_desc[] __initdata = {
- /*
- * for CPGA/INTC/PFC
- * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
- */
- {
- .virtual = 0xe6000000,
- .pfn = __phys_to_pfn(0xe6000000),
- .length = 160 << 20,
- .type = MT_DEVICE_NONSHARED
- },
-};
-
-static void __init r8a7740_map_io(void)
-{
- debug_ll_io_init();
- iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));
-}
-
/*
* r8a7740 chip has lasting errata on MERAM buffer.
* this is work-around for it.
@@ -109,7 +90,6 @@ static const char *const r8a7740_boards_compat_dt[] __initconst = {
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
- .map_io = r8a7740_map_io,
.init_early = shmobile_init_delay,
.init_irq = r8a7740_init_irq_of,
.init_machine = r8a7740_generic_init,
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback
2016-01-28 15:17 [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Geert Uytterhoeven
2016-01-28 15:17 ` [PATCH 1/2] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback Geert Uytterhoeven
@ 2016-01-28 15:17 ` Geert Uytterhoeven
2016-02-02 14:07 ` [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Simon Horman
2 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2016-01-28 15:17 UTC (permalink / raw)
To: linux-arm-kernel
Commit FIXME ("ARM: shmobile: Consolidate SCU mapping code") removed the
last user of the static mapping on emev2-based systems. Remove the
mapping and the legacy machine_desc.map_io() callback.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This depends on "ARM: shmobile: Consolidate SCU mapping code".
---
arch/arm/mach-shmobile/setup-emev2.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 10b7cb5dcb3af1e3..0829d0215c38da89 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -20,23 +20,6 @@
#include <asm/mach/map.h>
#include "common.h"
-static struct map_desc emev2_io_desc[] __initdata = {
-#ifdef CONFIG_SMP
- /* 2M mapping for SCU + L2 controller */
- {
- .virtual = 0xf0000000,
- .pfn = __phys_to_pfn(0x1e000000),
- .length = SZ_2M,
- .type = MT_DEVICE
- },
-#endif
-};
-
-static void __init emev2_map_io(void)
-{
- iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
-}
-
static const char *const emev2_boards_compat_dt[] __initconst = {
"renesas,emev2",
NULL,
@@ -46,7 +29,6 @@ extern const struct smp_operations emev2_smp_ops;
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
- .map_io = emev2_map_io,
.init_early = shmobile_init_delay,
.init_late = shmobile_init_late,
.dt_compat = emev2_boards_compat_dt,
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks
2016-01-28 15:17 [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Geert Uytterhoeven
2016-01-28 15:17 ` [PATCH 1/2] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback Geert Uytterhoeven
2016-01-28 15:17 ` [PATCH 2/2] ARM: shmobile: emev2: " Geert Uytterhoeven
@ 2016-02-02 14:07 ` Simon Horman
2016-02-08 15:03 ` Geert Uytterhoeven
2 siblings, 1 reply; 6+ messages in thread
From: Simon Horman @ 2016-02-02 14:07 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jan 28, 2016 at 04:17:24PM +0100, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> This patch series removes the legacy machine_desc.map_io() callback for
> SoCs that no longer rely on it, but use ioremap() instead.
>
> The patch for emev2 depends on "ARM: shmobile: Consolidate SCU mapping
> code" ("FIXME" commit ID reference to be updated).
>
> Thanks!
Thanks, I have queued these up.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks
2016-02-02 14:07 ` [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks Simon Horman
@ 2016-02-08 15:03 ` Geert Uytterhoeven
2016-02-09 18:54 ` Simon Horman
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2016-02-08 15:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon,
On Tue, Feb 2, 2016 at 3:07 PM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Jan 28, 2016 at 04:17:24PM +0100, Geert Uytterhoeven wrote:
>> This patch series removes the legacy machine_desc.map_io() callback for
>> SoCs that no longer rely on it, but use ioremap() instead.
>>
>> The patch for emev2 depends on "ARM: shmobile: Consolidate SCU mapping
>> code" ("FIXME" commit ID reference to be updated).
>>
>> Thanks!
>
> Thanks, I have queued these up.
Thanks, but unfortunately it's not in renesas-devel-20160205-v4.5-rc2?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove legacy machine_desc.map_io() callbacks
2016-02-08 15:03 ` Geert Uytterhoeven
@ 2016-02-09 18:54 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2016-02-09 18:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 08, 2016 at 04:03:29PM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Tue, Feb 2, 2016 at 3:07 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Jan 28, 2016 at 04:17:24PM +0100, Geert Uytterhoeven wrote:
> >> This patch series removes the legacy machine_desc.map_io() callback for
> >> SoCs that no longer rely on it, but use ioremap() instead.
> >>
> >> The patch for emev2 depends on "ARM: shmobile: Consolidate SCU mapping
> >> code" ("FIXME" commit ID reference to be updated).
> >>
> >> Thanks!
> >
> > Thanks, I have queued these up.
>
> Thanks, but unfortunately it's not in renesas-devel-20160205-v4.5-rc2?
Sorry about that, I'll try to actually queue it up this time.
^ permalink raw reply [flat|nested] 6+ messages in thread