linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] spi: qup: provide proper bus numbers
@ 2016-01-21 18:33 Srinivas Kandagatla
  2016-01-21 18:38 ` Mark Brown
  0 siblings, 1 reply; 6+ messages in thread
From: Srinivas Kandagatla @ 2016-01-21 18:33 UTC (permalink / raw)
  To: Andy Gross, linux-spi
  Cc: David Brown, Mark Brown, linux-arm-msm, linux-soc, linux-kernel,
	Srinivas Kandagatla

This driver reuses pdev->id for spi bus numbers resulting in random
or very large bus numbering when used with device trees. pdev->id
is not the correct choice when using device trees. So add code to
get bus numbers via device tree aliases and if it fails then generate
a unique bus number.

Without this patch the driver get a random and useless bus number.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/spi/spi-qup.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 810a7fa..2bc67a9 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -127,6 +127,8 @@
 #define SPI_DELAY_THRESHOLD		1
 #define SPI_DELAY_RETRY			10
 
+static atomic_t spi_qup_next_id = ATOMIC_INIT(0);
+
 struct spi_qup {
 	void __iomem		*base;
 	struct device		*dev;
@@ -759,7 +761,7 @@ static int spi_qup_probe(struct platform_device *pdev)
 	struct device *dev;
 	void __iomem *base;
 	u32 max_freq, iomode, num_cs;
-	int ret, irq, size;
+	int ret, irq, size, bus_num;
 
 	dev = &pdev->dev;
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -816,7 +818,15 @@ static int spi_qup_probe(struct platform_device *pdev)
 	else
 		master->num_chipselect = num_cs;
 
-	master->bus_num = pdev->id;
+	if (dev->of_node)
+		bus_num = of_alias_get_id(dev->of_node, "spi");
+	else
+		bus_num = pdev->id;
+
+	if (bus_num < 0)
+		bus_num = atomic_inc_return(&spi_qup_next_id) - 1;
+
+	master->bus_num = bus_num;
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
 	master->max_speed_hz = max_freq;
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-01-21 20:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-21 18:33 [PATCH] spi: qup: provide proper bus numbers Srinivas Kandagatla
2016-01-21 18:38 ` Mark Brown
     [not found]   ` <20160121183810.GN6588-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-01-21 18:47     ` Srinivas Kandagatla
2016-01-21 19:03       ` Mark Brown
2016-01-21 19:26         ` Srinivas Kandagatla
2016-01-21 20:14           ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).