diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:49:55 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:49:55 +1100 |
| commit | 84dfcb4b318463cd4883b6a19937824f49aee564 (patch) | |
| tree | 56a96898bff3a2bd3a65abb28a8c018d28db85e8 /drivers | |
| parent | 34d81f858a3bdec568bf08c4feb997ccd3d40b94 (diff) | |
| parent | 672e806ee103c1709bcdcafabe65ba9c8ab5a63d (diff) | |
Merge commit 'kumar/kumar-for-2.6.28'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 1 | ||||
| -rw-r--r-- | drivers/of/of_spi.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index 8164de1f4d72..228f75723063 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -423,7 +423,6 @@ static const struct i2c_adapter cpm_ops = { .owner = THIS_MODULE, .name = "i2c-cpm", .algo = &cpm_i2c_algo, - .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, }; static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm) 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); |