Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] S3C24XX: fix passing spi chipselect to select routine

Browse source 
It turns out that the spi chipselect was not being passed to the set_cs
routine if one was specified in the platform data.

As part of the fix, change to using a set_cs field in the controller state,
and put a default gpio routine in if the data passed does not specify it.

Also remove the //#define DEBUG

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ben Dooks 2007-01-26 00:56:43 -08:00 committed by Linus Torvalds
parent 46fe4ddd9d
commit 8736b9270c
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/spi/spi_s3c24xx.c
View file

@ -10,9 +10,6 @@
* *
*/ */
//#define DEBUG
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
@ -44,6 +41,9 @@ struct s3c24xx_spi {
int len; int len;
int count; int count;
int (*set_cs)(struct s3c2410_spi_info *spi,
int cs, int pol);
/* data buffers */ /* data buffers */
const unsigned char *tx; const unsigned char *tx;
unsigned char *rx; unsigned char *rx;
@ -64,6 +64,11 @@ static inline struct s3c24xx_spi *to_hw(struct spi_device *sdev)
return spi_master_get_devdata(sdev->master); return spi_master_get_devdata(sdev->master);
} }
static void s3c24xx_spi_gpiocs(struct s3c2410_spi_info *spi, int cs, int pol)
{
s3c2410_gpio_setpin(spi->pin_cs, pol);
}
static void s3c24xx_spi_chipsel(struct spi_device *spi, int value) static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
{ {
struct s3c24xx_spi *hw = to_hw(spi); struct s3c24xx_spi *hw = to_hw(spi);
@ -72,10 +77,7 @@ static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
switch (value) { switch (value) {
case BITBANG_CS_INACTIVE: case BITBANG_CS_INACTIVE:
if (hw->pdata->set_cs) hw->pdata->set_cs(hw->pdata, spi->chip_select, cspol^1);
hw->pdata->set_cs(hw->pdata, value, cspol);
else
s3c2410_gpio_setpin(hw->pdata->pin_cs, cspol ^ 1);
break; break;
case BITBANG_CS_ACTIVE: case BITBANG_CS_ACTIVE:
@ -96,14 +98,9 @@ static void s3c24xx_spi_chipsel(struct spi_device *spi, int value)
/* write new configration */ /* write new configration */
writeb(spcon, hw->regs + S3C2410_SPCON); writeb(spcon, hw->regs + S3C2410_SPCON);
hw->pdata->set_cs(hw->pdata, spi->chip_select, cspol);
if (hw->pdata->set_cs)
hw->pdata->set_cs(hw->pdata, value, cspol);
else
s3c2410_gpio_setpin(hw->pdata->pin_cs, cspol);
break; break;
} }
} }
@ -330,9 +327,12 @@ static int s3c24xx_spi_probe(struct platform_device *pdev)
/* setup any gpio we can */ /* setup any gpio we can */
if (!hw->pdata->set_cs) { if (!hw->pdata->set_cs) {
hw->set_cs = s3c24xx_spi_gpiocs;
s3c2410_gpio_setpin(hw->pdata->pin_cs, 1); s3c2410_gpio_setpin(hw->pdata->pin_cs, 1);
s3c2410_gpio_cfgpin(hw->pdata->pin_cs, S3C2410_GPIO_OUTPUT); s3c2410_gpio_cfgpin(hw->pdata->pin_cs, S3C2410_GPIO_OUTPUT);
} } else
hw->set_cs = hw->pdata->set_cs;
/* register our spi controller */ /* register our spi controller */