[PATCH v4 1/4] omap4 hsmmc: Adding card detect support for MMC1

Varadarajan, Charulatha charu at ti.com
Fri Oct 1 10:41:37 EDT 2010


 
<<snip>>

> >> >>>> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> >> >>>> index 6de90bf..e64894c 100644
> >> >>>> --- a/include/linux/i2c/twl.h
> >> >>>> +++ b/include/linux/i2c/twl.h
> >> >>>> @@ -141,6 +141,16 @@
> >> >>>>  #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)
> >> >>>> +
> >> >>>> +
> >> >>>>
> >> >>>>  #define TWL4030_CLASS_ID               0x4030
> >> >>>>  #define TWL6030_CLASS_ID               0x6030
> >> >>>> @@ -173,6 +183,27 @@ int twl_i2c_read(u8 mod_no, u8 
> *value, u8 reg, unsigned num_bytes);
> >> >>>>  int twl6030_interrupt_unmask(u8 bit_mask, u8 offset);
> >> >>>>  int twl6030_interrupt_mask(u8 bit_mask, u8 offset);
> >> >>>>
> >> >>>> +/* Card detect Configuration for MMC1 Controller on OMAP4 */
> >> >>>> +#ifdef CONFIG_TWL4030_CORE
> >> >>>> +int twl6030_mmc_card_detect_config(void);
> >> >>>> +#else
> >> >>>> +static inline int twl6030_mmc_card_detect_config(void)
> >> >>>> +{
> >> >>>> +       pr_debug("twl6030_mmc_card_detect_config not 
> supported\n");
> >> >>>> +       return 0;
> >> >>>> +}
> >> >>>> +#endif
> >> >>>> +
> >> >>>> +/* MMC1 Controller on OMAP4 uses Phoenix irq for 
> Card detect */
> >> >>>> +#ifdef CONFIG_TWL4030_CORE
> >> >>>> +int twl6030_mmc_card_detect(struct device *dev, int slot);
> >> >>>> +#else
> >> >>>> +static inline int twl6030_mmc_card_detect(struct 
> device *dev, int slot)
> >> >>>> +{
> >> >>>> +       pr_debug("Call back twl6030_mmc_card_detect 
> not supported\n");

Use dev_dbg() instead of pr_debug... 
Same comment applies across this patch series whereever pr_err/pr_debug
APIs are used.

> >> >>>> +       return -EIO;
> >> >>>> +}
> >> >>>> +#endif

<<snip>>


More information about the linux-arm-kernel mailing list