aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/omap_uwire.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/spi/omap_uwire.c')
-rw-r--r--drivers/spi/omap_uwire.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 747d29be45d5..aa90ddb37066 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -447,19 +447,10 @@ done:
447 return status; 447 return status;
448} 448}
449 449
450/* the spi->mode bits understood by this driver: */
451#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
452
453static int uwire_setup(struct spi_device *spi) 450static int uwire_setup(struct spi_device *spi)
454{ 451{
455 struct uwire_state *ust = spi->controller_state; 452 struct uwire_state *ust = spi->controller_state;
456 453
457 if (spi->mode & ~MODEBITS) {
458 dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
459 spi->mode & ~MODEBITS);
460 return -EINVAL;
461 }
462
463 if (ust == NULL) { 454 if (ust == NULL) {
464 ust = kzalloc(sizeof(*ust), GFP_KERNEL); 455 ust = kzalloc(sizeof(*ust), GFP_KERNEL);
465 if (ust == NULL) 456 if (ust == NULL)
@@ -520,6 +511,9 @@ static int __init uwire_probe(struct platform_device *pdev)
520 511
521 uwire_write_reg(UWIRE_SR3, 1); 512 uwire_write_reg(UWIRE_SR3, 1);
522 513
514 /* the spi->mode bits understood by this driver: */
515 master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
516
523 master->bus_num = 2; /* "official" */ 517 master->bus_num = 2; /* "official" */
524 master->num_chipselect = 4; 518 master->num_chipselect = 4;
525 master->setup = uwire_setup; 519 master->setup = uwire_setup;