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

usb: typec: tcpci: use GENMASK() for TCPC_TRANSMIT register fields 



Convert all fields from register TCPC_TRANSMIT 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-7-0ec1f41f4263@linaro.org


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

drivers/usb/typec/tcpm/tcpci.c

+5 −2
Original line number Diff line number Diff line
@@ -607,8 +607,11 @@ static int tcpci_pd_transmit(struct tcpc_dev *tcpc, enum tcpm_transmit_type type 
	}



	/* nRetryCount is 3 in PD2.0 spec where 2 in PD3.0 spec */

	reg = ((negotiated_rev > PD_REV20 ? PD_RETRY_COUNT_3_0_OR_HIGHER : PD_RETRY_COUNT_DEFAULT)

	       << TCPC_TRANSMIT_RETRY_SHIFT) | (type << TCPC_TRANSMIT_TYPE_SHIFT);

	reg = FIELD_PREP(TCPC_TRANSMIT_RETRY,

			 (negotiated_rev > PD_REV20

			  ? PD_RETRY_COUNT_3_0_OR_HIGHER

			  : PD_RETRY_COUNT_DEFAULT));

	reg |= FIELD_PREP(TCPC_TRANSMIT_TYPE, type);

	ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg);

	if (ret < 0)

		return ret;

include/linux/usb/tcpci.h

+2 −4
Original line number Diff line number Diff line
@@ -148,10 +148,8 @@ 
#define TCPC_RX_DATA			0x34 /* through 0x4f */



#define TCPC_TRANSMIT			0x50

#define TCPC_TRANSMIT_RETRY_SHIFT	4

#define TCPC_TRANSMIT_RETRY_MASK	0x3

#define TCPC_TRANSMIT_TYPE_SHIFT	0

#define TCPC_TRANSMIT_TYPE_MASK		0x7

#define TCPC_TRANSMIT_RETRY		GENMASK(5, 4)

#define TCPC_TRANSMIT_TYPE		GENMASK(2, 0)



#define TCPC_TX_BYTE_CNT		0x51

#define TCPC_TX_HDR			0x52