mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 06:49:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL3 register

Browse Source 
Convert register TCPC_VENDOR_CC_CTRL3 to using GENMASK() so as to keep
using a similar approach throughout the code base and make it arguably
easier to read.

Signed-off-by: André Draszik <andre.draszik@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-12-0ec1f41f4263@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
André Draszik
2024-07-10 11:36:19 +01:00
committed by Greg Kroah-Hartman
parent 9ee70dd4f7
commit 5cb7e20bad
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/typec/tcpm/maxim_contaminant.c
View File

@@ -283,10 +283,11 @@ static int max_contaminant_enable_dry_detection(struct max_tcpci_chip *chip)
u8 temp;
int ret;
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3, CCWTRDEB_MASK | CCWTRSEL_MASK
| WTRCYCLE_MASK, CCWTRDEB_1MS << CCWTRDEB_SHIFT |
CCWTRSEL_1V << CCWTRSEL_SHIFT | WTRCYCLE_4_8_S <<
WTRCYCLE_SHIFT);
ret = regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3,
CCWTRDEB | CCWTRSEL | WTRCYCLE,
FIELD_PREP(CCWTRDEB, CCWTRDEB_1MS)
| FIELD_PREP(CCWTRSEL, CCWTRSEL_1V)
| FIELD_PREP(WTRCYCLE, WTRCYCLE_4_8_S));
if (ret < 0)
return ret;

9
drivers/usb/typec/tcpm/tcpci_maxim.h
View File

@@ -27,15 +27,12 @@
#define UA_80_SRC 3
#define TCPC_VENDOR_CC_CTRL3 0x8e
#define CCWTRDEB_MASK GENMASK(7, 6)
#define CCWTRDEB_SHIFT 6
#define CCWTRDEB GENMASK(7, 6)
#define CCWTRDEB_1MS 1
#define CCWTRSEL_MASK GENMASK(5, 3)
#define CCWTRSEL_SHIFT 3
#define CCWTRSEL GENMASK(5, 3)
#define CCWTRSEL_1V 0x4
#define CCLADDERDIS BIT(2)
#define WTRCYCLE_MASK BIT(0)
#define WTRCYCLE_SHIFT 0
#define WTRCYCLE GENMASK(0, 0)
#define WTRCYCLE_2_4_S 0
#define WTRCYCLE_4_8_S 1