Commit fc64f1ce authored by André Draszik's avatar André Draszik Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarAndré Draszik <andre.draszik@linaro.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-13-0ec1f41f4263@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cb7e20b

drivers/usb/typec/tcpm/maxim_contaminant.c

+4 −3
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s 
	int ret;



	/* Channel & scale select */

	ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK,

				 channel << ADC_CHANNEL_OFFSET);

	ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL,

				 FIELD_PREP(ADCINSEL, channel));

	if (ret < 0)

		return ret;
@@ -96,7 +96,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_chip *chip, enum fladc_s 
	if (ret < 0)

		return ret;



	ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, 0);

	ret = regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL,

				 FIELD_PREP(ADCINSEL, 0));

	if (ret < 0)

		return ret;

drivers/usb/typec/tcpm/tcpci_maxim.h

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
#define WTRCYCLE_4_8_S                          1



#define TCPC_VENDOR_ADC_CTRL1                   0x91

#define ADCINSEL_MASK                           GENMASK(7, 5)

#define ADC_CHANNEL_OFFSET                      5

#define ADCINSEL                                GENMASK(7, 5)

#define ADCEN                                   BIT(0)



enum contamiant_state {