Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom...

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

diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 896b5e47f16ec5a9ab0ef962de083e85ddbb0d19..9970337ff0412ca255b89a72564f3ebb96da966e 100644 (file)
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -6,7 +6,7 @@
  *
  * ABX500 core access functions.
  * The abx500 interface is used for the Analog Baseband chip
- * ab3100, ab3550, ab5500, and ab8500.
+ * ab3100, ab5500, and ab8500.
  *
  * Author: Mattias Wallin <mattias.wallin@stericsson.com>
  * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
@@ -29,17 +29,16 @@
 #define AB3100_P1G     0xc6
 #define AB3100_R2A     0xc7
 #define AB3100_R2B     0xc8
-#define AB3550_P1A     0x10
 #define AB5500_1_0     0x20
-#define AB5500_2_0     0x21
-#define AB5500_2_1     0x22
+#define AB5500_1_1     0x21
+#define AB5500_2_0     0x24
 
 /* AB8500 CIDs*/
-#define AB8500_CUTEARLY        0x00
 #define AB8500_CUT1P0  0x10
 #define AB8500_CUT1P1  0x11
 #define AB8500_CUT2P0  0x20
 #define AB8500_CUT3P0  0x30
+#define AB8500_CUT3P3  0x33
 
 /*
  * AB3100, EVENTA1, A2 and A3 event register flags
@@ -143,39 +142,6 @@ int ab3100_event_register(struct ab3100 *ab3100,
 int ab3100_event_unregister(struct ab3100 *ab3100,
                            struct notifier_block *nb);
 
-/* AB3550, STR register flags */
-#define AB3550_STR_ONSWA                               (0x01)
-#define AB3550_STR_ONSWB                               (0x02)
-#define AB3550_STR_ONSWC                               (0x04)
-#define AB3550_STR_DCIO                                        (0x08)
-#define AB3550_STR_BOOT_MODE                           (0x10)
-#define AB3550_STR_SIM_OFF                             (0x20)
-#define AB3550_STR_BATT_REMOVAL                                (0x40)
-#define AB3550_STR_VBUS                                        (0x80)
-
-/* Interrupt mask registers */
-#define AB3550_IMR1 0x29
-#define AB3550_IMR2 0x2a
-#define AB3550_IMR3 0x2b
-#define AB3550_IMR4 0x2c
-#define AB3550_IMR5 0x2d
-
-enum ab3550_devid {
-       AB3550_DEVID_ADC,
-       AB3550_DEVID_DAC,
-       AB3550_DEVID_LEDS,
-       AB3550_DEVID_POWER,
-       AB3550_DEVID_REGULATORS,
-       AB3550_DEVID_SIM,
-       AB3550_DEVID_UART,
-       AB3550_DEVID_RTC,
-       AB3550_DEVID_CHARGER,
-       AB3550_DEVID_FUELGAUGE,
-       AB3550_DEVID_VIBRATOR,
-       AB3550_DEVID_CODEC,
-       AB3550_NUM_DEVICES,
-};
-
 /**
  * struct abx500_init_setting
  * Initial value of the registers for driver to use during setup.
@@ -186,18 +152,6 @@ struct abx500_init_settings {
        u8 setting;
 };
 
-/**
- * struct ab3550_platform_data
- * Data supplied to initialize board connections to the AB3550
- */
-struct ab3550_platform_data {
-       struct {unsigned int base; unsigned int count; } irq;
-       void *dev_data[AB3550_NUM_DEVICES];
-       size_t dev_data_sz[AB3550_NUM_DEVICES];
-       struct abx500_init_settings *init_settings;
-       unsigned int init_settings_sz;
-};
-
 int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg,
        u8 value);
 int abx500_get_register_interruptible(struct device *dev, u8 bank, u8 reg,