summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-06-14 14:24:35 +0200
committerChris Ball <cjb@laptop.org>2012-07-21 00:02:22 -0400
commite480606ad43bb72fd82a9bd99cdcf21829a6e9c0 (patch)
tree1f41c40d38f9d75371907474c5c6b44c3c6b5aab /include/linux/mmc
parentd9adcc12860d76cf3401c6ab7c0406b15b356b7a (diff)
downloadlinux-stable-e480606ad43bb72fd82a9bd99cdcf21829a6e9c0.tar.gz
linux-stable-e480606ad43bb72fd82a9bd99cdcf21829a6e9c0.tar.bz2
linux-stable-e480606ad43bb72fd82a9bd99cdcf21829a6e9c0.zip
mmc: sh_mmcif: support generic card-detection
Extend the sh_mmcif driver to support GPIO card detection, provided by the slot function module. The original .get_cd() platform callback is also preserved for now. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/sh_mmcif.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index 05f0e3db1c12..c2f73cbb4d5c 100644
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -44,6 +44,8 @@ struct sh_mmcif_plat_data {
struct sh_mmcif_dma *dma; /* Deprecated. Instead */
unsigned int slave_id_tx; /* use embedded slave_id_[tr]x */
unsigned int slave_id_rx;
+ bool use_cd_gpio : 1;
+ unsigned int cd_gpio;
u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */
unsigned long caps;
u32 ocr;