diff options
| author | Philip Chen <philipchen@google.com> | 2018-05-08 19:36:48 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-09 22:36:26 -0700 |
| commit | aa6382fe6666b08a3a285dead36858138a8ab490 (patch) | |
| tree | 1c515f8e56c687adc348609d6acc8535659b45ed | |
| parent | 221ecb5dd0a6bce5ab82c21c36964557d7b3744b (diff) | |
| download | chrome-ec-aa6382fe6666b08a3a285dead36858138a8ab490.tar.gz | |
charger/rt946x: Fix macro coding style
BUG=none
BRANCH=scarlet
TEST=buildall
Change-Id: I2f1d11156b7d14dbe1865cd7807c5bc1b769255e
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1050988
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: David Schneider <dnschneid@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | driver/charger/rt946x.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/driver/charger/rt946x.h b/driver/charger/rt946x.h index ab0c9fa7d4..aff1c99928 100644 --- a/driver/charger/rt946x.h +++ b/driver/charger/rt946x.h @@ -151,14 +151,14 @@ #define RT946X_MASK_SHIP_MODE (1 << RT946X_SHIFT_SHIP_MODE) #define RT946X_MASK_TE (1 << RT946X_SHIFT_TE) -#define RT946X_MASK_ILMTSEL 0x0C +#define RT946X_MASK_ILMTSEL (0x3 << RT946X_SHIFT_ILMTSEL) #define RT946X_MASK_CHG_EN (1 << RT946X_SHIFT_CHG_EN) /* ========== CHGCTRL3 0x03 ============ */ #define RT946X_SHIFT_AICR 2 #define RT946X_SHIFT_ILIMEN 0 -#define RT946X_MASK_AICR 0xFC +#define RT946X_MASK_AICR (0x3F << RT946X_SHIFT_AICR) #define RT946X_MASK_ILIMEN (1 << RT946X_SHIFT_ILIMEN) /* ========== CHGCTRL4 0x04 ============ */ @@ -174,24 +174,24 @@ /* ========== CHGCTRL6 0x06 ============ */ #define RT946X_SHIFT_MIVR 1 -#define RT946X_MASK_MIVR 0xFE +#define RT946X_MASK_MIVR (0x7F << RT946X_SHIFT_MIVR) /* ========== CHGCTRL7 0x07 ============ */ #define RT946X_SHIFT_ICHG 2 -#define RT946X_MASK_ICHG 0xFC +#define RT946X_MASK_ICHG (0x3F << RT946X_SHIFT_ICHG) /* ========== CHGCTRL8 0x08 ============ */ #define RT946X_SHIFT_VPREC 4 #define RT946X_SHIFT_IPREC 0 -#define RT946X_MASK_VPREC 0xF0 -#define RT946X_MASK_IPREC 0x0F +#define RT946X_MASK_VPREC (0xF << RT946X_SHIFT_VPREC) +#define RT946X_MASK_IPREC (0xF << RT946X_SHIFT_IPREC) /* ========== CHGCTRL9 0x09 ============ */ #define RT946X_SHIFT_IEOC 4 -#define RT946X_MASK_IEOC 0xF0 +#define RT946X_MASK_IEOC (0xF << RT946X_SHIFT_IEOC) /* ========== CHGCTRL10 0x0A ============ */ #define RT946X_SHIFT_BOOST_CURRENT 0 @@ -224,7 +224,7 @@ #define RT946X_SHIFT_ADC_IN_SEL 4 #define RT946X_SHIFT_ADC_START 0 -#define RT946X_MASK_ADC_IN_SEL 0xF0 +#define RT946X_MASK_ADC_IN_SEL (0xF << RT946X_SHIFT_ADC_IN_SEL) #define RT946X_MASK_ADC_START (1 << RT946X_SHIFT_ADC_START) /* ========== CHGDPDM1 0x12 ============ */ @@ -246,8 +246,8 @@ #define RT946X_SHIFT_IRCMP_RES 3 #define RT946X_SHIFT_IRCMP_VCLAMP 0 -#define RT946X_MASK_IRCMP_RES 0x38 -#define RT946X_MASK_IRCMP_VCLAMP 0x07 +#define RT946X_MASK_IRCMP_RES (0x7 << RT946X_SHIFT_IRCMP_RES) +#define RT946X_MASK_IRCMP_VCLAMP (0x7 << RT946X_SHIFT_IRCMP_VCLAMP) /* ========== DEVICE_ID 0x40 ============ */ #define RT946X_MASK_VENDOR_ID 0xF0 @@ -257,7 +257,7 @@ #define RT946X_SHIFT_CHG_STAT 6 #define RT946X_SHIFT_ADC_STAT 0 -#define RT946X_MASK_CHG_STAT 0xC0 +#define RT946X_MASK_CHG_STAT (0x3 << RT946X_SHIFT_CHG_STAT) #define RT946X_MASK_ADC_STAT (1 << RT946X_SHIFT_ADC_STAT) /* ========== CHGNTC 0x43 ============ */ @@ -281,10 +281,13 @@ #define RT946X_MASK_CHG_VBATOV (1 << RT946X_SHIFT_CHG_VBATOV) #define RT946X_MASK_CHG_VBUSOV (1 << RT946X_SHIFT_CHG_VBUSOV) -/* ========== DPDMIRQ 0x66 ============ */ +/* ========== DPDMIRQ 0x56 ============ */ #ifdef CONFIG_CHARGER_RT9467 -#define RT946X_MASK_DPDMIRQ_ATTACH 0x01 -#define RT946X_MASK_DPDMIRQ_DETACH 0x02 +#define RT946X_SHIFT_DPDMIRQ_DETACH 1 +#define RT946X_SHIFT_DPDMIRQ_ATTACH 0 + +#define RT946X_MASK_DPDMIRQ_DETACH (1 << RT946X_SHIFT_DPDMIRQ_DETACH) +#define RT946X_MASK_DPDMIRQ_ATTACH (1 << RT946X_SHIFT_DPDMIRQ_ATTACH) #endif /* ========== Variant-specific configuration ============ */ |