From: Simon Horman <horms+renesas@verge.net.au>
To: linux-renesas-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
Magnus Damm <magnus.damm@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Simon Horman <horms+renesas@verge.net.au>
Subject: [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
Date: Fri, 12 Feb 2016 20:06:24 +0100 [thread overview]
Message-ID: <a0827317f5f351c303ed91f0272f10b1394bdab1.1455303757.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1455303757.git.horms+renesas@verge.net.au>
From: Geert Uytterhoeven <geert+renesas@glider.be>
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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 3e71cd4168dd..db6dbfbaf9f1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -26,25 +26,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.
@@ -108,7 +89,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,
--
2.7.0.rc3.207.g0ac5344
WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback
Date: Fri, 12 Feb 2016 20:06:24 +0100 [thread overview]
Message-ID: <a0827317f5f351c303ed91f0272f10b1394bdab1.1455303757.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1455303757.git.horms+renesas@verge.net.au>
From: Geert Uytterhoeven <geert+renesas@glider.be>
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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 3e71cd4168dd..db6dbfbaf9f1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -26,25 +26,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.
@@ -108,7 +89,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,
--
2.7.0.rc3.207.g0ac5344
next prev parent reply other threads:[~2016-02-12 19:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 19:06 [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
2016-02-12 19:06 ` [PATCH 1/8] ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 2/8] ARM: shmobile: r8a7740: Migrate to generic l2c OF initialization Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 3/8] ARM: shmobile: r8a7740: Remove mapping of L2 cache controller registers Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 4/8] ARM: shmobile: Move shmobile_scu_base from .text to .data Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 5/8] ARM: shmobile: Consolidate SCU mapping code Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` Simon Horman [this message]
2016-02-12 19:06 ` [PATCH 6/8] ARM: shmobile: r8a7740: Remove legacy machine_desc.map_io() callback Simon Horman
2016-02-12 19:06 ` [PATCH 7/8] ARM: shmobile: emev2: " Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-12 19:06 ` [PATCH 8/8] ARM: shmobile: emev2: Move declaration of emev2_smp_ops to emev2.h Simon Horman
2016-02-12 19:06 ` Simon Horman
2016-02-17 6:54 ` [GIT PULL] Renesas ARM Based SoC Updates for v4.6 Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a0827317f5f351c303ed91f0272f10b1394bdab1.1455303757.git.horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--cc=geert+renesas@glider.be \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.