[U-Boot] [PATCH] spi: atmel: check the GPIO validity before using cs_gpios
Wenyou Yang
wenyou.yang at atmel.com
Tue Jan 24 07:51:28 CET 2017
Before using the cs_gpio, check if the GPIO is valid.
Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
---
drivers/spi/atmel_spi.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 7649114231..8d29f7c4eb 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -296,7 +296,8 @@ static void atmel_spi_cs_activate(struct udevice *dev)
struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
u32 cs = slave_plat->cs;
- dm_gpio_set_value(&priv->cs_gpios[cs], 0);
+ if (dm_gpio_is_valid(&priv->cs_gpios[cs]))
+ dm_gpio_set_value(&priv->cs_gpios[cs], 0);
}
static void atmel_spi_cs_deactivate(struct udevice *dev)
@@ -306,7 +307,8 @@ static void atmel_spi_cs_deactivate(struct udevice *dev)
struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
u32 cs = slave_plat->cs;
- dm_gpio_set_value(&priv->cs_gpios[cs], 1);
+ if (dm_gpio_is_valid(&priv->cs_gpios[cs]))
+ dm_gpio_set_value(&priv->cs_gpios[cs], 1);
}
static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen,
@@ -473,8 +475,11 @@ static int atmel_spi_probe(struct udevice *bus)
}
for(i = 0; i < ARRAY_SIZE(priv->cs_gpios); i++) {
- dm_gpio_set_dir_flags(&priv->cs_gpios[i],
- GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
+ if (dm_gpio_is_valid(&priv->cs_gpios[i])) {
+ dm_gpio_set_dir_flags(&priv->cs_gpios[i],
+ GPIOD_IS_OUT |
+ GPIOD_IS_OUT_ACTIVE);
+ }
}
writel(ATMEL_SPI_CR_SWRST, &bus_plat->regs->cr);
--
2.11.0
More information about the U-Boot
mailing list