projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'gcl/merge' into next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
of
/
of_spi.c
diff --git
a/drivers/of/of_spi.c
b/drivers/of/of_spi.c
index b01eec026f68b3f8765bd50d35070757b1795785..bed0ed6dcdc1329259c58a72e2b697bfbd72e091 100644
(file)
--- a/
drivers/of/of_spi.c
+++ b/
drivers/of/of_spi.c
@@
-61,6
+61,8
@@
void of_register_spi_devices(struct spi_master *master, struct device_node *np)
spi->mode |= SPI_CPHA;
if (of_find_property(nc, "spi-cpol", NULL))
spi->mode |= SPI_CPOL;
+ if (of_find_property(nc, "spi-cs-high", NULL))
+ spi->mode |= SPI_CS_HIGH;
/* Device speed */
prop = of_get_property(nc, "spi-max-frequency", &len);