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

Nicolas Ferre nicolas.ferre at atmel.com
Wed Jan 27 08:48:32 PST 2016


From: Cyrille Pitchen <cyrille.pitchen at atmel.com>

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.

Signed-off-by: Cyrille Pitchen <cyrille.pitchen at atmel.com>
[nicolas.ferre at atmel.com: extract from ml discussion]
Reported-by: Mans Rullgard <mans at mansr.com>
Fixes: 4820303480a1 ("spi: atmel: add support for the internal chip-select of the spi controller")
Cc: <stable at vger.kernel.org> # 4.2+
Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>
---
 drivers/spi/spi-atmel.c | 1 +
 1 file changed, 1 insertion(+)

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;
-- 
2.1.3




More information about the linux-arm-kernel mailing list