diff mbox series

[v2,3/3] usb: typec: tcpci_maxim: Enable data path when partner is USB Comm capable

Message ID 20210202003101.221145-3-badhri@google.com (mailing list archive)
State Accepted
Commit 2a16e18c3400f7ab1deb826a98cf52153d03653e
Headers show
Series [v2,1/3] usb: typec: tcpm: Add Callback to Usb Communication capable partner | expand

Commit Message

Badhri Jagan Sridharan Feb. 2, 2021, 12:31 a.m. UTC 
Configure USB switches when partner is USB Communication capable.
The is enabled USB data communication over D+/D- pins.

Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
---
 drivers/usb/typec/tcpm/tcpci_maxim.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Comments

Heikki Krogerus Feb. 2, 2021, 8:52 a.m. UTC | #1 
On Mon, Feb 01, 2021 at 04:31:01PM -0800, Badhri Jagan Sridharan wrote:
> Configure USB switches when partner is USB Communication capable.
> The is enabled USB data communication over D+/D- pins.
> 
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/tcpm/tcpci_maxim.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
> index f1674a611033..041a1c393594 100644
> --- a/drivers/usb/typec/tcpm/tcpci_maxim.c
> +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
> @@ -19,6 +19,9 @@
>  #define PD_ACTIVITY_TIMEOUT_MS				10000
>  
>  #define TCPC_VENDOR_ALERT				0x80
> +#define TCPC_VENDOR_USBSW_CTRL				0x93
> +#define TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA		0x9
> +#define TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA		0
>  
>  #define TCPC_RECEIVE_BUFFER_COUNT_OFFSET		0
>  #define TCPC_RECEIVE_BUFFER_FRAME_TYPE_OFFSET		1
> @@ -274,6 +277,21 @@ static void process_tx(struct max_tcpci_chip *chip, u16 status)
>  		max_tcpci_init_regs(chip);
>  }
>  
> +/* Enable USB switches when partner is USB communications capable */
> +static void max_tcpci_set_partner_usb_comm_capable(struct tcpci *tcpci, struct tcpci_data *data,
> +						   bool capable)
> +{
> +	struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
> +	int ret;
> +
> +	ret = max_tcpci_write8(chip, TCPC_VENDOR_USBSW_CTRL, capable ?
> +			       TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA :
> +			       TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA);
> +
> +	if (ret < 0)
> +		dev_err(chip->dev, "Failed to enable USB switches");
> +}
> +
>  static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip *chip, u16 status)
>  {
>  	u16 mask;
> @@ -453,6 +471,7 @@ static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
>  	chip->data.frs_sourcing_vbus = max_tcpci_frs_sourcing_vbus;
>  	chip->data.auto_discharge_disconnect = true;
>  	chip->data.vbus_vsafe0v = true;
> +	chip->data.set_partner_usb_comm_capable = max_tcpci_set_partner_usb_comm_capable;
>  
>  	max_tcpci_init_regs(chip);
>  	chip->tcpci = tcpci_register_port(chip->dev, &chip->data);
> -- 
> 2.30.0.365.g02bc693789-goog

thanks,
Guenter Roeck Feb. 2, 2021, 4:25 p.m. UTC | #2 
On Mon, Feb 01, 2021 at 04:31:01PM -0800, Badhri Jagan Sridharan wrote:
> Configure USB switches when partner is USB Communication capable.
> The is enabled USB data communication over D+/D- pins.
> 
> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/usb/typec/tcpm/tcpci_maxim.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
> index f1674a611033..041a1c393594 100644
> --- a/drivers/usb/typec/tcpm/tcpci_maxim.c
> +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
> @@ -19,6 +19,9 @@
>  #define PD_ACTIVITY_TIMEOUT_MS				10000
>  
>  #define TCPC_VENDOR_ALERT				0x80
> +#define TCPC_VENDOR_USBSW_CTRL				0x93
> +#define TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA		0x9
> +#define TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA		0
>  
>  #define TCPC_RECEIVE_BUFFER_COUNT_OFFSET		0
>  #define TCPC_RECEIVE_BUFFER_FRAME_TYPE_OFFSET		1
> @@ -274,6 +277,21 @@ static void process_tx(struct max_tcpci_chip *chip, u16 status)
>  		max_tcpci_init_regs(chip);
>  }
>  
> +/* Enable USB switches when partner is USB communications capable */
> +static void max_tcpci_set_partner_usb_comm_capable(struct tcpci *tcpci, struct tcpci_data *data,
> +						   bool capable)
> +{
> +	struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
> +	int ret;
> +
> +	ret = max_tcpci_write8(chip, TCPC_VENDOR_USBSW_CTRL, capable ?
> +			       TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA :
> +			       TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA);
> +
> +	if (ret < 0)
> +		dev_err(chip->dev, "Failed to enable USB switches");
> +}
> +
>  static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip *chip, u16 status)
>  {
>  	u16 mask;
> @@ -453,6 +471,7 @@ static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
>  	chip->data.frs_sourcing_vbus = max_tcpci_frs_sourcing_vbus;
>  	chip->data.auto_discharge_disconnect = true;
>  	chip->data.vbus_vsafe0v = true;
> +	chip->data.set_partner_usb_comm_capable = max_tcpci_set_partner_usb_comm_capable;
>  
>  	max_tcpci_init_regs(chip);
>  	chip->tcpci = tcpci_register_port(chip->dev, &chip->data);
> -- 
> 2.30.0.365.g02bc693789-goog
>
diff mbox series

Patch

diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
index f1674a611033..041a1c393594 100644
--- a/drivers/usb/typec/tcpm/tcpci_maxim.c
+++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
@@ -19,6 +19,9 @@ 
 #define PD_ACTIVITY_TIMEOUT_MS				10000
 
 #define TCPC_VENDOR_ALERT				0x80
+#define TCPC_VENDOR_USBSW_CTRL				0x93
+#define TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA		0x9
+#define TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA		0
 
 #define TCPC_RECEIVE_BUFFER_COUNT_OFFSET		0
 #define TCPC_RECEIVE_BUFFER_FRAME_TYPE_OFFSET		1
@@ -274,6 +277,21 @@  static void process_tx(struct max_tcpci_chip *chip, u16 status)
 		max_tcpci_init_regs(chip);
 }
 
+/* Enable USB switches when partner is USB communications capable */
+static void max_tcpci_set_partner_usb_comm_capable(struct tcpci *tcpci, struct tcpci_data *data,
+						   bool capable)
+{
+	struct max_tcpci_chip *chip = tdata_to_max_tcpci(data);
+	int ret;
+
+	ret = max_tcpci_write8(chip, TCPC_VENDOR_USBSW_CTRL, capable ?
+			       TCPC_VENDOR_USBSW_CTRL_ENABLE_USB_DATA :
+			       TCPC_VENDOR_USBSW_CTRL_DISABLE_USB_DATA);
+
+	if (ret < 0)
+		dev_err(chip->dev, "Failed to enable USB switches");
+}
+
 static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip *chip, u16 status)
 {
 	u16 mask;
@@ -453,6 +471,7 @@  static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
 	chip->data.frs_sourcing_vbus = max_tcpci_frs_sourcing_vbus;
 	chip->data.auto_discharge_disconnect = true;
 	chip->data.vbus_vsafe0v = true;
+	chip->data.set_partner_usb_comm_capable = max_tcpci_set_partner_usb_comm_capable;
 
 	max_tcpci_init_regs(chip);
 	chip->tcpci = tcpci_register_port(chip->dev, &chip->data);