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

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



Align the last remaining field TCPC_ROLE_CTRL_RP_VAL with the other
fields in the TCPC_ROLE_CTRL register by using GENMASK() and
FIELD_PREP().

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


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

drivers/usb/typec/tcpm/tcpci.c

+12 −9
Original line number Diff line number Diff line
@@ -114,17 +114,20 @@ static int tcpci_set_cc(struct tcpc_dev *tcpc, enum typec_cc_status cc) 
	case TYPEC_CC_RP_DEF:

		reg = (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP)

		       | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP)

		       | (TCPC_ROLE_CTRL_RP_VAL_DEF << TCPC_ROLE_CTRL_RP_VAL_SHIFT));

		       | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				    TCPC_ROLE_CTRL_RP_VAL_DEF));

		break;

	case TYPEC_CC_RP_1_5:

		reg = (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP)

		       | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP)

		       | (TCPC_ROLE_CTRL_RP_VAL_1_5 << TCPC_ROLE_CTRL_RP_VAL_SHIFT));

		       | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				    TCPC_ROLE_CTRL_RP_VAL_1_5));

		break;

	case TYPEC_CC_RP_3_0:

		reg = (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP)

		       | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP)

		       | (TCPC_ROLE_CTRL_RP_VAL_3_0 << TCPC_ROLE_CTRL_RP_VAL_SHIFT));

		       | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				    TCPC_ROLE_CTRL_RP_VAL_3_0));

		break;

	case TYPEC_CC_OPEN:

	default:
@@ -194,16 +197,16 @@ static int tcpci_start_toggling(struct tcpc_dev *tcpc, 
	switch (cc) {

	default:

	case TYPEC_CC_RP_DEF:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_DEF);

		break;

	case TYPEC_CC_RP_1_5:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_1_5);

		break;

	case TYPEC_CC_RP_3_0:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_3_0);

		break;

	}

drivers/usb/typec/tcpm/tcpci_rt1711h.c

+6 −6
Original line number Diff line number Diff line
@@ -232,16 +232,16 @@ static int rt1711h_start_drp_toggling(struct tcpci *tcpci, 
	switch (cc) {

	default:

	case TYPEC_CC_RP_DEF:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_DEF <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_DEF);

		break;

	case TYPEC_CC_RP_1_5:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_1_5 <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_1_5);

		break;

	case TYPEC_CC_RP_3_0:

		reg |= (TCPC_ROLE_CTRL_RP_VAL_3_0 <<

			TCPC_ROLE_CTRL_RP_VAL_SHIFT);

		reg |= FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL,

				  TCPC_ROLE_CTRL_RP_VAL_3_0);

		break;

	}

include/linux/usb/tcpci.h

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ 


#define TCPC_ROLE_CTRL			0x1a

#define TCPC_ROLE_CTRL_DRP		BIT(6)

#define TCPC_ROLE_CTRL_RP_VAL_SHIFT	4

#define TCPC_ROLE_CTRL_RP_VAL_MASK	0x3

#define TCPC_ROLE_CTRL_RP_VAL		GENMASK(5, 4)

#define TCPC_ROLE_CTRL_RP_VAL_DEF	0x0

#define TCPC_ROLE_CTRL_RP_VAL_1_5	0x1

#define TCPC_ROLE_CTRL_RP_VAL_3_0	0x2