summaryrefslogtreecommitdiff
path: root/driver/usb_mux_ps874x.h
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/usb_mux_ps874x.h
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/usb_mux_ps874x.h')
-rw-r--r--driver/usb_mux_ps874x.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/driver/usb_mux_ps874x.h b/driver/usb_mux_ps874x.h
index e9d4c1ff36..2b98ebcb63 100644
--- a/driver/usb_mux_ps874x.h
+++ b/driver/usb_mux_ps874x.h
@@ -11,17 +11,17 @@
/* Mode register for setting mux */
#define PS874X_REG_MODE 0x00
#ifdef CONFIG_USB_MUX_PS8740
- #define PS874X_MODE_POLARITY_INVERTED (1 << 4)
- #define PS874X_MODE_USB_ENABLED (1 << 5)
- #define PS874X_MODE_DP_ENABLED (1 << 6)
- #define PS874X_MODE_POWER_DOWN (1 << 7)
+ #define PS874X_MODE_POLARITY_INVERTED BIT(4)
+ #define PS874X_MODE_USB_ENABLED BIT(5)
+ #define PS874X_MODE_DP_ENABLED BIT(6)
+ #define PS874X_MODE_POWER_DOWN BIT(7)
#elif defined(CONFIG_USB_MUX_PS8743)
- #define PS874X_MODE_POLARITY_INVERTED (1 << 2)
- #define PS874X_MODE_FLIP_PIN_ENABLED (1 << 3)
- #define PS874X_MODE_USB_ENABLED (1 << 4)
- #define PS874X_MODE_CE_USB_ENABLED (1 << 5)
- #define PS874X_MODE_DP_ENABLED (1 << 6)
- #define PS874X_MODE_CE_DP_ENABLED (1 << 7)
+ #define PS874X_MODE_POLARITY_INVERTED BIT(2)
+ #define PS874X_MODE_FLIP_PIN_ENABLED BIT(3)
+ #define PS874X_MODE_USB_ENABLED BIT(4)
+ #define PS874X_MODE_CE_USB_ENABLED BIT(5)
+ #define PS874X_MODE_DP_ENABLED BIT(6)
+ #define PS874X_MODE_CE_DP_ENABLED BIT(7)
/* To reset the state machine to default */
#define PS874X_MODE_POWER_DOWN (PS874X_MODE_CE_USB_ENABLED | \
PS874X_MODE_CE_DP_ENABLED)
@@ -29,10 +29,10 @@
/* Status register for checking mux state */
#define PS874X_REG_STATUS 0x09
-#define PS874X_STATUS_POLARITY_INVERTED (1 << 2)
-#define PS874X_STATUS_USB_ENABLED (1 << 3)
-#define PS874X_STATUS_DP_ENABLED (1 << 4)
-#define PS874X_STATUS_HPD_ASSERTED (1 << 7)
+#define PS874X_STATUS_POLARITY_INVERTED BIT(2)
+#define PS874X_STATUS_USB_ENABLED BIT(3)
+#define PS874X_STATUS_DP_ENABLED BIT(4)
+#define PS874X_STATUS_HPD_ASSERTED BIT(7)
/* Chip ID / revision registers and expected fused values */
#define PS874X_REG_REVISION_ID1 0xf0
@@ -62,7 +62,7 @@
#define PS874X_USB_EQ_TX_9_5_DB 0xc0
#define PS874X_USB_EQ_TX_7_5_DB 0xe0
#define PS874X_USB_EQ_TERM_100_OHM (0 << 2)
- #define PS874X_USB_EQ_TERM_85_OHM (1 << 2)
+ #define PS874X_USB_EQ_TERM_85_OHM BIT(2)
#elif defined(CONFIG_USB_MUX_PS8743)
#define PS874X_USB_EQ_TX_12_8_DB 0x00
#define PS874X_USB_EQ_TX_17_DB 0x20