Merge tag 'pinctrl-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[~andy/linux] / include / linux / mfd / palmas.h

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 2891f7cd902e106ee1d56f6809200cb6f781b47a..37e48c9577914b6de786ce20b9009c5f2a998f46 100644 (file)
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -160,7 +160,8 @@ enum palmas_regulators {
        PALMAS_REG_SMPS7,
        PALMAS_REG_SMPS8,
        PALMAS_REG_SMPS9,
-       PALMAS_REG_SMPS10,
+       PALMAS_REG_SMPS10_OUT2,
+       PALMAS_REG_SMPS10_OUT1,
        /* LDO regulators */
        PALMAS_REG_LDO1,
        PALMAS_REG_LDO2,
@@ -355,9 +356,9 @@ struct palmas_pmic {
        int smps123;
        int smps457;
 
-       int range[PALMAS_REG_SMPS10];
-       unsigned int ramp_delay[PALMAS_REG_SMPS10];
-       unsigned int current_reg_mode[PALMAS_REG_SMPS10];
+       int range[PALMAS_REG_SMPS10_OUT1];
+       unsigned int ramp_delay[PALMAS_REG_SMPS10_OUT1];
+       unsigned int current_reg_mode[PALMAS_REG_SMPS10_OUT1];
 };
 
 struct palmas_resource {
@@ -371,17 +372,15 @@ struct palmas_usb {
 
        struct extcon_dev edev;
 
-       /* used to set vbus, in atomic path */
-       struct work_struct set_vbus_work;
-
        int id_otg_irq;
        int id_irq;
        int vbus_otg_irq;
        int vbus_irq;
 
-       int vbus_enable;
-
        enum palmas_usb_state linkstat;
+       int wakeup;
+       bool enable_vbus_detection;
+       bool enable_id_detection;
 };
 
 #define comparator_to_palmas(x) container_of((x), struct palmas_usb, comparator)