Commit 4fb7d85b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A couple of final driver specific fixes for v5.15, one fixing
  potential ID collisions between two instances of the Altera driver and
  one making Microwire full duplex mode actually work on pl022"

* tag 'spi-fix-v5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spl022: fix Microwire full duplex mode
  spi: altera: Change to dynamic allocation of spi id
parents 8685de2e d81d0e41

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) {

drivers/spi/spi-pl022.c

+3 −2
Original line number Diff line number Diff line
@@ -1716,7 +1716,7 @@ static int verify_controller_parameters(struct pl022 *pl022, 
				return -EINVAL;

			}

		} else {

			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)

			if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) {

				dev_err(&pl022->adev->dev,

					"Microwire half duplex mode requested,"

					" but this is only available in the"
@@ -1724,6 +1724,7 @@ static int verify_controller_parameters(struct pl022 *pl022, 
				return -EINVAL;

			}

		}

	}

	return 0;

}