mfd: ab8500-core: APE Interrupts are not cleared

[mirror_ubuntu-bionic-kernel.git] / drivers / mfd / ab8500-core.c

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 7c84ced2e01b44e2de6e2991ebae0e7a388ba246..baaf2ed8095b68fe48c31495323239d3ba922fdc 100644 (file)
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -95,6 +95,7 @@
 #define AB8500_IT_MASK22_REG           0x55
 #define AB8500_IT_MASK23_REG           0x56
 #define AB8500_IT_MASK24_REG           0x57
+#define AB8500_IT_MASK25_REG           0x58
 
 /*
  * latch hierarchy registers
@@ -111,6 +112,13 @@
 
 #define AB8500_TURN_ON_STATUS          0x00
 
+#define AB8500_CH_USBCH_STAT1_REG      0x02
+#define VBUS_DET_DBNC100               0x02
+#define VBUS_DET_DBNC1                 0x01
+
+static DEFINE_SPINLOCK(on_stat_lock);
+static u8 turn_on_stat_mask = 0xFF;
+static u8 turn_on_stat_set;
 static bool no_bm; /* No battery management */
 module_param(no_bm, bool, S_IRUGO);
 
@@ -130,9 +138,9 @@ static const int ab8500_irq_regoffset[AB8500_NUM_IRQ_REGS] = {
        0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21,
 };
 
-/* AB9540 support */
+/* AB9540 / AB8505 support */
 static const int ab9540_irq_regoffset[AB9540_NUM_IRQ_REGS] = {
-       0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24,
+       0, 1, 2, 3, 4, 6, 7, 8, 9, 11, 18, 19, 20, 21, 12, 13, 24, 5, 22, 23
 };
 
 static const char ab8500_version_str[][7] = {
@@ -1171,6 +1179,15 @@ static ssize_t show_switch_off_status(struct device *dev,
        return sprintf(buf, "%#x\n", value);
 }
 
+/* use mask and set to override the register turn_on_stat value */
+void ab8500_override_turn_on_stat(u8 mask, u8 set)
+{
+       spin_lock(&on_stat_lock);
+       turn_on_stat_mask = mask;
+       turn_on_stat_set = set;
+       spin_unlock(&on_stat_lock);
+}
+
 /*
  * ab8500 has turned on due to (TURN_ON_STATUS):
  * 0x01 PORnVbat
@@ -1194,6 +1211,20 @@ static ssize_t show_turn_on_status(struct device *dev,
                AB8500_TURN_ON_STATUS, &value);
        if (ret < 0)
                return ret;
+
+       /*
+        * In L9540, turn_on_status register is not updated correctly if
+        * the device is rebooted with AC/USB charger connected. Due to
+        * this, the device boots android instead of entering into charge
+        * only mode. Read the AC/USB status register to detect the charger
+        * presence and update the turn on status manually.
+        */
+       if (is_ab9540(ab8500)) {
+               spin_lock(&on_stat_lock);
+               value = (value & turn_on_stat_mask) | turn_on_stat_set;
+               spin_unlock(&on_stat_lock);
+       }
+
        return sprintf(buf, "%#x\n", value);
 }
 
@@ -1399,6 +1430,15 @@ static int ab8500_probe(struct platform_device *pdev)
 
        if (plat && plat->init)
                plat->init(ab8500);
+       if (is_ab9540(ab8500)) {
+               ret = get_register_interruptible(ab8500, AB8500_CHARGER,
+                       AB8500_CH_USBCH_STAT1_REG, &value);
+               if (ret < 0)
+                       return ret;
+               if ((value & VBUS_DET_DBNC1) && (value & VBUS_DET_DBNC100))
+                       ab8500_override_turn_on_stat(~AB8500_POW_KEY_1_ON,
+                                                    AB8500_VBUS_DET);
+       }
 
        /* Clear and mask all interrupts */
        for (i = 0; i < ab8500->mask_size; i++) {