From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Cc: jbe@pengutronix.de
Subject: [PATCH 7/7] mtd: m25p80: Allow to specify devicename via devicetree alias
Date: Mon, 28 Oct 2013 13:01:40 +0100 [thread overview]
Message-ID: <1382961700-8833-8-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1382961700-8833-1-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mtd/devices/m25p80.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 429ddf6..1e3bc93 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -808,6 +808,8 @@ static int m25p_probe(struct device_d *dev)
struct flash_info *info = NULL;
unsigned i;
unsigned do_jdec_probe = 1;
+ char *flashname = NULL;
+ int device_id;
/* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have
@@ -876,10 +878,19 @@ static int m25p_probe(struct device_d *dev)
write_sr(flash, 0);
}
- if (data && data->name)
- flash->mtd.name = data->name;
- else
- flash->mtd.name = "m25p";
+ device_id = DEVICE_ID_SINGLE;
+ if (dev->device_node) {
+ const char *alias = of_alias_get(dev->device_node);
+ if (alias)
+ flashname = xstrdup(alias);
+ } else if (data && data->name) {
+ flashname = data->name;
+ }
+
+ if (!flashname) {
+ device_id = DEVICE_ID_DYNAMIC;
+ flashname = "m25p";
+ }
flash->mtd.type = MTD_NORFLASH;
flash->mtd.writesize = 1;
@@ -942,7 +953,7 @@ static int m25p_probe(struct device_d *dev)
flash->mtd.eraseregions[i].erasesize / 1024,
flash->mtd.eraseregions[i].numblocks);
- return add_mtd_device(&flash->mtd, flash->mtd.name, DEVICE_ID_DYNAMIC);
+ return add_mtd_device(&flash->mtd, flashname, device_id);
}
static __maybe_unused struct of_device_id m25p80_dt_ids[] = {
--
1.8.4.rc3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2013-10-28 12:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 12:01 spi/mtd/m25p80 patches Sascha Hauer
2013-10-28 12:01 ` [PATCH 1/7] spi: Call spi_of_register_slaves from core Sascha Hauer
2013-10-28 12:01 ` [PATCH 2/7] spi: support dynamic bus ids Sascha Hauer
2013-10-28 12:01 ` [PATCH 3/7] spi: Get bus_num from devicetree Sascha Hauer
2013-10-28 12:01 ` [PATCH 4/7] ARM: i.MX6: Add spi aliases to devicetree Sascha Hauer
2013-10-28 12:01 ` [PATCH 5/7] mtd: raw: rename raw device Sascha Hauer
2013-10-28 12:01 ` [PATCH 6/7] mtd: Pass device_id to add_mtd_device Sascha Hauer
2013-10-28 12:01 ` Sascha Hauer [this message]
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=1382961700-8833-8-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jbe@pengutronix.de \
/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