From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Cc: jbe@pengutronix.de
Subject: [PATCH 2/7] spi: support dynamic bus ids
Date: Mon, 28 Oct 2013 13:01:35 +0100 [thread overview]
Message-ID: <1382961700-8833-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1382961700-8833-1-git-send-email-s.hauer@pengutronix.de>
When probing spi bus masters from devicetree they got a bus_num
of -1. This works with a single bus master only since all bus masters
had the same bus_num. Detect this and dynamically assign a valid
bus_num.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/spi/spi.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index d273050..f035cc2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -214,6 +214,7 @@ static LIST_HEAD(spi_master_list);
*/
int spi_register_master(struct spi_master *master)
{
+ static int dyn_bus_id = (1 << 15) - 1;
int status = -ENODEV;
debug("%s: %s:%d\n", __func__, master->dev->name, master->dev->id);
@@ -224,6 +225,10 @@ int spi_register_master(struct spi_master *master)
if (master->num_chipselect == 0)
return -EINVAL;
+ /* convention: dynamically assigned bus IDs count down from the max */
+ if (master->bus_num < 0)
+ master->bus_num = dyn_bus_id--;
+
list_add_tail(&master->list, &spi_master_list);
spi_of_register_slaves(master);
--
1.8.4.rc3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next 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 ` Sascha Hauer [this message]
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 ` [PATCH 7/7] mtd: m25p80: Allow to specify devicename via devicetree alias Sascha Hauer
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-3-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