diff options
| author | Michael Welling <mwelling@ieee.org> | 2015-05-08 13:31:01 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-08 19:55:04 +0100 |
| commit | bc7f9bbc80bcc77745b3f54ec4e7103e3e142bb9 (patch) | |
| tree | 350dbcbf84efaed0050dbc5bb5190df770d0255c /drivers/spi/spi-omap2-mcspi.c | |
| parent | b28cb9414db9f8e42ac18c9e360e4e99cda42489 (diff) | |
| download | talos-obmc-linux-bc7f9bbc80bcc77745b3f54ec4e7103e3e142bb9.tar.gz talos-obmc-linux-bc7f9bbc80bcc77745b3f54ec4e7103e3e142bb9.zip | |
spi: omap2-mcspi: Add gpio_request and init CS
If GPIO chip select is specified, request the GPIO in the setup function
and release it in the cleanup function.
Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 3ac06ade23d0..90cf7e775f15 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -35,6 +35,7 @@ #include <linux/gcd.h> #include <linux/spi/spi.h> +#include <linux/gpio.h> #include <linux/platform_data/spi-omap2-mcspi.h> @@ -1011,6 +1012,12 @@ static int omap2_mcspi_setup(struct spi_device *spi) return ret; } + if (gpio_is_valid(spi->cs_gpio)) { + if (gpio_request(spi->cs_gpio, dev_name(&spi->dev)) == 0) + gpio_direction_output(spi->cs_gpio, + !(spi->mode & SPI_CS_HIGH)); + } + ret = pm_runtime_get_sync(mcspi->dev); if (ret < 0) return ret; @@ -1050,6 +1057,9 @@ static void omap2_mcspi_cleanup(struct spi_device *spi) mcspi_dma->dma_tx = NULL; } } + + if (gpio_is_valid(spi->cs_gpio)) + gpio_free(spi->cs_gpio); } static int omap2_mcspi_work_one(struct omap2_mcspi *mcspi, |
