Merge tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[firefly-linux-kernel-4.4.55.git] / include / linux / mfd / max77693.h

diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
index f0b6585cd874cd0ecb917e8dccb130460bedbb40..d450f687301bd99676c8bd3284dddf8c3d42481c 100644 (file)
--- a/include/linux/mfd/max77693.h
+++ b/include/linux/mfd/max77693.h
@@ -30,7 +30,7 @@
 #ifndef __LINUX_MFD_MAX77693_H
 #define __LINUX_MFD_MAX77693_H
 
-/* MAX77686 regulator IDs */
+/* MAX77693 regulator IDs */
 enum max77693_regulators {
        MAX77693_ESAFEOUT1 = 0,
        MAX77693_ESAFEOUT2,
@@ -38,12 +38,6 @@ enum max77693_regulators {
        MAX77693_REG_MAX,
 };
 
-struct max77693_regulator_data {
-       int id;
-       struct regulator_init_data *initdata;
-       struct device_node *of_node;
-};
-
 struct max77693_reg_data {
        u8 addr;
        u8 data;
@@ -87,26 +81,9 @@ enum max77693_led_boost_mode {
        MAX77693_LED_BOOST_FIXED,
 };
 
-struct max77693_led_platform_data {
-       u32 fleds[2];
-       u32 iout_torch[2];
-       u32 iout_flash[2];
-       u32 trigger[2];
-       u32 trigger_type[2];
-       u32 num_leds;
-       u32 boost_mode;
-       u32 flash_timeout;
-       u32 boost_vout;
-       u32 low_vsys;
-};
-
 /* MAX77693 */
 
 struct max77693_platform_data {
-       /* regulator data */
-       struct max77693_regulator_data *regulators;
-       int num_regulators;
-
        /* muic data */
        struct max77693_muic_platform_data *muic_data;
        struct max77693_led_platform_data *led_data;