From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 4/5] edb93xx: convert to multiple mem resources
Date: Fri, 12 Nov 2010 19:18:57 +0100 [thread overview]
Message-ID: <1289585938-22813-4-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <20101112180228.GC13661@game.jcrosoft.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/boards/edb93xx/edb93xx.c | 68 +++++-------------------------------
1 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c
index 36cbb51..01ff2b5 100644
--- a/arch/arm/boards/edb93xx/edb93xx.c
+++ b/arch/arm/boards/edb93xx/edb93xx.c
@@ -52,75 +52,45 @@ static struct device_d cfi_dev = {
.resource = cfi_dev_resources,
};
-static struct resource sdram0_dev_resources[] = {
+static struct resource sdram_dev_resources[] = {
[0] = {
.name = "ram0",
.start = CONFIG_EP93XX_SDRAM_BANK0_BASE,
.size = CONFIG_EP93XX_SDRAM_BANK0_SIZE,
.flags = DEVFS_RDWR,
},
-};
-
-static struct device_d sdram0_dev = {
- .id = -1,
- .name = "mem",
- .num_resources = ARRAY_SIZE(sdram0_dev_resources),
- .resource = sdram0_dev_resources,
-};
-
#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 2)
-static struct resource sdram1_dev_resources[] = {
- [0] = {
+ [1] = {
.name = "ram1",
.start = CONFIG_EP93XX_SDRAM_BANK1_BASE,
.size = CONFIG_EP93XX_SDRAM_BANK1_SIZE,
.flags = DEVFS_RDWR,
},
-};
-
-static struct device_d sdram1_dev = {
- .id = -1,
- .name = "mem",
- .num_resources = ARRAY_SIZE(sdram1_dev_resources),
- .resource = sdram1_dev_resources,
-};
#endif
-
#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 3)
-static struct resource sdram2_dev_resources[] = {
- [0] = {
+ [2] = {
.name = "ram2",
.start = CONFIG_EP93XX_SDRAM_BANK2_BASE,
.size = CONFIG_EP93XX_SDRAM_BANK2_SIZE,
.flags = DEVFS_RDWR,
},
-};
-
-static struct device_d sdram2_dev = {
- .id = -1,
- .name = "mem",
- .num_resources = ARRAY_SIZE(sdram2_dev_resources),
- .resource = sdram2_dev_resources,
-};
#endif
-
#if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4)
-static struct resource sdram3_dev_resources[] = {
- [0] = {
+ [3] = {
.name = "ram3",
.start = CONFIG_EP93XX_SDRAM_BANK3_BASE,
.size = CONFIG_EP93XX_SDRAM_BANK3_SIZE,
.flags = DEVFS_RDWR,
},
+#endif
};
-static struct device_d sdram3_dev = {
+static struct device_d sdram_dev = {
.id = -1,
.name = "mem",
- .num_resources = ARRAY_SIZE(sdram3_dev_resources),
- .resource = sdram3_dev_resources,
+ .num_resources = ARRAY_SIZE(sdram_dev_resources),
+ .resource = sdram_dev_resources,
};
-#endif
static struct device_d eth_dev = {
.id = -1,
@@ -140,27 +110,9 @@ static int ep93xx_devices_init(void)
protect_file("/dev/env0", 1);
- register_device(&sdram0_dev);
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 2)
- register_device(&sdram1_dev);
-#endif
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 3)
- register_device(&sdram2_dev);
-#endif
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4)
- register_device(&sdram3_dev);
-#endif
+ register_device(&sdram_dev);
- armlinux_add_dram(&sdram0_dev);
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 2)
- armlinux_add_dram(&sdram1_dev);
-#endif
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS >= 3)
- armlinux_add_dram(&sdram2_dev);
-#endif
-#if (CONFIG_EP93XX_SDRAM_NUM_BANKS == 4)
- armlinux_add_dram(&sdram3_dev);
-#endif
+ armlinux_add_dram(&sdram_dev);
register_device(ð_dev);
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-11-12 18:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-12 18:02 [To test] [PATCH 0/5] device: introduce resource structure Jean-Christophe PLAGNIOL-VILLARD
2010-11-12 18:18 ` [PATCH 1/5] device: introduce resource structure to simplify resource delaration Jean-Christophe PLAGNIOL-VILLARD
2010-11-19 8:00 ` Sascha Hauer
2010-11-19 11:30 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-20 13:40 ` Sascha Hauer
2010-11-20 13:58 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-21 4:28 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-21 6:46 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-23 7:36 ` Sascha Hauer
2010-11-23 8:25 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-23 11:34 ` Sascha Hauer
2011-01-27 8:20 ` Sascha Hauer
2010-11-12 18:18 ` [PATCH 2/5] mem: add multiple resource support Jean-Christophe PLAGNIOL-VILLARD
2010-11-12 18:18 ` [PATCH 3/5] arm/setup_memory_tags: " Jean-Christophe PLAGNIOL-VILLARD
2010-11-12 18:18 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2010-11-12 18:18 ` [PATCH 5/5] pcm037: convert to multiple mem resources Jean-Christophe PLAGNIOL-VILLARD
2010-11-17 13:59 ` [PATCH 1/2] mem: multiple resource support allow exclude a resource Jean-Christophe PLAGNIOL-VILLARD
2010-11-19 8:24 ` Sascha Hauer
2010-11-19 11:31 ` Jean-Christophe PLAGNIOL-VILLARD
2010-11-17 13:59 ` [PATCH 2/2] mem: convert to DEVFS_MEM_BAREBOX_ONLY for freescale-mx25-3-stack/pcm037/pvm038 Jean-Christophe PLAGNIOL-VILLARD
2010-11-17 14:09 ` Baruch Siach
2010-11-17 14:02 ` [To test] [PATCH 0/5] device: introduce resource structure Jean-Christophe PLAGNIOL-VILLARD
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=1289585938-22813-4-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox