aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/hsmmc.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-06-09 13:09:20 -0700
committerColin Cross <ccross@android.com>2011-06-14 11:48:50 -0700
commit8792bbe29411bed946313e0dbed2ead600522827 (patch)
tree9d7c66a9fc0ac856efcc786db531076b2d668cc6 /arch/arm/mach-omap2/hsmmc.c
parentc497beb8743719a6e4f03a13aa99c5efd8faf270 (diff)
downloadkernel_samsung_tuna-8792bbe29411bed946313e0dbed2ead600522827.zip
kernel_samsung_tuna-8792bbe29411bed946313e0dbed2ead600522827.tar.gz
kernel_samsung_tuna-8792bbe29411bed946313e0dbed2ead600522827.tar.bz2
ARM: omap2: Add card_detect import
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'arch/arm/mach-omap2/hsmmc.c')
-rw-r--r--arch/arm/mach-omap2/hsmmc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 37842b6..95ea862 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -351,9 +351,12 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
mmc->slots[0].features |= HSMMC_HAS_48MHZ_MASTER_CLK;
}
- if (c->mmc_data)
+ if (c->mmc_data) {
memcpy(&mmc->slots[0].mmc_data, c->mmc_data,
sizeof(struct mmc_platform_data));
+ mmc->slots[0].card_detect =
+ (mmc_card_detect_func)c->mmc_data->status;
+ }
/*
* NOTE: MMC slots should have a Vcc regulator set up.