p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spi: xilinx: Use pdev->id instead of pdev->dev.id for the SPI bus number 

The Xilinx SPI driver initializes the bus_num field of the SPI master to
pdev->dev.id. pdev->dev.id is always 0 for platform devices which causes bus
number conflicts for the SPI controller when creating multiple device instances
of the driver. Instead use pdev->id which will have the assignt platform device
id. If the device is instantiated via devicetree pdev->id is -1 which will cause
the SPI core to dynamically assign a id (or use the id defined via a alias in
the devicetree).

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2014-07-10 10:30:20 +02:00 committed by Mark Brown
parent 7171511eae
commit 4b153a2137
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-xilinx.c
View File

@ -369,7 +369,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
goto put_master; goto put_master;
} }
master->bus_num = pdev->dev.id; master->bus_num = pdev->id;
master->num_chipselect = num_cs; master->num_chipselect = num_cs;
master->dev.of_node = pdev->dev.of_node; master->dev.of_node = pdev->dev.of_node;