Merge tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[cascardo/linux.git] / include / linux / platform_data / lp8727.h

diff --git a/include/linux/platform_data/lp8727.h b/include/linux/platform_data/lp8727.h
index ea98c61..47128a5 100644 (file)
--- a/include/linux/platform_data/lp8727.h
+++ b/include/linux/platform_data/lp8727.h
@@ -13,32 +13,32 @@
 #define _LP8727_H
 
 enum lp8727_eoc_level {
-       EOC_5P,
-       EOC_10P,
-       EOC_16P,
-       EOC_20P,
-       EOC_25P,
-       EOC_33P,
-       EOC_50P,
+       LP8727_EOC_5P,
+       LP8727_EOC_10P,
+       LP8727_EOC_16P,
+       LP8727_EOC_20P,
+       LP8727_EOC_25P,
+       LP8727_EOC_33P,
+       LP8727_EOC_50P,
 };
 
 enum lp8727_ichg {
-       ICHG_90mA,
-       ICHG_100mA,
-       ICHG_400mA,
-       ICHG_450mA,
-       ICHG_500mA,
-       ICHG_600mA,
-       ICHG_700mA,
-       ICHG_800mA,
-       ICHG_900mA,
-       ICHG_1000mA,
+       LP8727_ICHG_90mA,
+       LP8727_ICHG_100mA,
+       LP8727_ICHG_400mA,
+       LP8727_ICHG_450mA,
+       LP8727_ICHG_500mA,
+       LP8727_ICHG_600mA,
+       LP8727_ICHG_700mA,
+       LP8727_ICHG_800mA,
+       LP8727_ICHG_900mA,
+       LP8727_ICHG_1000mA,
 };
 
 /**
  * struct lp8727_chg_param
  * @eoc_level : end of charge level setting
- * @ichg : charging current
+ * @ichg      : charging current
  */
 struct lp8727_chg_param {
        enum lp8727_eoc_level eoc_level;
@@ -47,19 +47,22 @@ struct lp8727_chg_param {
 
 /**
  * struct lp8727_platform_data
- * @get_batt_present : check battery status - exists or not
- * @get_batt_level : get battery voltage (mV)
+ * @get_batt_present  : check battery status - exists or not
+ * @get_batt_level    : get battery voltage (mV)
  * @get_batt_capacity : get battery capacity (%)
- * @get_batt_temp : get battery temperature
- * @ac, @usb : charging parameters each charger type
+ * @get_batt_temp     : get battery temperature
+ * @ac                : charging parameters for AC type charger
+ * @usb               : charging parameters for USB type charger
+ * @debounce_msec     : interrupt debounce time
  */
 struct lp8727_platform_data {
        u8 (*get_batt_present)(void);
        u16 (*get_batt_level)(void);
        u8 (*get_batt_capacity)(void);
        u8 (*get_batt_temp)(void);
-       struct lp8727_chg_param ac;
-       struct lp8727_chg_param usb;
+       struct lp8727_chg_param *ac;
+       struct lp8727_chg_param *usb;
+       unsigned int debounce_msec;
 };
 
 #endif