Commit 05232669 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/core' into spi-next

parents b14a8a80 8eee6b9d

drivers/spi/spi.c

+7 −2
Original line number Diff line number Diff line
@@ -697,10 +697,15 @@ static void spi_set_cs(struct spi_device *spi, bool enable) 
	if (spi->mode & SPI_CS_HIGH)

		enable = !enable;



	if (gpio_is_valid(spi->cs_gpio))

	if (gpio_is_valid(spi->cs_gpio)) {

		gpio_set_value(spi->cs_gpio, !enable);

	else if (spi->master->set_cs)

		/* Some SPI masters need both GPIO CS & slave_select */

		if ((spi->master->flags & SPI_MASTER_GPIO_SS) &&

		    spi->master->set_cs)

			spi->master->set_cs(spi, !enable);

	} else if (spi->master->set_cs) {

		spi->master->set_cs(spi, !enable);

	}

}



#ifdef CONFIG_HAS_DMA

include/linux/spi/spi.h

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ struct spi_master { 
#define SPI_MASTER_NO_TX	BIT(2)		/* can't do buffer write */

#define SPI_MASTER_MUST_RX      BIT(3)		/* requires rx */

#define SPI_MASTER_MUST_TX      BIT(4)		/* requires tx */

#define SPI_MASTER_GPIO_SS      BIT(5)		/* GPIO CS must select slave */



	/*

	 * on some hardware transfer / message size may be constrained

CRA Git | Maintained and supported by SUSTech CRA and CCSE