summaryrefslogtreecommitdiff
path: root/driver/charger
diff options
context:
space:
mode:
authorYilun Lin <yllin@google.com>2018-07-31 18:22:48 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-08-01 14:52:31 -0700
commit295ccc36eaa01eccb0db2079122ca12cdec55044 (patch)
treedab42723c234e67beb945bf1826dfd71ebf9e190 /driver/charger
parent347d2912e71a4e1c7f962448ac22cd2c3d3e4866 (diff)
downloadchrome-ec-295ccc36eaa01eccb0db2079122ca12cdec55044.tar.gz
charger/mt6370: Init charger IRQs.
Init all the mt6370 charger IRQs. We masked out all the other IRQs except VBUS detach/attach interrupts. Also, fix GPIO typo in CHARGER_INT_ODL, it should be GPIO_INT_FALLING. TEST=make flash_ec BOARD=kukui; check gpioget CHARGER_INT_ODL = 1 BUG=b:110241788 BRANCH=None Change-Id: I57beec78d74598d161c66f25ee149b3044d020ad Signed-off-by: Yilun Lin <yllin@google.com> Reviewed-on: https://chromium-review.googlesource.com/1157726 Commit-Ready: Yilun Lin <yllin@chromium.org> Tested-by: Yilun Lin <yllin@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'driver/charger')
-rw-r--r--driver/charger/rt946x.c16
-rw-r--r--driver/charger/rt946x.h14
2 files changed, 27 insertions, 3 deletions
diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c
index 137026d660..c299c075aa 100644
--- a/driver/charger/rt946x.c
+++ b/driver/charger/rt946x.c
@@ -113,16 +113,26 @@ enum rt946x_irq {
MT6370_IRQ_DPDMSTAT,
MT6370_IRQ_DICHGSTAT,
MT6370_IRQ_OVPCTRLSTAT,
+ MT6370_IRQ_FLEDSTAT1,
+ MT6370_IRQ_FLEDSTAT2,
+ MT6370_IRQ_BASESTAT,
+ MT6370_IRQ_LDOSTAT,
+ MT6370_IRQ_RGBSTAT,
+ MT6370_IRQ_BLSTAT,
+ MT6370_IRQ_DBSTAT,
RT946X_IRQ_COUNT,
};
static uint8_t rt946x_irqmask[RT946X_IRQ_COUNT] = {
- /* TODO(b:110241788): choose irq init */
- 0xF0, 0xF8, 0xF0, 0xF8, 0xFF, 0xE3, 0xE3, 0xF8,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFC, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
static const uint8_t rt946x_irq_maskall[RT946X_IRQ_COUNT] = {
- 0xF0, 0xF8, 0xF0, 0xF8, 0xFF, 0xE3, 0xE3, 0xF8,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
#endif
diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h
index 16ba9ff823..ff126bc079 100644
--- a/driver/charger/rt946x.h
+++ b/driver/charger/rt946x.h
@@ -146,6 +146,13 @@
#define MT6370_REG_DPDMSTAT 0xD6
#define MT6370_REG_DICHGSTAT 0xD7
#define MT6370_REG_OVPCTRLSTAT 0xD8
+#define MT6370_REG_FLEDSTAT1 0xD9
+#define MT6370_REG_FLEDSTAT2 0xDA
+#define MT6370_REG_BASESTAT 0xDB
+#define MT6370_REG_LDOSTAT 0xDC
+#define MT6370_REG_RGBSTAT 0xDD
+#define MT6370_REG_BLSTAT 0xDE
+#define MT6370_REG_DBSTAT 0xDF
/* irq mask */
#define MT6370_REG_CHGMASK1 0xE0
#define RT946X_REG_CHGSTATCCTRL MT6370_REG_CHGMASK1
@@ -157,6 +164,13 @@
#define MT6370_REG_DPDMMASK1 0xE6
#define MT6370_REG_DICHGMASK 0xE7
#define MT6370_REG_OVPCTRLMASK 0xE8
+#define MT6370_REG_FLEDMASK1 0xE9
+#define MT6370_REG_FLEDMASK2 0xEA
+#define MT6370_REG_BASEMASK 0xEB
+#define MT6370_REG_LDOMASK 0xEC
+#define MT6370_REG_RGBMASK 0xED
+#define MT6370_REG_BLMASK 0xEE
+#define MT6370_REG_DBMASK 0xEF
#else
#error "No suitable charger option defined"
#endif