diff options
| author | Kishore Kadiyala <kishore.kadiyala@ti.com> | 2010-07-09 20:15:11 +0530 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2010-07-20 10:47:30 +0200 |
| commit | a837f0c5689db931193046635324172eee1fd8f7 (patch) | |
| tree | 5382548005018cfe718888bd9885efe3eaf91196 /include | |
| parent | c3f20971644066f0fc0f98f44bb15b4f451eb413 (diff) | |
omap4:hsmmc: Remove Card detect feature
Based on open source comments removing card detect
feature which uses Card detect type flag.
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c/twl.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index d105f46e2c73..0754e1e91c05 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -145,15 +145,6 @@ #define TWL6030_CHARGER_CTRL_INT_MASK 0x10 #define TWL6030_CHARGER_FAULT_INT_MASK 0x60 -#define TWL6030_MMCCTRL 0xEE -#define VMMC_AUTO_OFF (0x1 << 3) -#define SW_FC (0x1 << 2) -#define STS_MMC 0x1 - -#define TWL6030_CFG_INPUT_PUPD3 0xF2 -#define MMC_PU (0x1 << 3) -#define MMC_PD (0x1 << 2) - /* TWL6030 vibrator registers */ #define TWL6030_VIBCTRL 0x9B #define TWL6030_VIBMODE 0x9C @@ -203,44 +194,6 @@ int twl6030_register_notifier(struct notifier_block *nb, int twl6030_unregister_notifier(struct notifier_block *nb, unsigned int events); -/* MMC1 Controller on OMAP4 uses Phoenix Irq for Card detect */ -int twl6030_mmc_card_detect(int host_id, int slot); - -/* Configuring Card Detect for MMC1 */ -static inline int omap4_hsmmc1_card_detect_config(void) -{ - int res = -1; - u8 reg_val = 0; - - /* Unmasking the Card detect Interrupt line for MMC1 from Phoenix */ - if (twl_class_is_6030()) { - twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK, - REG_INT_MSK_LINE_B); - twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK, - REG_INT_MSK_STS_B); - } - - /* - * Intially Configuring MMC_CTRL for receving interrupts & - * Card status on TWL6030 for MMC1 - */ - res = twl_i2c_read_u8(TWL6030_MODULE_ID0, ®_val, TWL6030_MMCCTRL); - if (res < 0) - return res; - reg_val &= ~VMMC_AUTO_OFF; - reg_val |= SW_FC; - twl_i2c_write_u8(TWL6030_MODULE_ID0, reg_val, TWL6030_MMCCTRL); - - res = twl_i2c_read_u8(TWL6030_MODULE_ID0, ®_val, - TWL6030_CFG_INPUT_PUPD3); - if (res < 0) - return res; - reg_val &= ~(MMC_PU | MMC_PD); - twl_i2c_write_u8(TWL6030_MODULE_ID0, reg_val, - TWL6030_CFG_INPUT_PUPD3); - return res; -} - /*----------------------------------------------------------------------*/ /* |