diff options
| author |   Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2016-01-27 17:48:32 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-01-28 23:25:54 +0100 |
| commit | 70f340df24518d36eeaefb6652d492f250115c19 (patch) | |
| tree | b6344fcd3b34d2b29b909be1ff222938fc5cc083 /drivers/spi | |
| parent | Linux 4.5-rc1 (diff) | |
| download | linux-dev-70f340df24518d36eeaefb6652d492f250115c19.tar.xz linux-dev-70f340df24518d36eeaefb6652d492f250115c19.zip | |
spi: atmel: fix gpio chip-select in case of non-DT platform
The non-DT platform that uses this driver (actually the AVR32) was taking a bad
branch for determining if the IP would use gpio for CS.
Adding the presence of DT as a condition fixes this issue.
Fixes: 4820303480a1 ("spi: atmel: add support for the internal chip-select of the spi controller")
Reported-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
[nicolas.ferre@atmel.com: extract from ml discussion]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index aebad36391c9..8feac599e9ab 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1571,6 +1571,7 @@ static int atmel_spi_probe(struct platform_device *pdev) as->use_cs_gpios = true; if (atmel_spi_is_v2(as) && + pdev->dev.of_node && !of_get_property(pdev->dev.of_node, "cs-gpios", NULL)) { as->use_cs_gpios = false; master->num_chipselect = 4; |