From: Lars-Peter Clausen Date: Thu, 10 Jul 2014 08:30:20 +0000 (+0200) Subject: spi: xilinx: Use pdev->id instead of pdev->dev.id for the SPI bus number X-Git-Tag: omap-for-v3.17/fixes-against-rc2~157^2~5^4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b153a2137c5d2914794c8944d78c731c1b0ae9d;p=pandora-kernel.git 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 Signed-off-by: Mark Brown --- Reading git-diff-tree failed