diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 16:20:57 +0100 |
| commit | 4581949d522f22d0d9ab710b4a7253754349f5d8 (patch) | |
| tree | 3edb2a2f8d5edcf3e3eda6fcc3a6f8a7e2b9d5f8 /drivers/spi/spi-gpio.c | |
| parent | 8bce7eb7de8b88ebbf65508fc3a74ee0de9e1727 (diff) | |
| parent | 804ae4380d1e76f5d81272b8a3b765f5e02fe46e (diff) | |
Merge remote-tracking branch 'spi/topic/bpw' into spi-next
Diffstat (limited to 'drivers/spi/spi-gpio.c')
| -rw-r--r-- | drivers/spi/spi-gpio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 0021fc4c45b..a7801a889ff 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -239,9 +239,6 @@ static int spi_gpio_setup(struct spi_device *spi) struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi); struct device_node *np = spi->master->dev.of_node; - if (spi->bits_per_word > 32) - return -EINVAL; - if (np) { /* * In DT environments, the CS GPIOs have already been @@ -446,6 +443,7 @@ static int spi_gpio_probe(struct platform_device *pdev) if (pdata) spi_gpio->pdata = *pdata; + master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 32); master->flags = master_flags; master->bus_num = pdev->id; master->num_chipselect = SPI_N_CHIPSEL; |