Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88b0357d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/grant' into spi-linus

parents 0faa3146 3086c9f6

drivers/spi/spi-atmel.c

+2 −2
Original line number Diff line number Diff line
@@ -1408,8 +1408,8 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) 
		}



		/* FIXME implement these protocol options!! */

		if (xfer->speed_hz) {

			dev_dbg(&spi->dev, "no protocol options yet\n");

		if (xfer->speed_hz < spi->max_speed_hz) {

			dev_dbg(&spi->dev, "can't change speed in transfer\n");

			return -ENOPROTOOPT;

		}

drivers/spi/spi-davinci.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static const struct of_device_id davinci_spi_of_match[] = { 
	},

	{ },

};

MODULE_DEVICE_TABLE(of, davini_spi_of_match);

MODULE_DEVICE_TABLE(of, davinci_spi_of_match);



/**

 * spi_davinci_get_pdata - Get platform data from DTS binding

drivers/spi/spi.c

+6 −3
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ struct spi_device *spi_alloc_device(struct spi_master *master) 
	spi->dev.parent = &master->dev;

	spi->dev.bus = &spi_bus_type;

	spi->dev.release = spidev_release;

	spi->cs_gpio = -EINVAL;

	spi->cs_gpio = -ENOENT;

	device_initialize(&spi->dev);

	return spi;

}
@@ -1067,8 +1067,11 @@ static int of_spi_register_master(struct spi_master *master) 
	nb = of_gpio_named_count(np, "cs-gpios");

	master->num_chipselect = max(nb, (int)master->num_chipselect);



	if (nb < 1)

	/* Return error only for an incorrectly formed cs-gpios property */

	if (nb == 0 || nb == -ENOENT)

		return 0;

	else if (nb < 0)

		return nb;



	cs = devm_kzalloc(&master->dev,

			  sizeof(int) * master->num_chipselect,
@@ -1079,7 +1082,7 @@ static int of_spi_register_master(struct spi_master *master) 
		return -ENOMEM;



	for (i = 0; i < master->num_chipselect; i++)

		cs[i] = -EINVAL;

		cs[i] = -ENOENT;



	for (i = 0; i < nb; i++)

		cs[i] = of_get_named_gpio(np, "cs-gpios", i);

include/linux/spi/spi.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ extern struct bus_type spi_bus_type; 
 * @modalias: Name of the driver to use with this device, or an alias

 *	for that name.  This appears in the sysfs "modalias" attribute

 *	for driver coldplugging, and in uevents used for hotplugging

 * @cs_gpio: gpio number of the chipselect line (optional, -EINVAL when

 * @cs_gpio: gpio number of the chipselect line (optional, -ENOENT when

 *	when not using a GPIO line)

 *

 * A @spi_device is used to interchange data between an SPI slave
@@ -266,7 +266,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) 
 *	queue so the subsystem notifies the driver that it may relax the

 *	hardware by issuing this call

 * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS

 *	number. Any individual value may be -EINVAL for CS lines that

 *	number. Any individual value may be -ENOENT for CS lines that

 *	are not GPIOs (driven by the SPI controller itself).

 *

 * Each SPI master controller can communicate with one or more @spi_device