From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754717AbbAUPyH (ORCPT ); Wed, 21 Jan 2015 10:54:07 -0500 Received: from mail-lb0-f175.google.com ([209.85.217.175]:44266 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753404AbbAUPxQ (ORCPT ); Wed, 21 Jan 2015 10:53:16 -0500 From: Ricardo Ribalda Delgado To: Mark Brown , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH 1/3] spi/xilinx: Use automatic bus number on device tree Date: Wed, 21 Jan 2015 16:53:08 +0100 Message-Id: <1421855590-9210-2-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421855590-9210-1-git-send-email-ricardo.ribalda@gmail.com> References: <1421855590-9210-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If there is more than one spi device on a device tree, the second one will fail to probe due to a duplicated bus_num. This patch uses automatic bus number if the device is deined on a device tree. Signed-off-by: Ricardo Ribalda Delgado --- drivers/spi/spi-xilinx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index 79bd84f..2ea4ca5 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -332,14 +332,17 @@ static int xilinx_spi_probe(struct platform_device *pdev) struct spi_master *master; u32 tmp; u8 i; + s16 bus_num; pdata = dev_get_platdata(&pdev->dev); if (pdata) { num_cs = pdata->num_chipselect; bits_per_word = pdata->bits_per_word; + bus_num = pdev->id; } else { of_property_read_u32(pdev->dev.of_node, "xlnx,num-ss-bits", &num_cs); + bus_num = -1; } if (!num_cs) { @@ -369,7 +372,7 @@ static int xilinx_spi_probe(struct platform_device *pdev) goto put_master; } - master->bus_num = pdev->id; + master->bus_num = bus_num; master->num_chipselect = num_cs; master->dev.of_node = pdev->dev.of_node; -- 2.1.4