[PATCH 4.4 284/342] spi: atmel: fix gpio chip-select in case of non-DT platform

From: Greg Kroah-Hartman
Date: Tue Mar 01 2016 - 19:19:03 EST


4.4-stable review patch. If anyone has any objections, please let me know.

------------------

From: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxx>

commit 70f340df24518d36eeaefb6652d492f250115c19 upstream.

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@xxxxxxxxx>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@xxxxxxxxx>
[nicolas.ferre@xxxxxxxxx: extract from ml discussion]
Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
Tested-by: Mans Rullgard <mans@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/spi/spi-atmel.c | 1 +
1 file changed, 1 insertion(+)

--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1571,6 +1571,7 @@ static int atmel_spi_probe(struct platfo

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;