diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 08:58:31 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-06 08:58:31 -0500 |
| commit | a34fc82e234255b657e62c3ce0c12e9439a59e80 (patch) | |
| tree | a305e3c3c271bb5d6cd7980780f39938a02e32ce /include/linux/platform_data | |
| parent | 161b96c383c442f4d7dabbb8500a5fbd551b344d (diff) | |
| parent | 227c4ce6eac9fe6566d9718546a0e31b5b4633cd (diff) | |
Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
Pull in the changes Mark has queued up for SPI
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/spi-omap2-mcspi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h index a357eb26bd2..a65572d5321 100644 --- a/include/linux/platform_data/spi-omap2-mcspi.h +++ b/include/linux/platform_data/spi-omap2-mcspi.h | |||
| @@ -7,9 +7,13 @@ | |||
| 7 | 7 | ||
| 8 | #define OMAP4_MCSPI_REG_OFFSET 0x100 | 8 | #define OMAP4_MCSPI_REG_OFFSET 0x100 |
| 9 | 9 | ||
| 10 | #define MCSPI_PINDIR_D0_IN_D1_OUT 0 | ||
| 11 | #define MCSPI_PINDIR_D0_OUT_D1_IN 1 | ||
| 12 | |||
| 10 | struct omap2_mcspi_platform_config { | 13 | struct omap2_mcspi_platform_config { |
| 11 | unsigned short num_cs; | 14 | unsigned short num_cs; |
| 12 | unsigned int regs_offset; | 15 | unsigned int regs_offset; |
| 16 | unsigned int pin_dir:1; | ||
| 13 | }; | 17 | }; |
| 14 | 18 | ||
| 15 | struct omap2_mcspi_dev_attr { | 19 | struct omap2_mcspi_dev_attr { |