Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 16:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi-imx: fix initial chipselect settings

Browse Source 
We can only setup the gpio pins in spi_setup time when we know the
SPI_CS_HIGH setting.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sascha Hauer 2009-10-01 15:44:29 -07:00 committed by Linus Torvalds
parent 462d26b5d2
commit 6c23e5d433
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/spi/spi_imx.c
View File

@ -478,12 +478,18 @@ static int spi_imx_transfer(struct spi_device *spi,
static int spi_imx_setup(struct spi_device *spi) static int spi_imx_setup(struct spi_device *spi)
{ {
struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
int gpio = spi_imx->chipselect[spi->chip_select];
if (!spi->bits_per_word) if (!spi->bits_per_word)
spi->bits_per_word = 8; spi->bits_per_word = 8;
pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__, pr_debug("%s: mode %d, %u bpw, %d hz\n", __func__,
spi->mode, spi->bits_per_word, spi->max_speed_hz); spi->mode, spi->bits_per_word, spi->max_speed_hz);
if (gpio >= 0)
gpio_direction_output(gpio, spi->mode & SPI_CS_HIGH ? 0 : 1);
spi_imx_chipselect(spi, BITBANG_CS_INACTIVE); spi_imx_chipselect(spi, BITBANG_CS_INACTIVE);
return 0; return 0;
@ -532,7 +538,6 @@ static int __init spi_imx_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "can't get cs gpios"); dev_err(&pdev->dev, "can't get cs gpios");
goto out_master_put; goto out_master_put;
} }
gpio_direction_output(spi_imx->chipselect[i], 1);
} }
spi_imx->bitbang.chipselect = spi_imx_chipselect; spi_imx->bitbang.chipselect = spi_imx_chipselect;