diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2013-08-20 08:29:23 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-23 19:44:28 +0200 |
| commit | 31eb4b554db7d1f75c3083cfeca1ec4c2874da7f (patch) | |
| tree | deeb593c58742cefaf918427ae75cbf3fd5ec240 /drivers/gpio | |
| parent | 2e7f6122642773fa467ab80adc30ef20c80dbda6 (diff) | |
| download | talos-op-linux-31eb4b554db7d1f75c3083cfeca1ec4c2874da7f.tar.gz talos-op-linux-31eb4b554db7d1f75c3083cfeca1ec4c2874da7f.zip | |
gpio: max7301: Reverting "Do not force SPI speed when using OF Platform"
This patch reverts commit 047b93a35961f7a6561e6f5dcb040738f822b892 which breaks
MAX7301 GPIO driver because that commit was dependant on a rejected patch that
was implementing selection of SPI speed from the Device Tree.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-max7301.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-max7301.c b/drivers/gpio/gpio-max7301.c index 3b16ab701630..6e1c984a75d4 100644 --- a/drivers/gpio/gpio-max7301.c +++ b/drivers/gpio/gpio-max7301.c @@ -56,8 +56,7 @@ static int max7301_probe(struct spi_device *spi) int ret; /* bits_per_word cannot be configured in platform data */ - if (spi->dev.platform_data) - spi->bits_per_word = 16; + spi->bits_per_word = 16; ret = spi_setup(spi); if (ret < 0) return ret; |
