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

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

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index e6090d88e91dbbdfdc7551c78a1fe384d4a5143c..37e48c9577914b6de786ce20b9009c5f2a998f46 100644 (file)
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -448,7 +448,7 @@ enum usb_irq_events {
 #define PALMAS_DVFS_BASE                                       0x180
 #define PALMAS_PMU_CONTROL_BASE                                        0x1A0
 #define PALMAS_RESOURCE_BASE                                   0x1D4
-#define PALMAS_PU_PD_OD_BASE                                   0x1F4
+#define PALMAS_PU_PD_OD_BASE                                   0x1F0
 #define PALMAS_LED_BASE                                                0x200
 #define PALMAS_INTERRUPT_BASE                                  0x210
 #define PALMAS_USB_OTG_BASE                                    0x250
@@ -1733,16 +1733,20 @@ enum usb_irq_events {
 #define PALMAS_REGEN3_CTRL_MODE_ACTIVE_SHIFT                   0
 
 /* Registers for function PAD_CONTROL */
-#define PALMAS_PU_PD_INPUT_CTRL1                               0x0
-#define PALMAS_PU_PD_INPUT_CTRL2                               0x1
-#define PALMAS_PU_PD_INPUT_CTRL3                               0x2
-#define PALMAS_OD_OUTPUT_CTRL                                  0x4
-#define PALMAS_POLARITY_CTRL                                   0x5
-#define PALMAS_PRIMARY_SECONDARY_PAD1                          0x6
-#define PALMAS_PRIMARY_SECONDARY_PAD2                          0x7
-#define PALMAS_I2C_SPI                                         0x8
-#define PALMAS_PU_PD_INPUT_CTRL4                               0x9
-#define PALMAS_PRIMARY_SECONDARY_PAD3                          0xA
+#define PALMAS_OD_OUTPUT_CTRL2                                 0x2
+#define PALMAS_POLARITY_CTRL2                                  0x3
+#define PALMAS_PU_PD_INPUT_CTRL1                               0x4
+#define PALMAS_PU_PD_INPUT_CTRL2                               0x5
+#define PALMAS_PU_PD_INPUT_CTRL3                               0x6
+#define PALMAS_PU_PD_INPUT_CTRL5                               0x7
+#define PALMAS_OD_OUTPUT_CTRL                                  0x8
+#define PALMAS_POLARITY_CTRL                                   0x9
+#define PALMAS_PRIMARY_SECONDARY_PAD1                          0xA
+#define PALMAS_PRIMARY_SECONDARY_PAD2                          0xB
+#define PALMAS_I2C_SPI                                         0xC
+#define PALMAS_PU_PD_INPUT_CTRL4                               0xD
+#define PALMAS_PRIMARY_SECONDARY_PAD3                          0xE
+#define PALMAS_PRIMARY_SECONDARY_PAD4                          0xF
 
 /* Bit definitions for PU_PD_INPUT_CTRL1 */
 #define PALMAS_PU_PD_INPUT_CTRL1_RESET_IN_PD                   0x40
@@ -2500,6 +2504,15 @@ enum usb_irq_events {
 #define PALMAS_PU_PD_GPIO_CTRL1                                        0x6
 #define PALMAS_PU_PD_GPIO_CTRL2                                        0x7
 #define PALMAS_OD_OUTPUT_GPIO_CTRL                             0x8
+#define PALMAS_GPIO_DATA_IN2                                   0x9
+#define PALMAS_GPIO_DATA_DIR2                                  0x0A
+#define PALMAS_GPIO_DATA_OUT2                                  0x0B
+#define PALMAS_GPIO_DEBOUNCE_EN2                               0x0C
+#define PALMAS_GPIO_CLEAR_DATA_OUT2                            0x0D
+#define PALMAS_GPIO_SET_DATA_OUT2                              0x0E
+#define PALMAS_PU_PD_GPIO_CTRL3                                        0x0F
+#define PALMAS_PU_PD_GPIO_CTRL4                                        0x10
+#define PALMAS_OD_OUTPUT_GPIO_CTRL2                            0x11
 
 /* Bit definitions for GPIO_DATA_IN */
 #define PALMAS_GPIO_DATA_IN_GPIO_7_IN                          0x80