summaryrefslogtreecommitdiff
path: root/driver/temp_sensor
diff options
context:
space:
mode:
authorGwendal Grignou <gwendal@chromium.org>2019-03-11 15:57:52 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-03-26 04:42:55 -0700
commitbb266fc26fc05d4ab22de6ad7bce5b477c9f9140 (patch)
treef6ada087f62246c3a9547e649ac8846b0ed6d5ab /driver/temp_sensor
parent0bfc511527cf2aebfa163c63a1d028419ca0b0c3 (diff)
downloadchrome-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/temp_sensor')
-rw-r--r--driver/temp_sensor/adt7481.h52
-rw-r--r--driver/temp_sensor/bd99992gw.h18
-rw-r--r--driver/temp_sensor/g78x.h50
-rw-r--r--driver/temp_sensor/tmp006.c8
-rw-r--r--driver/temp_sensor/tmp112.c2
-rw-r--r--driver/temp_sensor/tmp411.h22
-rw-r--r--driver/temp_sensor/tmp432.h26
-rw-r--r--driver/temp_sensor/tmp468.h2
8 files changed, 90 insertions, 90 deletions
diff --git a/driver/temp_sensor/adt7481.h b/driver/temp_sensor/adt7481.h
index 11e9856b9c..45da88560e 100644
--- a/driver/temp_sensor/adt7481.h
+++ b/driver/temp_sensor/adt7481.h
@@ -55,18 +55,18 @@
#define ADT7481_MANUFACTURER_ID 0x3e
/* Config1 register bits */
-#define ADT7481_CONFIG1_REMOTE1_ALERT_MASK (1 << 0)
-#define ADT7481_CONFIG1_REMOTE2_ALERT_MASK (1 << 1)
-#define ADT7481_CONFIG1_TEMP_RANGE (1 << 2)
-#define ADT7481_CONFIG1_SEL_REMOTE2 (1 << 3)
+#define ADT7481_CONFIG1_REMOTE1_ALERT_MASK BIT(0)
+#define ADT7481_CONFIG1_REMOTE2_ALERT_MASK BIT(1)
+#define ADT7481_CONFIG1_TEMP_RANGE BIT(2)
+#define ADT7481_CONFIG1_SEL_REMOTE2 BIT(3)
/* ADT7481_CONFIG1_MODE bit is use to enable THERM mode */
-#define ADT7481_CONFIG1_MODE (1 << 5)
-#define ADT7481_CONFIG1_RUN_L (1 << 6)
+#define ADT7481_CONFIG1_MODE BIT(5)
+#define ADT7481_CONFIG1_RUN_L BIT(6)
/* mask all alerts on ALERT# pin */
-#define ADT7481_CONFIG1_ALERT_MASK_L (1 << 7)
+#define ADT7481_CONFIG1_ALERT_MASK_L BIT(7)
/* Config2 register bits */
-#define ADT7481_CONFIG2_LOCK (1 << 7)
+#define ADT7481_CONFIG2_LOCK BIT(7)
/* Conversion Rate/Channel Select Register */
#define ADT7481_CONV_RATE_MASK (0x0f)
@@ -85,28 +85,28 @@
#define ADT7481_CONV_RATE_73MS_AVE (0x0b)
#define ADT7481_CONV_CHAN_SELECT_MASK (0x30)
#define ADT7481_CONV_CHAN_SEL_ROUND_ROBIN (0 << 4)
-#define ADT7481_CONV_CHAN_SEL_LOCAL (1 << 4)
+#define ADT7481_CONV_CHAN_SEL_LOCAL BIT(4)
#define ADT7481_CONV_CHAN_SEL_REMOTE1 (2 << 4)
#define ADT7481_CONV_CHAN_SEL_REMOTE2 (3 << 4)
-#define ADT7481_CONV_AVERAGING_L (1 << 7)
+#define ADT7481_CONV_AVERAGING_L BIT(7)
/* Status1 register bits */
-#define ADT7481_STATUS1_LOCAL_THERM_ALARM (1 << 0)
-#define ADT7481_STATUS1_REMOTE1_THERM_ALARM (1 << 1)
-#define ADT7481_STATUS1_REMOTE1_OPEN (1 << 2)
-#define ADT7481_STATUS1_REMOTE1_LOW_ALARM (1 << 3)
-#define ADT7481_STATUS1_REMOTE1_HIGH_ALARM (1 << 4)
-#define ADT7481_STATUS1_LOCAL_LOW_ALARM (1 << 5)
-#define ADT7481_STATUS1_LOCAL_HIGH_ALARM (1 << 6)
-#define ADT7481_STATUS1_BUSY (1 << 7)
+#define ADT7481_STATUS1_LOCAL_THERM_ALARM BIT(0)
+#define ADT7481_STATUS1_REMOTE1_THERM_ALARM BIT(1)
+#define ADT7481_STATUS1_REMOTE1_OPEN BIT(2)
+#define ADT7481_STATUS1_REMOTE1_LOW_ALARM BIT(3)
+#define ADT7481_STATUS1_REMOTE1_HIGH_ALARM BIT(4)
+#define ADT7481_STATUS1_LOCAL_LOW_ALARM BIT(5)
+#define ADT7481_STATUS1_LOCAL_HIGH_ALARM BIT(6)
+#define ADT7481_STATUS1_BUSY BIT(7)
/* Status2 register bits */
-#define ADT7481_STATUS2_ALERT (1 << 0)
-#define ADT7481_STATUS2_REMOTE2_THERM_ALARM (1 << 1)
-#define ADT7481_STATUS2_REMOTE2_OPEN (1 << 2)
-#define ADT7481_STATUS2_REMOTE2_LOW_ALARM (1 << 3)
-#define ADT7481_STATUS2_REMOTE2_HIGH_ALARM (1 << 4)
+#define ADT7481_STATUS2_ALERT BIT(0)
+#define ADT7481_STATUS2_REMOTE2_THERM_ALARM BIT(1)
+#define ADT7481_STATUS2_REMOTE2_OPEN BIT(2)
+#define ADT7481_STATUS2_REMOTE2_LOW_ALARM BIT(3)
+#define ADT7481_STATUS2_REMOTE2_HIGH_ALARM BIT(4)
/* Consecutive Alert register */
#define ADT7481_CONSEC_MASK (0xf)
@@ -114,9 +114,9 @@
#define ADT7481_CONSEC_2 (0x2)
#define ADT7481_CONSEC_3 (0x6)
#define ADT7481_CONSEC_4 (0xe)
-#define ADT7481_CONSEC_EN_SCL_TIMEOUT (1 << 5)
-#define ADT7481_CONSEC_EN_SDA_TIMEOUT (1 << 6)
-#define ADT7481_CONSEC_MASK_LOCAL_ALERT (1 << 7)
+#define ADT7481_CONSEC_EN_SCL_TIMEOUT BIT(5)
+#define ADT7481_CONSEC_EN_SDA_TIMEOUT BIT(6)
+#define ADT7481_CONSEC_MASK_LOCAL_ALERT BIT(7)
/* Limits */
diff --git a/driver/temp_sensor/bd99992gw.h b/driver/temp_sensor/bd99992gw.h
index 27a9943de1..7db3990e07 100644
--- a/driver/temp_sensor/bd99992gw.h
+++ b/driver/temp_sensor/bd99992gw.h
@@ -26,26 +26,26 @@ enum bd99992gw_adc_channel {
/* Registers */
#define BD99992GW_REG_IRQLVL1 0x02
-#define BD99992GW_IRQLVL1_ADC (1 << 1) /* ADC IRQ asserted */
+#define BD99992GW_IRQLVL1_ADC BIT(1) /* ADC IRQ asserted */
#define BD99992GW_REG_ADC1INT 0x03
-#define BD99992GW_ADC1INT_RND (1 << 0) /* RR cycle completed */
+#define BD99992GW_ADC1INT_RND BIT(0) /* RR cycle completed */
#define BD99992GW_REG_MADC1INT 0x0a
-#define BD99992GW_MADC1INT_RND (1 << 0) /* RR cycle mask */
+#define BD99992GW_MADC1INT_RND BIT(0) /* RR cycle mask */
#define BD99992GW_REG_IRQLVL1MSK 0x13
-#define BD99992GW_IRQLVL1MSK_MADC (1 << 1) /* ADC IRQ mask */
+#define BD99992GW_IRQLVL1MSK_MADC BIT(1) /* ADC IRQ mask */
#define BD99992GW_REG_ADC1CNTL1 0x80
#define BD99992GW_ADC1CNTL1_SLP27MS (0x6 << 3) /* 27ms between pass */
#define BD99992GW_ADC1CNTL1_NOLOOP (0x7 << 3) /* Single loop pass only */
-#define BD99992GW_ADC1CNTL1_ADPAUSE (1 << 2) /* ADC pause */
-#define BD99992GW_ADC1CNTL1_ADSTRT (1 << 1) /* ADC start */
-#define BD99992GW_ADC1CNTL1_ADEN (1 << 0) /* ADC enable */
+#define BD99992GW_ADC1CNTL1_ADPAUSE BIT(2) /* ADC pause */
+#define BD99992GW_ADC1CNTL1_ADSTRT BIT(1) /* ADC start */
+#define BD99992GW_ADC1CNTL1_ADEN BIT(0) /* ADC enable */
#define BD99992GW_REG_ADC1CNTL2 0x81
-#define BD99992GW_ADC1CNTL2_ADCTHERM (1 << 0) /* Enable ADC sequencing */
+#define BD99992GW_ADC1CNTL2_ADCTHERM BIT(0) /* Enable ADC sequencing */
/* ADC1 Pointer file regs - assign to proper bd99992gw_adc_channel */
#define BD99992GW_ADC_POINTER_REG_COUNT 8
@@ -57,7 +57,7 @@ enum bd99992gw_adc_channel {
#define BD99992GW_REG_ADC1ADDR5 0x87
#define BD99992GW_REG_ADC1ADDR6 0x88
#define BD99992GW_REG_ADC1ADDR7 0x89
-#define BD99992GW_ADC1ADDR_STOP (1 << 3) /* Last conversion channel */
+#define BD99992GW_ADC1ADDR_STOP BIT(3) /* Last conversion channel */
/* Result registers */
#define BD99992GW_REG_ADC1DATA0L 0x95
diff --git a/driver/temp_sensor/g78x.h b/driver/temp_sensor/g78x.h
index 8fa78ffa83..2ef75f1da9 100644
--- a/driver/temp_sensor/g78x.h
+++ b/driver/temp_sensor/g78x.h
@@ -49,18 +49,18 @@
#define G78X_DEVICE_ID 0xFF
/* Config register bits */
-#define G78X_CONFIGURATION_STANDBY (1 << 6)
-#define G78X_CONFIGURATION_ALERT_MASK (1 << 7)
+#define G78X_CONFIGURATION_STANDBY BIT(6)
+#define G78X_CONFIGURATION_ALERT_MASK BIT(7)
/* Status register bits */
-#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM (1 << 0)
-#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM (1 << 1)
-#define G78X_STATUS_REMOTE1_TEMP_FAULT (1 << 2)
-#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM (1 << 3)
-#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM (1 << 4)
-#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM (1 << 5)
-#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM (1 << 6)
-#define G78X_STATUS_BUSY (1 << 7)
+#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(0)
+#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(1)
+#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(2)
+#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(3)
+#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(4)
+#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5)
+#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6)
+#define G78X_STATUS_BUSY BIT(7)
#elif defined(CONFIG_TEMP_SENSOR_G782)
/* G782 register */
@@ -105,25 +105,25 @@
#define G78X_DEVICE_ID 0xFF
/* Config register bits */
-#define G78X_CONFIGURATION_REMOTE2_DIS (1 << 5)
-#define G78X_CONFIGURATION_STANDBY (1 << 6)
-#define G78X_CONFIGURATION_ALERT_MASK (1 << 7)
+#define G78X_CONFIGURATION_REMOTE2_DIS BIT(5)
+#define G78X_CONFIGURATION_STANDBY BIT(6)
+#define G78X_CONFIGURATION_ALERT_MASK BIT(7)
/* Status register bits */
-#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM (1 << 0)
-#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM (1 << 1)
-#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM (1 << 2)
-#define G78X_STATUS_REMOTE2_TEMP_THERM_ALARM (1 << 3)
-#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM (1 << 4)
-#define G78X_STATUS_REMOTE2_TEMP_FAULT (1 << 5)
-#define G78X_STATUS_REMOTE1_TEMP_FAULT (1 << 6)
-#define G78X_STATUS_BUSY (1 << 7)
+#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(0)
+#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(1)
+#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(2)
+#define G78X_STATUS_REMOTE2_TEMP_THERM_ALARM BIT(3)
+#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(4)
+#define G78X_STATUS_REMOTE2_TEMP_FAULT BIT(5)
+#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(6)
+#define G78X_STATUS_BUSY BIT(7)
/* Status1 register bits */
-#define G78X_STATUS_REMOTE2_TEMP_LOW_ALARM (1 << 4)
-#define G78X_STATUS_REMOTE2_TEMP_HIGH_ALARM (1 << 5)
-#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM (1 << 6)
-#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM (1 << 7)
+#define G78X_STATUS_REMOTE2_TEMP_LOW_ALARM BIT(4)
+#define G78X_STATUS_REMOTE2_TEMP_HIGH_ALARM BIT(5)
+#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(6)
+#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(7)
#endif
/**
diff --git a/driver/temp_sensor/tmp006.c b/driver/temp_sensor/tmp006.c
index 67b31dfa98..fd81647c41 100644
--- a/driver/temp_sensor/tmp006.c
+++ b/driver/temp_sensor/tmp006.c
@@ -30,10 +30,10 @@
#define ALGORITHM_PARAMS 12
/* Flags for tdata->fail */
-#define FAIL_INIT (1 << 0) /* Just initialized */
-#define FAIL_POWER (1 << 1) /* Sensor not powered */
-#define FAIL_I2C (1 << 2) /* I2C communication error */
-#define FAIL_NOT_READY (1 << 3) /* Data not ready */
+#define FAIL_INIT BIT(0) /* Just initialized */
+#define FAIL_POWER BIT(1) /* Sensor not powered */
+#define FAIL_I2C BIT(2) /* I2C communication error */
+#define FAIL_NOT_READY BIT(3) /* Data not ready */
/* State and conversion factors to track for each sensor */
struct tmp006_data_t {
diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c
index f567e2433c..32ffc1ced6 100644
--- a/driver/temp_sensor/tmp112.c
+++ b/driver/temp_sensor/tmp112.c
@@ -74,7 +74,7 @@ static void tmp112_init(void)
set_mask = (3 << 5);
/* not oneshot mode */
- clr_mask = (1 << 7);
+ clr_mask = BIT(7);
raw_read16(TMP112_REG_CONF, &tmp);
raw_write16(TMP112_REG_CONF, (tmp & ~clr_mask) | set_mask);
diff --git a/driver/temp_sensor/tmp411.h b/driver/temp_sensor/tmp411.h
index a0ad95a5d8..52635e810f 100644
--- a/driver/temp_sensor/tmp411.h
+++ b/driver/temp_sensor/tmp411.h
@@ -67,20 +67,20 @@
#define TMP411d_DEVICE_ID_VAL 0x12
/* Config register bits */
-#define TMP411_CONFIG1_TEMP_RANGE (1 << 2)
+#define TMP411_CONFIG1_TEMP_RANGE BIT(2)
/* TMP411_CONFIG1_MODE bit is use to enable THERM mode */
-#define TMP411_CONFIG1_MODE (1 << 5)
-#define TMP411_CONFIG1_RUN_L (1 << 6)
-#define TMP411_CONFIG1_ALERT_MASK_L (1 << 7)
+#define TMP411_CONFIG1_MODE BIT(5)
+#define TMP411_CONFIG1_RUN_L BIT(6)
+#define TMP411_CONFIG1_ALERT_MASK_L BIT(7)
/* Status register bits */
-#define TMP411_STATUS_TEMP_THERM_ALARM (1 << 1)
-#define TMP411_STATUS_OPEN (1 << 2)
-#define TMP411_STATUS_TEMP_LOW_ALARM (1 << 3)
-#define TMP411_STATUS_TEMP_HIGH_ALARM (1 << 4)
-#define TMP411_STATUS_LOCAL_TEMP_LOW_ALARM (1 << 5)
-#define TMP411_STATUS_LOCAL_TEMP_HIGH_ALARM (1 << 6)
-#define TMP411_STATUS_BUSY (1 << 7)
+#define TMP411_STATUS_TEMP_THERM_ALARM BIT(1)
+#define TMP411_STATUS_OPEN BIT(2)
+#define TMP411_STATUS_TEMP_LOW_ALARM BIT(3)
+#define TMP411_STATUS_TEMP_HIGH_ALARM BIT(4)
+#define TMP411_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5)
+#define TMP411_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6)
+#define TMP411_STATUS_BUSY BIT(7)
/* Limits */
#define TMP411_HYSTERESIS_HIGH_LIMIT 255
diff --git a/driver/temp_sensor/tmp432.h b/driver/temp_sensor/tmp432.h
index 2d8d2515dc..f9bd03dd32 100644
--- a/driver/temp_sensor/tmp432.h
+++ b/driver/temp_sensor/tmp432.h
@@ -67,22 +67,22 @@
#define TMP432_MANUFACTURER_ID 0xfe
/* Config register bits */
-#define TMP432_CONFIG1_TEMP_RANGE (1 << 2)
+#define TMP432_CONFIG1_TEMP_RANGE BIT(2)
/* TMP432_CONFIG1_MODE bit is use to enable THERM mode */
-#define TMP432_CONFIG1_MODE (1 << 5)
-#define TMP432_CONFIG1_RUN_L (1 << 6)
-#define TMP432_CONFIG1_ALERT_MASK_L (1 << 7)
-#define TMP432_CONFIG2_RESISTANCE_CORRECTION (1 << 2)
-#define TMP432_CONFIG2_LOCAL_ENABLE (1 << 3)
-#define TMP432_CONFIG2_REMOTE1_ENABLE (1 << 4)
-#define TMP432_CONFIG2_REMOTE2_ENABLE (1 << 5)
+#define TMP432_CONFIG1_MODE BIT(5)
+#define TMP432_CONFIG1_RUN_L BIT(6)
+#define TMP432_CONFIG1_ALERT_MASK_L BIT(7)
+#define TMP432_CONFIG2_RESISTANCE_CORRECTION BIT(2)
+#define TMP432_CONFIG2_LOCAL_ENABLE BIT(3)
+#define TMP432_CONFIG2_REMOTE1_ENABLE BIT(4)
+#define TMP432_CONFIG2_REMOTE2_ENABLE BIT(5)
/* Status register bits */
-#define TMP432_STATUS_TEMP_THERM_ALARM (1 << 1)
-#define TMP432_STATUS_OPEN (1 << 2)
-#define TMP432_STATUS_TEMP_LOW_ALARM (1 << 3)
-#define TMP432_STATUS_TEMP_HIGH_ALARM (1 << 4)
-#define TMP432_STATUS_BUSY (1 << 7)
+#define TMP432_STATUS_TEMP_THERM_ALARM BIT(1)
+#define TMP432_STATUS_OPEN BIT(2)
+#define TMP432_STATUS_TEMP_LOW_ALARM BIT(3)
+#define TMP432_STATUS_TEMP_HIGH_ALARM BIT(4)
+#define TMP432_STATUS_BUSY BIT(7)
/* Limintaions */
#define TMP432_HYSTERESIS_HIGH_LIMIT 255
diff --git a/driver/temp_sensor/tmp468.h b/driver/temp_sensor/tmp468.h
index ec528d0dcc..4b7f6bb814 100644
--- a/driver/temp_sensor/tmp468.h
+++ b/driver/temp_sensor/tmp468.h
@@ -77,7 +77,7 @@
#define TMP468_DEVICE_ID 0xfd
#define TMP468_MANUFACTURER_ID 0xfe
-#define TMP468_SHUTDOWN (1 << 5)
+#define TMP468_SHUTDOWN BIT(5)
enum tmp468_channel_id {
TMP468_CHANNEL_LOCAL,