Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / mfd / palmas.h

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index a58c579..ecddc51 100644 (file)
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -217,6 +217,7 @@ struct palmas_clk_platform_data {
 };
 
 struct palmas_platform_data {
+       int irq_flags;
        int gpio_base;
 
        /* bit value to be loaded to the POWER_CTRL register */
@@ -327,6 +328,7 @@ struct palmas_pmic {
 
        int range[PALMAS_REG_SMPS10];
        unsigned int ramp_delay[PALMAS_REG_SMPS10];
+       unsigned int current_reg_mode[PALMAS_REG_SMPS10];
 };
 
 struct palmas_resource {