diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 07:30:13 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 07:30:13 -0500 |
| commit | f305a0a8d7fcd1a600bd0b727cd8137ed223f721 (patch) | |
| tree | 982681a7e3c643096b65b9626ae993597155979d /include/linux/platform_data | |
| parent | 766ed70447e0a9cfb23d068a4a929e18e54b0022 (diff) | |
| parent | d560040f7d6fbe0a2990b8f6edca1815e19e72f5 (diff) | |
Merge branch 'broonie/spi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
Minor features and bug fixes for PXA, OMAP and GPIO deivce drivers and a
cosmetic change to the bitbang driver.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/spi-omap2-mcspi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h index a65572d53211..c100456eab17 100644 --- a/include/linux/platform_data/spi-omap2-mcspi.h +++ b/include/linux/platform_data/spi-omap2-mcspi.h | |||
| @@ -22,6 +22,9 @@ struct omap2_mcspi_dev_attr { | |||
| 22 | 22 | ||
| 23 | struct omap2_mcspi_device_config { | 23 | struct omap2_mcspi_device_config { |
| 24 | unsigned turbo_mode:1; | 24 | unsigned turbo_mode:1; |
| 25 | |||
| 26 | /* toggle chip select after every word */ | ||
| 27 | unsigned cs_per_word:1; | ||
| 25 | }; | 28 | }; |
| 26 | 29 | ||
| 27 | #endif | 30 | #endif |