Some gpios used for cs-gpios may not be configured for output by
default. In these cases gpio_set_value() won't have any effect
and so the chip select line won't toggle. Request the cs-gpios
and set them to output direction once we know if the chip select
is default high or default low.
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Cc: Richard Genoud <richard.genoud@xxxxxxxxx>
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
---
I wonder if we should request the gpios when the master controller
probes or when a spi device is added? We only know what the default
value should be when the spi device is added. On the other hand,
we should probably fail probe if the gpio controller isn't ready when
the spi master controller probes.
Also, is it better to convert this over to the gpiod interfaces?
drivers/spi/spi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 074f55f5d5ec..00f6365b3f87 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -431,8 +431,10 @@ int spi_add_device(struct spi_device *spi)
goto done;
}
- if (master->cs_gpios)
+ if (master->cs_gpios) {
spi->cs_gpio = master->cs_gpios[spi->chip_select];
+ gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
+ }
/* Drivers may modify this initial i/o setup, but will
* normally rely on the device being setup. Devices
@@ -1512,8 +1514,11 @@ static int of_spi_register_master(struct spi_master *master)
for (i = 0; i < master->num_chipselect; i++)
cs[i] = -ENOENT;
- for (i = 0; i < nb; i++)
+ for (i = 0; i < nb; i++) {
cs[i] = of_get_named_gpio(np, "cs-gpios", i);
+ devm_gpio_request(&master->dev, cs[i], "spi-cs");
+ }
+
return 0;
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
