diff options
Diffstat (limited to 'drivers/spi/atmel_spi.c')
-rw-r--r-- | drivers/spi/atmel_spi.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index 9f9ff3af72d7..f5b3fdbb1e27 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
@@ -530,9 +530,6 @@ atmel_spi_interrupt(int irq, void *dev_id) | |||
530 | return ret; | 530 | return ret; |
531 | } | 531 | } |
532 | 532 | ||
533 | /* the spi->mode bits understood by this driver: */ | ||
534 | #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH) | ||
535 | |||
536 | static int atmel_spi_setup(struct spi_device *spi) | 533 | static int atmel_spi_setup(struct spi_device *spi) |
537 | { | 534 | { |
538 | struct atmel_spi *as; | 535 | struct atmel_spi *as; |
@@ -562,12 +559,6 @@ static int atmel_spi_setup(struct spi_device *spi) | |||
562 | return -EINVAL; | 559 | return -EINVAL; |
563 | } | 560 | } |
564 | 561 | ||
565 | if (spi->mode & ~MODEBITS) { | ||
566 | dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n", | ||
567 | spi->mode & ~MODEBITS); | ||
568 | return -EINVAL; | ||
569 | } | ||
570 | |||
571 | /* see notes above re chipselect */ | 562 | /* see notes above re chipselect */ |
572 | if (!atmel_spi_is_v2() | 563 | if (!atmel_spi_is_v2() |
573 | && spi->chip_select == 0 | 564 | && spi->chip_select == 0 |
@@ -773,6 +764,9 @@ static int __init atmel_spi_probe(struct platform_device *pdev) | |||
773 | if (!master) | 764 | if (!master) |
774 | goto out_free; | 765 | goto out_free; |
775 | 766 | ||
767 | /* the spi->mode bits understood by this driver: */ | ||
768 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; | ||
769 | |||
776 | master->bus_num = pdev->id; | 770 | master->bus_num = pdev->id; |
777 | master->num_chipselect = 4; | 771 | master->num_chipselect = 4; |
778 | master->setup = atmel_spi_setup; | 772 | master->setup = atmel_spi_setup; |