|
@@ -178,8 +178,10 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active)
|
|
if (is_active)
|
|
if (is_active)
|
|
setsck(spi, spi->mode & SPI_CPOL);
|
|
setsck(spi, spi->mode & SPI_CPOL);
|
|
|
|
|
|
- /* SPI is normally active-low */
|
|
|
|
- gpio_set_value(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
|
|
|
|
|
|
+ if (cs != SPI_GPIO_NO_CHIPSELECT) {
|
|
|
|
+ /* SPI is normally active-low */
|
|
|
|
+ gpio_set_value(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
static int spi_gpio_setup(struct spi_device *spi)
|
|
static int spi_gpio_setup(struct spi_device *spi)
|
|
@@ -191,15 +193,17 @@ static int spi_gpio_setup(struct spi_device *spi)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
if (!spi->controller_state) {
|
|
if (!spi->controller_state) {
|
|
- status = gpio_request(cs, dev_name(&spi->dev));
|
|
|
|
- if (status)
|
|
|
|
- return status;
|
|
|
|
- status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH);
|
|
|
|
|
|
+ if (cs != SPI_GPIO_NO_CHIPSELECT) {
|
|
|
|
+ status = gpio_request(cs, dev_name(&spi->dev));
|
|
|
|
+ if (status)
|
|
|
|
+ return status;
|
|
|
|
+ status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (!status)
|
|
if (!status)
|
|
status = spi_bitbang_setup(spi);
|
|
status = spi_bitbang_setup(spi);
|
|
if (status) {
|
|
if (status) {
|
|
- if (!spi->controller_state)
|
|
|
|
|
|
+ if (!spi->controller_state && cs != SPI_GPIO_NO_CHIPSELECT)
|
|
gpio_free(cs);
|
|
gpio_free(cs);
|
|
}
|
|
}
|
|
return status;
|
|
return status;
|
|
@@ -209,7 +213,8 @@ static void spi_gpio_cleanup(struct spi_device *spi)
|
|
{
|
|
{
|
|
unsigned long cs = (unsigned long) spi->controller_data;
|
|
unsigned long cs = (unsigned long) spi->controller_data;
|
|
|
|
|
|
- gpio_free(cs);
|
|
|
|
|
|
+ if (cs != SPI_GPIO_NO_CHIPSELECT)
|
|
|
|
+ gpio_free(cs);
|
|
spi_bitbang_cleanup(spi);
|
|
spi_bitbang_cleanup(spi);
|
|
}
|
|
}
|
|
|
|
|