diff mbox series

[v2,2/2] platform/chrome: cros_ec_typec: Set partner num_altmodes

Message ID 20201110061535.2163599-2-pmalani@chromium.org (mailing list archive)
State New, archived
Headers show
Series [v2,1/2] usb: typec: Add number of altmodes partner attr | expand

Commit Message

Prashant Malani Nov. 10, 2020, 6:15 a.m. UTC
Set the number of altmodes available for a registered partner using the
Type C connector class framework routine.

Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Prashant Malani <pmalani@chromium.org>
---

Changes in v2:
- Patch introduced for the first time in v2.

 drivers/platform/chrome/cros_ec_typec.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Heikki Krogerus Nov. 10, 2020, 10:50 a.m. UTC | #1
On Mon, Nov 09, 2020 at 10:15:36PM -0800, Prashant Malani wrote:
> Set the number of altmodes available for a registered partner using the
> Type C connector class framework routine.
> 
> Signed-off-by: Prashant Malani <pmalani@chromium.org>

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

> ---
> 
> Changes in v2:
> - Patch introduced for the first time in v2.
> 
>  drivers/platform/chrome/cros_ec_typec.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
> index ce031a10eb1b..743a28426f98 100644
> --- a/drivers/platform/chrome/cros_ec_typec.c
> +++ b/drivers/platform/chrome/cros_ec_typec.c
> @@ -621,6 +621,7 @@ static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
>  	struct cros_typec_altmode_node *node;
>  	struct typec_altmode_desc desc;
>  	struct typec_altmode *amode;
> +	int num_altmodes = 0;
>  	int ret = 0;
>  	int i, j;
>  
> @@ -647,9 +648,16 @@ static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
>  
>  			node->amode = amode;
>  			list_add_tail(&node->list, &port->partner_mode_list);
> +			num_altmodes++;
>  		}
>  	}
>  
> +	ret = typec_partner_set_num_altmodes(port->partner, num_altmodes);
> +	if (ret < 0) {
> +		dev_err(typec->dev, "Unable to set partner num_altmodes for port: %d\n", port_num);
> +		goto err_cleanup;
> +	}
> +
>  	return 0;
>  
>  err_cleanup:
> -- 
> 2.29.2.222.g5d2a92d10f8-goog

thanks,
Enric Balletbo i Serra Nov. 10, 2020, 4:01 p.m. UTC | #2
Hi,

On 10/11/20 11:50, Heikki Krogerus wrote:
> On Mon, Nov 09, 2020 at 10:15:36PM -0800, Prashant Malani wrote:
>> Set the number of altmodes available for a registered partner using the
>> Type C connector class framework routine.
>>
>> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> 
> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> 

Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

Heikki, would you like to take these two through your tree? It'd help if you can
create an inmutable branch so I can pick other cros_ec_typec patches on top of it.

Thanks,
 Enric

>> ---
>>
>> Changes in v2:
>> - Patch introduced for the first time in v2.
>>
>>  drivers/platform/chrome/cros_ec_typec.c | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
>> index ce031a10eb1b..743a28426f98 100644
>> --- a/drivers/platform/chrome/cros_ec_typec.c
>> +++ b/drivers/platform/chrome/cros_ec_typec.c
>> @@ -621,6 +621,7 @@ static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
>>  	struct cros_typec_altmode_node *node;
>>  	struct typec_altmode_desc desc;
>>  	struct typec_altmode *amode;
>> +	int num_altmodes = 0;
>>  	int ret = 0;
>>  	int i, j;
>>  
>> @@ -647,9 +648,16 @@ static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
>>  
>>  			node->amode = amode;
>>  			list_add_tail(&node->list, &port->partner_mode_list);
>> +			num_altmodes++;
>>  		}
>>  	}
>>  
>> +	ret = typec_partner_set_num_altmodes(port->partner, num_altmodes);
>> +	if (ret < 0) {
>> +		dev_err(typec->dev, "Unable to set partner num_altmodes for port: %d\n", port_num);
>> +		goto err_cleanup;
>> +	}
>> +
>>  	return 0;
>>  
>>  err_cleanup:
>> -- 
>> 2.29.2.222.g5d2a92d10f8-goog
> 
> thanks,
>
Heikki Krogerus Nov. 11, 2020, 10:28 a.m. UTC | #3
On Tue, Nov 10, 2020 at 05:01:04PM +0100, Enric Balletbo i Serra wrote:
> Hi,
> 
> On 10/11/20 11:50, Heikki Krogerus wrote:
> > On Mon, Nov 09, 2020 at 10:15:36PM -0800, Prashant Malani wrote:
> >> Set the number of altmodes available for a registered partner using the
> >> Type C connector class framework routine.
> >>
> >> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> > 
> > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > 
> 
> Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> 
> Heikki, would you like to take these two through your tree? It'd help if you can
> create an inmutable branch so I can pick other cros_ec_typec patches on top of it.

I'm sorry, but I don't actually maintain a tree for the USB Type-C
stuff.

Greg, I'm sorry to bother you with this, but can you provide the
immutable branch for Enric?

Maybe I should set up a tree for the USB Type-C stuff?

thanks,
Greg Kroah-Hartman Nov. 11, 2020, 10:56 a.m. UTC | #4
On Wed, Nov 11, 2020 at 12:28:46PM +0200, Heikki Krogerus wrote:
> On Tue, Nov 10, 2020 at 05:01:04PM +0100, Enric Balletbo i Serra wrote:
> > Hi,
> > 
> > On 10/11/20 11:50, Heikki Krogerus wrote:
> > > On Mon, Nov 09, 2020 at 10:15:36PM -0800, Prashant Malani wrote:
> > >> Set the number of altmodes available for a registered partner using the
> > >> Type C connector class framework routine.
> > >>
> > >> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> > > 
> > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > 
> > 
> > Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > 
> > Heikki, would you like to take these two through your tree? It'd help if you can
> > create an inmutable branch so I can pick other cros_ec_typec patches on top of it.
> 
> I'm sorry, but I don't actually maintain a tree for the USB Type-C
> stuff.
> 
> Greg, I'm sorry to bother you with this, but can you provide the
> immutable branch for Enric?

My usb tree branches are always immutable :)

> Maybe I should set up a tree for the USB Type-C stuff?

Or I can just take all of these patches as they depend on USB stuff more
than any other specific platform driver changes, right?

thanks,

greg k-h
Heikki Krogerus Nov. 11, 2020, 11:21 a.m. UTC | #5
On Wed, Nov 11, 2020 at 11:56:37AM +0100, Greg KH wrote:
> On Wed, Nov 11, 2020 at 12:28:46PM +0200, Heikki Krogerus wrote:
> > On Tue, Nov 10, 2020 at 05:01:04PM +0100, Enric Balletbo i Serra wrote:
> > > Hi,
> > > 
> > > On 10/11/20 11:50, Heikki Krogerus wrote:
> > > > On Mon, Nov 09, 2020 at 10:15:36PM -0800, Prashant Malani wrote:
> > > >> Set the number of altmodes available for a registered partner using the
> > > >> Type C connector class framework routine.
> > > >>
> > > >> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> > > > 
> > > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > > 
> > > 
> > > Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> > > 
> > > Heikki, would you like to take these two through your tree? It'd help if you can
> > > create an inmutable branch so I can pick other cros_ec_typec patches on top of it.
> > 
> > I'm sorry, but I don't actually maintain a tree for the USB Type-C
> > stuff.
> > 
> > Greg, I'm sorry to bother you with this, but can you provide the
> > immutable branch for Enric?
> 
> My usb tree branches are always immutable :)
> 
> > Maybe I should set up a tree for the USB Type-C stuff?
> 
> Or I can just take all of these patches as they depend on USB stuff more
> than any other specific platform driver changes, right?

Works for me.

Br,
diff mbox series

Patch

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index ce031a10eb1b..743a28426f98 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -621,6 +621,7 @@  static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
 	struct cros_typec_altmode_node *node;
 	struct typec_altmode_desc desc;
 	struct typec_altmode *amode;
+	int num_altmodes = 0;
 	int ret = 0;
 	int i, j;
 
@@ -647,9 +648,16 @@  static int cros_typec_register_altmodes(struct cros_typec_data *typec, int port_
 
 			node->amode = amode;
 			list_add_tail(&node->list, &port->partner_mode_list);
+			num_altmodes++;
 		}
 	}
 
+	ret = typec_partner_set_num_altmodes(port->partner, num_altmodes);
+	if (ret < 0) {
+		dev_err(typec->dev, "Unable to set partner num_altmodes for port: %d\n", port_num);
+		goto err_cleanup;
+	}
+
 	return 0;
 
 err_cleanup: