Unverified Commit f09f6dfe authored by Russ Weight's avatar Russ Weight Committed by Mark Brown
Browse files

spi: altera: Change to dynamic allocation of spi id 



The spi-altera driver has two flavors: platform and dfl. I'm seeing
a case where I have both device types in the same machine, and they
are conflicting on the SPI ID:

... kernel: couldn't get idr
... kernel: WARNING: CPU: 28 PID: 912 at drivers/spi/spi.c:2920 spi_register_controller.cold+0x84/0xc0a

Both the platform and dfl drivers use the parent's driver ID as the SPI
ID. In the error case, the parent devices are dfl_dev.4 and
subdev_spi_altera.4.auto. When the second spi-master is created, the
failure occurs because the SPI ID of 4 has already been allocated.

Change the ID allocation to dynamic (by initializing bus_num to -1) to
avoid duplicate SPI IDs.

Signed-off-by: default avatarRuss Weight <russell.h.weight@intel.com>
Link: https://lore.kernel.org/r/20211019002401.24041-1-russell.h.weight@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 16a8e2fb

drivers/spi/spi-altera-dfl.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int dfl_spi_altera_probe(struct dfl_device *dfl_dev) 
	if (!master)

		return -ENOMEM;



	master->bus_num = dfl_dev->id;

	master->bus_num = -1;



	hw = spi_master_get_devdata(master);

drivers/spi/spi-altera-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int altera_spi_probe(struct platform_device *pdev) 
		return err;



	/* setup the master state. */

	master->bus_num = pdev->id;

	master->bus_num = -1;



	if (pdata) {

		if (pdata->num_chipselect > ALTERA_SPI_MAX_CS) {