diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-01-20 15:49:45 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-20 15:49:45 -0500 |
commit | fa0fcde66ac3360678360104b24492015e7b852b (patch) | |
tree | 58464da260602842c14ab8d8ffb261d1897814a2 /drivers/spi | |
parent | e6b873c9666015484a01373a4eebc6cfa82e670d (diff) |
spi/s3c64xx: Add new parameter to cs callback
Since most of the chip-selects are simply going to be like
gpio_set_value, it would do good to have the same callback type
so that it could simply be made to point at gpio_set_value.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi_s3c64xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c index 9fa0b99e1607..32db69540fa9 100644 --- a/drivers/spi/spi_s3c64xx.c +++ b/drivers/spi/spi_s3c64xx.c | |||
@@ -300,13 +300,14 @@ static inline void enable_cs(struct s3c64xx_spi_driver_data *sdd, | |||
300 | if (sdd->tgl_spi != spi) { /* if last mssg on diff device */ | 300 | if (sdd->tgl_spi != spi) { /* if last mssg on diff device */ |
301 | /* Deselect the last toggled device */ | 301 | /* Deselect the last toggled device */ |
302 | cs = sdd->tgl_spi->controller_data; | 302 | cs = sdd->tgl_spi->controller_data; |
303 | cs->set_level(spi->mode & SPI_CS_HIGH ? 0 : 1); | 303 | cs->set_level(cs->line, |
304 | spi->mode & SPI_CS_HIGH ? 0 : 1); | ||
304 | } | 305 | } |
305 | sdd->tgl_spi = NULL; | 306 | sdd->tgl_spi = NULL; |
306 | } | 307 | } |
307 | 308 | ||
308 | cs = spi->controller_data; | 309 | cs = spi->controller_data; |
309 | cs->set_level(spi->mode & SPI_CS_HIGH ? 1 : 0); | 310 | cs->set_level(cs->line, spi->mode & SPI_CS_HIGH ? 1 : 0); |
310 | } | 311 | } |
311 | 312 | ||
312 | static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd, | 313 | static int wait_for_xfer(struct s3c64xx_spi_driver_data *sdd, |
@@ -386,7 +387,7 @@ static inline void disable_cs(struct s3c64xx_spi_driver_data *sdd, | |||
386 | if (sdd->tgl_spi == spi) | 387 | if (sdd->tgl_spi == spi) |
387 | sdd->tgl_spi = NULL; | 388 | sdd->tgl_spi = NULL; |
388 | 389 | ||
389 | cs->set_level(spi->mode & SPI_CS_HIGH ? 0 : 1); | 390 | cs->set_level(cs->line, spi->mode & SPI_CS_HIGH ? 0 : 1); |
390 | } | 391 | } |
391 | 392 | ||
392 | static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) | 393 | static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) |