aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-12-06 13:58:31 +0000
committerGrant Likely <grant.likely@secretlab.ca>2012-12-06 13:58:31 +0000
commita34fc82e234255b657e62c3ce0c12e9439a59e80 (patch)
treea305e3c3c271bb5d6cd7980780f39938a02e32ce /include/linux/platform_data
parentspi/clps711x: New SPI master driver (diff)
parentspi: omap2-mcspi: remove duplicate inclusion of linux/err.h (diff)
downloadlinux-dev-a34fc82e234255b657e62c3ce0c12e9439a59e80.tar.xz
linux-dev-a34fc82e234255b657e62c3ce0c12e9439a59e80.zip
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.h4
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 a357eb26bd25..a65572d53211 100644
--- a/include/linux/platform_data/spi-omap2-mcspi.h
+++ b/include/linux/platform_data/spi-omap2-mcspi.h
@@ -7,9 +7,13 @@
#define OMAP4_MCSPI_REG_OFFSET 0x100
+#define MCSPI_PINDIR_D0_IN_D1_OUT 0
+#define MCSPI_PINDIR_D0_OUT_D1_IN 1
+
struct omap2_mcspi_platform_config {
unsigned short num_cs;
unsigned int regs_offset;
+ unsigned int pin_dir:1;
};
struct omap2_mcspi_dev_attr {