diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:49:55 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:49:55 +0200 |
| commit | 84dfcb4b318463cd4883b6a19937824f49aee564 (patch) | |
| tree | 56a96898bff3a2bd3a65abb28a8c018d28db85e8 /drivers/of | |
| parent | powerpc: Delete unused prom_strtoul and prom_memparse (diff) | |
| parent | powerpc/83xx: Add DS1339 RTC support for MPC8349E-mITX boards .dts (diff) | |
| download | linux-84dfcb4b318463cd4883b6a19937824f49aee564.tar.xz linux-84dfcb4b318463cd4883b6a19937824f49aee564.zip | |
Merge commit 'kumar/kumar-for-2.6.28'
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_spi.c | 2 |
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) 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); |