aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 00:49:55 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 00:49:55 -0400
commit84dfcb4b318463cd4883b6a19937824f49aee564 (patch)
tree56a96898bff3a2bd3a65abb28a8c018d28db85e8 /drivers/of
parent34d81f858a3bdec568bf08c4feb997ccd3d40b94 (diff)
parent672e806ee103c1709bcdcafabe65ba9c8ab5a63d (diff)
Merge commit 'kumar/kumar-for-2.6.28'
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/of_spi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
index b01eec026f68..bed0ed6dcdc1 100644
--- 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)
61 spi->mode |= SPI_CPHA; 61 spi->mode |= SPI_CPHA;
62 if (of_find_property(nc, "spi-cpol", NULL)) 62 if (of_find_property(nc, "spi-cpol", NULL))
63 spi->mode |= SPI_CPOL; 63 spi->mode |= SPI_CPOL;
64 if (of_find_property(nc, "spi-cs-high", NULL))
65 spi->mode |= SPI_CS_HIGH;
64 66
65 /* Device speed */ 67 /* Device speed */
66 prop = of_get_property(nc, "spi-max-frequency", &len); 68 prop = of_get_property(nc, "spi-max-frequency", &len);