diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2019-03-11 15:57:52 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:42:55 -0700 |
| commit | bb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch) | |
| tree | f6ada087f62246c3a9547e649ac8846b0ed6d5ab /driver/charger/sy21612.h | |
| parent | 0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff) | |
| download | chrome-ec-bb266fc26fc05d4ab22de6ad7bce5b477c9f9140.tar.gz | |
common: replace 1 << digits, with BIT(digits)
Requested for linux integration, use BIT instead of 1 <<
First step replace bit operation with operand containing only digits.
Fix an error in motion_lid try to set bit 31 of a signed integer.
BUG=None
BRANCH=None
TEST=compile
Change-Id: Ie843611f2f68e241f0f40d4067f7ade726951d29
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1518659
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'driver/charger/sy21612.h')
| -rw-r--r-- | driver/charger/sy21612.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/driver/charger/sy21612.h b/driver/charger/sy21612.h index 9d531a1ee2..d685406fcf 100644 --- a/driver/charger/sy21612.h +++ b/driver/charger/sy21612.h @@ -41,25 +41,25 @@ enum sy21612_vbus_adj { }; #define SY21612_CTRL1 0x00 -#define SY21612_CTRL1_REG_EN (1 << 7) +#define SY21612_CTRL1_REG_EN BIT(7) #define SY21612_CTRL1_LOW_BAT_MASK (7 << 4) #define SY21612_CTRL1_LOW_BAT_10_2V (0 << 4) -#define SY21612_CTRL1_LOW_BAT_10_7V (1 << 4) +#define SY21612_CTRL1_LOW_BAT_10_7V BIT(4) #define SY21612_CTRL1_LOW_BAT_11_2V (2 << 4) #define SY21612_CTRL1_LOW_BAT_11_7V (3 << 4) #define SY21612_CTRL1_LOW_BAT_22_0V (4 << 4) #define SY21612_CTRL1_LOW_BAT_22_5V (5 << 4) #define SY21612_CTRL1_LOW_BAT_23_0V (6 << 4) #define SY21612_CTRL1_LOW_BAT_23_5V (7 << 4) -#define SY21612_CTRL1_ADC_EN (1 << 3) -#define SY21612_CTRL1_ADC_AUTO_MODE (1 << 2) -#define SY21612_CTRL1_VBUS_NDISCHG (1 << 1) +#define SY21612_CTRL1_ADC_EN BIT(3) +#define SY21612_CTRL1_ADC_AUTO_MODE BIT(2) +#define SY21612_CTRL1_VBUS_NDISCHG BIT(1) #define SY21612_CTRL2 0x01 #define SY21612_CTRL2_FREQ_MASK (3 << 6) #define SY21612_CTRL2_FREQ_SHIFT 6 #define SY21612_CTRL2_FREQ_250K (0 << 6) -#define SY21612_CTRL2_FREQ_500K (1 << 6) +#define SY21612_CTRL2_FREQ_500K BIT(6) #define SY21612_CTRL2_FREQ_750K (2 << 6) #define SY21612_CTRL2_FREQ_1M (3 << 6) #define SY21612_CTRL2_VBUS_MASK (7 << 3) @@ -83,7 +83,7 @@ enum sy21612_vbus_adj { #define SY21612_PROT1 0x02 #define SY21612_PROT1_I_THRESH_MASK (7 << 5) #define SY21612_PROT1_I_THRESH_18MV (0 << 5) -#define SY21612_PROT1_I_THRESH_22MV (1 << 5) +#define SY21612_PROT1_I_THRESH_22MV BIT(5) #define SY21612_PROT1_I_THRESH_27MV (2 << 5) #define SY21612_PROT1_I_THRESH_31MV (3 << 5) #define SY21612_PROT1_I_THRESH_36MV (4 << 5) @@ -92,12 +92,12 @@ enum sy21612_vbus_adj { #define SY21612_PROT1_I_THRESH_64MV (7 << 5) #define SY21612_PROT1_OVP_THRESH_MASK (3 << 3) #define SY21612_PROT1_OVP_THRESH_110 (0 << 3) -#define SY21612_PROT1_OVP_THRESH_115 (1 << 3) +#define SY21612_PROT1_OVP_THRESH_115 BIT(3) #define SY21612_PROT1_OVP_THRESH_120 (2 << 3) #define SY21612_PROT1_OVP_THRESH_125 (3 << 3) #define SY21612_PROT1_UVP_THRESH_MASK (3 << 1) #define SY21612_PROT1_UVP_THRESH_50 (0 << 1) -#define SY21612_PROT1_UVP_THRESH_60 (1 << 1) +#define SY21612_PROT1_UVP_THRESH_60 BIT(1) #define SY21612_PROT1_UVP_THRESH_70 (2 << 1) #define SY21612_PROT1_UVP_THRESH_80 (3 << 1) @@ -106,22 +106,22 @@ enum sy21612_vbus_adj { #define SY21612_PROT2_I_LIMIT_6A (0 << 6) #define SY21612_PROT2_I_LIMIT_8A (2 << 6) #define SY21612_PROT2_I_LIMIT_10A (3 << 6) -#define SY21612_PROT2_OCP_AUTORECOVER (1 << 5) -#define SY21612_PROT2_UVP_AUTORECOVER (1 << 4) -#define SY21612_PROT2_OTP_AUTORECOVER (1 << 3) -#define SY21612_PROT2_SINK_MODE (1 << 2) +#define SY21612_PROT2_OCP_AUTORECOVER BIT(5) +#define SY21612_PROT2_UVP_AUTORECOVER BIT(4) +#define SY21612_PROT2_OTP_AUTORECOVER BIT(3) +#define SY21612_PROT2_SINK_MODE BIT(2) #define SY21612_STATE 0x04 -#define SY21612_STATE_POWER_GOOD (1 << 7) -#define SY21612_STATE_VBAT_LT_VBUS (1 << 6) -#define SY21612_STATE_VBAT_LOW (1 << 5) +#define SY21612_STATE_POWER_GOOD BIT(7) +#define SY21612_STATE_VBAT_LT_VBUS BIT(6) +#define SY21612_STATE_VBAT_LOW BIT(5) #define SY21612_INT 0x05 -#define SY21612_INT_ADC_READY (1 << 7) -#define SY21612_INT_VBUS_OCP (1 << 6) -#define SY21612_INT_INDUCTOR_OCP (1 << 5) -#define SY21612_INT_UVP (1 << 4) -#define SY21612_INT_OTP (1 << 3) +#define SY21612_INT_ADC_READY BIT(7) +#define SY21612_INT_VBUS_OCP BIT(6) +#define SY21612_INT_INDUCTOR_OCP BIT(5) +#define SY21612_INT_UVP BIT(4) +#define SY21612_INT_OTP BIT(3) /* Battery voltage range: 0 ~ 25V */ #define SY21612_VBAT_VOLT 0x06 |