These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / mfd / arizona / core.h

diff --git a/kernel/include/linux/mfd/arizona/core.h b/kernel/include/linux/mfd/arizona/core.h
index 16a498f..79e607e 100644 (file)
--- a/kernel/include/linux/mfd/arizona/core.h
+++ b/kernel/include/linux/mfd/arizona/core.h
@@ -25,6 +25,8 @@ enum arizona_type {
        WM5110 = 2,
        WM8997 = 3,
        WM8280 = 4,
+       WM8998 = 5,
+       WM1814 = 6,
 };
 
 #define ARIZONA_IRQ_GP1                    0
@@ -117,6 +119,7 @@ struct arizona {
        int num_core_supplies;
        struct regulator_bulk_data core_supplies[ARIZONA_MAX_CORE_SUPPLIES];
        struct regulator *dcvdd;
+       bool has_fully_powered_off;
 
        struct arizona_pdata pdata;
 
@@ -153,9 +156,18 @@ int arizona_request_irq(struct arizona *arizona, int irq, char *name,
 void arizona_free_irq(struct arizona *arizona, int irq, void *data);
 int arizona_set_irq_wake(struct arizona *arizona, int irq, int on);
 
+#ifdef CONFIG_MFD_WM5102
 int wm5102_patch(struct arizona *arizona);
+#else
+static inline int wm5102_patch(struct arizona *arizona)
+{
+       return 0;
+}
+#endif
+
 int wm5110_patch(struct arizona *arizona);
 int wm8997_patch(struct arizona *arizona);
+int wm8998_patch(struct arizona *arizona);
 
 extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
                                     bool mandatory);