From: bengardiner@nanometrics.ca (Ben Gardiner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] [v3] davinci: da850-dm646x: remove the SRAM_VIRT iotable entry
Date: Wed, 1 Jun 2011 11:03:24 -0400 [thread overview]
Message-ID: <e7fec7e37a358b66d665d6c4ea41c5fa47685b8b.1306940448.git.bengardiner@nanometrics.ca> (raw)
In-Reply-To: <cover.1306940448.git.bengardiner@nanometrics.ca>
The sram regions defined for da850-dm646x in their iotable entries are also
defined in their davinci_soc_info's.
Remove this duplicate information which is now uneccessary since sram
init will ioremap the regions defined by their davinci_soc_info's.
Since this removal completely removes all uses of SRAM_VIRT, also remove
the SRAM_VIRT definition.
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: Sergei Shtylyov <sshtylyov@mvista.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Changes since v2:
* Added Jean-Christophe PLAGNIOL-VILLARD's Ack
Changes since v1:
* squashed patches 3-8 in v1 series into this patch (Sergei Shtylyov)
---
arch/arm/mach-davinci/da850.c | 6 ------
arch/arm/mach-davinci/dm355.c | 6 ------
arch/arm/mach-davinci/dm365.c | 6 ------
arch/arm/mach-davinci/dm644x.c | 6 ------
arch/arm/mach-davinci/dm646x.c | 6 ------
arch/arm/mach-davinci/include/mach/common.h | 2 --
6 files changed, 0 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 5c2bf3b..904ede9 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -725,12 +725,6 @@ static struct map_desc da850_io_desc[] = {
.length = DA8XX_CP_INTC_SIZE,
.type = MT_DEVICE
},
- {
- .virtual = SRAM_VIRT,
- .pfn = __phys_to_pfn(DA8XX_ARM_RAM_BASE),
- .length = SZ_8K,
- .type = MT_DEVICE
- },
};
static u32 da850_psc_bases[] = { DA8XX_PSC0_BASE, DA8XX_PSC1_BASE };
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 9bda687..94f44d3 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -757,12 +757,6 @@ static struct map_desc dm355_io_desc[] = {
.length = IO_SIZE,
.type = MT_DEVICE
},
- {
- .virtual = SRAM_VIRT,
- .pfn = __phys_to_pfn(0x00010000),
- .length = SZ_32K,
- .type = MT_MEMORY_NONCACHED,
- },
};
/* Contents of JTAG ID register used to identify exact cpu type */
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index d306034..58f5b0a 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -970,12 +970,6 @@ static struct map_desc dm365_io_desc[] = {
.length = IO_SIZE,
.type = MT_DEVICE
},
- {
- .virtual = SRAM_VIRT,
- .pfn = __phys_to_pfn(0x00010000),
- .length = SZ_32K,
- .type = MT_MEMORY_NONCACHED,
- },
};
static struct resource dm365_ks_resources[] = {
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 3949ed7..11e6481 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -663,12 +663,6 @@ static struct map_desc dm644x_io_desc[] = {
.length = IO_SIZE,
.type = MT_DEVICE
},
- {
- .virtual = SRAM_VIRT,
- .pfn = __phys_to_pfn(0x00008000),
- .length = SZ_16K,
- .type = MT_MEMORY_NONCACHED,
- },
};
/* Contents of JTAG ID register used to identify exact cpu type */
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index a4365f7..57d697e 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -747,12 +747,6 @@ static struct map_desc dm646x_io_desc[] = {
.length = IO_SIZE,
.type = MT_DEVICE
},
- {
- .virtual = SRAM_VIRT,
- .pfn = __phys_to_pfn(0x00010000),
- .length = SZ_32K,
- .type = MT_MEMORY_NONCACHED,
- },
};
/* Contents of JTAG ID register used to identify exact cpu type */
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 665d049..16b5ec5 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -86,8 +86,6 @@ extern struct davinci_soc_info davinci_soc_info;
extern void davinci_common_init(struct davinci_soc_info *soc_info);
extern void davinci_init_ide(void);
-/* standard place to map on-chip SRAMs; they *may* support DMA */
-#define SRAM_VIRT 0xfffe0000
#define SRAM_SIZE SZ_128K
#endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */
--
1.7.4.1
next prev parent reply other threads:[~2011-06-01 15:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-31 21:46 [PATCH v2 0/3] davinci: ioremap SRAM instead of iotables Ben Gardiner
2011-05-31 21:46 ` [PATCH 1/3] [v2] davinci: sram: ioremap the davinci_soc_info specified sram regions Ben Gardiner
2011-06-01 5:17 ` Jean-Christophe PLAGNIOL-VILLARD
2011-06-01 15:03 ` [PATCH v3 0/3] davinci: ioremap SRAM instead of iotables Ben Gardiner
2011-06-01 15:03 ` [PATCH 1/3] [v3] davinci: sram: ioremap the davinci_soc_info specified sram regions Ben Gardiner
2011-06-01 15:03 ` Ben Gardiner [this message]
2011-06-01 15:03 ` [PATCH 3/3] [v3] davinci: da850: changed SRAM allocator to shared ram Ben Gardiner
2011-06-01 16:56 ` [PATCH v3 0/3] davinci: ioremap SRAM instead of iotables Nori, Sekhar
2011-05-31 21:46 ` [PATCH 2/3] [v2] davinci: da850-dm646x: remove the SRAM_VIRT iotable entry Ben Gardiner
2011-05-31 21:46 ` [PATCH 3/3] [v2] davinci: da850: changed SRAM allocator to shared ram Ben Gardiner
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=e7fec7e37a358b66d665d6c4ea41c5fa47685b8b.1306940448.git.bengardiner@nanometrics.ca \
--to=bengardiner@nanometrics.ca \
--cc=linux-arm-kernel@lists.infradead.org \
/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.