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

usb: typec: tcpci: use GENMASK() for TCPC_MSG_HDR_INFO_REV 



Convert field TCPC_MSG_HDR_INFO_REV from register TCPC_MSG_HDR_INFO to
using GENMASK() and FIELD_PREP() so as to keep using a similar approach
for all fields.

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-6-0ec1f41f4263@linaro.org


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

drivers/usb/typec/tcpm/tcpci.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static int tcpci_set_roles(struct tcpc_dev *tcpc, bool attached, 
	unsigned int reg;

	int ret;



	reg = PD_REV20 << TCPC_MSG_HDR_INFO_REV_SHIFT;

	reg = FIELD_PREP(TCPC_MSG_HDR_INFO_REV, PD_REV20);

	if (role == TYPEC_SOURCE)

		reg |= TCPC_MSG_HDR_INFO_PWR_ROLE;

	if (data == TYPEC_HOST)

include/linux/usb/tcpci.h

+1 −2
Original line number Diff line number Diff line
@@ -129,9 +129,8 @@ 


#define TCPC_MSG_HDR_INFO		0x2e

#define TCPC_MSG_HDR_INFO_DATA_ROLE	BIT(3)

#define TCPC_MSG_HDR_INFO_REV		GENMASK(2, 1)

#define TCPC_MSG_HDR_INFO_PWR_ROLE	BIT(0)

#define TCPC_MSG_HDR_INFO_REV_SHIFT	1

#define TCPC_MSG_HDR_INFO_REV_MASK	0x3



#define TCPC_RX_DETECT			0x2f

#define TCPC_RX_DETECT_HARD_RESET	BIT(5)