Commit 438ae1ae authored by Ben Dooks's avatar Ben Dooks Committed by Linus Torvalds

S3C24XX: ensure we only configure valid GPIOs

If we specify an GPIO which cannot be used for the purpose, then assume
that the GPIO is not to be used and do not try and configure it.  This can
be the case where the SPI bus is TX only.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3ac40b9b
...@@ -96,6 +96,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value) ...@@ -96,6 +96,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
static int s3c2410_spigpio_probe(struct platform_device *dev) static int s3c2410_spigpio_probe(struct platform_device *dev)
{ {
struct s3c2410_spigpio_info *info;
struct spi_master *master; struct spi_master *master;
struct s3c2410_spigpio *sp; struct s3c2410_spigpio *sp;
int ret; int ret;
...@@ -113,7 +114,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev) ...@@ -113,7 +114,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
platform_set_drvdata(dev, sp); platform_set_drvdata(dev, sp);
/* copy in the plkatform data */ /* copy in the plkatform data */
sp->info = dev->dev.platform_data; info = sp->info = dev->dev.platform_data;
/* setup spi bitbang adaptor */ /* setup spi bitbang adaptor */
sp->bitbang.master = spi_master_get(master); sp->bitbang.master = spi_master_get(master);
...@@ -124,13 +125,18 @@ static int s3c2410_spigpio_probe(struct platform_device *dev) ...@@ -124,13 +125,18 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
sp->bitbang.txrx_word[SPI_MODE_2] = s3c2410_spigpio_txrx_mode2; sp->bitbang.txrx_word[SPI_MODE_2] = s3c2410_spigpio_txrx_mode2;
sp->bitbang.txrx_word[SPI_MODE_3] = s3c2410_spigpio_txrx_mode3; sp->bitbang.txrx_word[SPI_MODE_3] = s3c2410_spigpio_txrx_mode3;
/* set state of spi pins */ /* set state of spi pins, always assume that the clock is
s3c2410_gpio_setpin(sp->info->pin_clk, 0); * available, but do check the MOSI and MISO. */
s3c2410_gpio_setpin(sp->info->pin_mosi, 0); s3c2410_gpio_setpin(info->pin_clk, 0);
s3c2410_gpio_cfgpin(info->pin_clk, S3C2410_GPIO_OUTPUT);
s3c2410_gpio_cfgpin(sp->info->pin_clk, S3C2410_GPIO_OUTPUT); if (info->pin_mosi < S3C2410_GPH10) {
s3c2410_gpio_cfgpin(sp->info->pin_mosi, S3C2410_GPIO_OUTPUT); s3c2410_gpio_setpin(info->pin_mosi, 0);
s3c2410_gpio_cfgpin(sp->info->pin_miso, S3C2410_GPIO_INPUT); s3c2410_gpio_cfgpin(info->pin_mosi, S3C2410_GPIO_OUTPUT);
}
if (info->pin_miso != S3C2410_GPA0 && info->pin_miso < S3C2410_GPH10)
s3c2410_gpio_cfgpin(info->pin_miso, S3C2410_GPIO_INPUT);
ret = spi_bitbang_start(&sp->bitbang); ret = spi_bitbang_start(&sp->bitbang);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment