RE: [PATCH v4 2/5] usb: typec: fusb302: remove max_snk_* for sink config

2018-04-13 Thread Jun Li
Hi
> -Original Message-
> From: Guenter Roeck [mailto:li...@roeck-us.net]
> Sent: 2018年4月14日 0:03
> To: Jun Li 
> Cc: gre...@linuxfoundation.org; robh...@kernel.org;
> heikki.kroge...@linux.intel.com; hdego...@redhat.com; rmf...@gmail.com;
> yueyao@gmail.com; linux-usb@vger.kernel.org; dl-linux-imx
> 
> Subject: Re: [PATCH v4 2/5] usb: typec: fusb302: remove max_snk_* for sink
> config
> 
> On Fri, Apr 13, 2018 at 10:18:42PM +0800, Li Jun wrote:
> > Since max_snk_* is to be deprecated, so remove max_snk_* by adding a
> > variable PDO for sink config.
> 
> max_snk or max_sink ?

.max_snk_ma/mv/mw

> 
> >
> > Reviewed-by: Hans de Goede 
> > Signed-off-by: Li Jun 
> > ---
> >  drivers/usb/typec/fusb302/fusb302.c | 34
> > --
> >  1 file changed, 20 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/usb/typec/fusb302/fusb302.c
> > b/drivers/usb/typec/fusb302/fusb302.c
> > index 7036171..893f9e5 100644
> > --- a/drivers/usb/typec/fusb302/fusb302.c
> > +++ b/drivers/usb/typec/fusb302/fusb302.c
> > @@ -120,6 +120,7 @@ struct fusb302_chip {
> > enum typec_cc_polarity cc_polarity;
> > enum typec_cc_status cc1;
> > enum typec_cc_status cc2;
> > +   u32 snk_pdo[PDO_MAX_OBJECTS];
> >
> >  #ifdef CONFIG_DEBUG_FS
> > struct dentry *dentry;
> > @@ -1212,11 +1213,6 @@ static const u32 snk_pdo[] = {  static const
> > struct tcpc_config fusb302_tcpc_config = {
> > .src_pdo = src_pdo,
> > .nr_src_pdo = ARRAY_SIZE(src_pdo),
> > -   .snk_pdo = snk_pdo,
> > -   .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
> > -   .max_snk_mv = 5000,
> > -   .max_snk_ma = 3000,
> > -   .max_snk_mw = 15000,
> > .operating_snk_mw = 2500,
> > .type = TYPEC_PORT_DRP,
> > .data = TYPEC_PORT_DRD,
> > @@ -1756,6 +1752,21 @@ static int init_gpio(struct fusb302_chip *chip)
> > return 0;
> >  }
> >
> > +static int fusb302_composite_snk_pdo_array(struct fusb302_chip *chip)
> > +{
> > +   struct device *dev = chip->dev;
> > +   u32 max_uv, max_ua;
> > +
> > +   chip->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS);
> > +
> > +   if (device_property_read_u32(dev, "fcs,max-sink-microvolt", &max_uv) ||
> > +   device_property_read_u32(dev, "fcs,max-sink-microamp", &max_ua))
> > +   return 1;
> 
> Aren't those properties removed in the next patch ? If this is on purpose, it
> should be documented.

I will add comment to explain those properties are no longer needed,
but to preserve compatibility, we covert it to be a var pdo for existing
user.

Thanks
Jun
> 
> > +
> > +   chip->snk_pdo[1] = PDO_VAR(5000, max_uv / 1000, max_ua / 1000);
> > +   return 2;
> > +}
> > +
> >  static int fusb302_probe(struct i2c_client *client,
> >  const struct i2c_device_id *id)
> >  {
> > @@ -1784,18 +1795,13 @@ static int fusb302_probe(struct i2c_client *client,
> > chip->tcpc_dev.config = &chip->tcpc_config;
> > mutex_init(&chip->lock);
> >
> > -   if (!device_property_read_u32(dev, "fcs,max-sink-microvolt", &v))
> > -   chip->tcpc_config.max_snk_mv = v / 1000;
> > -
> > -   if (!device_property_read_u32(dev, "fcs,max-sink-microamp", &v))
> > -   chip->tcpc_config.max_snk_ma = v / 1000;
> > -
> > -   if (!device_property_read_u32(dev, "fcs,max-sink-microwatt", &v))
> > -   chip->tcpc_config.max_snk_mw = v / 1000;
> > -
> > if (!device_property_read_u32(dev, "fcs,operating-sink-microwatt", &v))
> > chip->tcpc_config.operating_snk_mw = v / 1000;
> >
> > +   /* Composite sink PDO */
> > +   chip->tcpc_config.nr_snk_pdo = fusb302_composite_snk_pdo_array(chip);
> > +   chip->tcpc_config.snk_pdo = chip->snk_pdo;
> > +
> > /*
> >  * Devicetree platforms should get extcon via phandle (not yet
> >  * supported). On ACPI platforms, we get the name from a device prop.
> > --
> > 2.7.4
> >
N�Р骒r��yb�X�肚�v�^�)藓{.n�+�伐�{焙柒��^n�r■�z���h�ㄨ��&Ⅷ�G���h�(�茛j"���m赇z罐��帼f"�h���~�m�

Re: [PATCH v4 2/5] usb: typec: fusb302: remove max_snk_* for sink config

2018-04-13 Thread Guenter Roeck
On Fri, Apr 13, 2018 at 10:18:42PM +0800, Li Jun wrote:
> Since max_snk_* is to be deprecated, so remove max_snk_* by adding a
> variable PDO for sink config.

max_snk or max_sink ?

> 
> Reviewed-by: Hans de Goede 
> Signed-off-by: Li Jun 
> ---
>  drivers/usb/typec/fusb302/fusb302.c | 34 --
>  1 file changed, 20 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/usb/typec/fusb302/fusb302.c 
> b/drivers/usb/typec/fusb302/fusb302.c
> index 7036171..893f9e5 100644
> --- a/drivers/usb/typec/fusb302/fusb302.c
> +++ b/drivers/usb/typec/fusb302/fusb302.c
> @@ -120,6 +120,7 @@ struct fusb302_chip {
>   enum typec_cc_polarity cc_polarity;
>   enum typec_cc_status cc1;
>   enum typec_cc_status cc2;
> + u32 snk_pdo[PDO_MAX_OBJECTS];
>  
>  #ifdef CONFIG_DEBUG_FS
>   struct dentry *dentry;
> @@ -1212,11 +1213,6 @@ static const u32 snk_pdo[] = {
>  static const struct tcpc_config fusb302_tcpc_config = {
>   .src_pdo = src_pdo,
>   .nr_src_pdo = ARRAY_SIZE(src_pdo),
> - .snk_pdo = snk_pdo,
> - .nr_snk_pdo = ARRAY_SIZE(snk_pdo),
> - .max_snk_mv = 5000,
> - .max_snk_ma = 3000,
> - .max_snk_mw = 15000,
>   .operating_snk_mw = 2500,
>   .type = TYPEC_PORT_DRP,
>   .data = TYPEC_PORT_DRD,
> @@ -1756,6 +1752,21 @@ static int init_gpio(struct fusb302_chip *chip)
>   return 0;
>  }
>  
> +static int fusb302_composite_snk_pdo_array(struct fusb302_chip *chip)
> +{
> + struct device *dev = chip->dev;
> + u32 max_uv, max_ua;
> +
> + chip->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS);
> +
> + if (device_property_read_u32(dev, "fcs,max-sink-microvolt", &max_uv) ||
> + device_property_read_u32(dev, "fcs,max-sink-microamp", &max_ua))
> + return 1;

Aren't those properties removed in the next patch ? If this is on purpose,
it should be documented.

> +
> + chip->snk_pdo[1] = PDO_VAR(5000, max_uv / 1000, max_ua / 1000);
> + return 2;
> +}
> +
>  static int fusb302_probe(struct i2c_client *client,
>const struct i2c_device_id *id)
>  {
> @@ -1784,18 +1795,13 @@ static int fusb302_probe(struct i2c_client *client,
>   chip->tcpc_dev.config = &chip->tcpc_config;
>   mutex_init(&chip->lock);
>  
> - if (!device_property_read_u32(dev, "fcs,max-sink-microvolt", &v))
> - chip->tcpc_config.max_snk_mv = v / 1000;
> -
> - if (!device_property_read_u32(dev, "fcs,max-sink-microamp", &v))
> - chip->tcpc_config.max_snk_ma = v / 1000;
> -
> - if (!device_property_read_u32(dev, "fcs,max-sink-microwatt", &v))
> - chip->tcpc_config.max_snk_mw = v / 1000;
> -
>   if (!device_property_read_u32(dev, "fcs,operating-sink-microwatt", &v))
>   chip->tcpc_config.operating_snk_mw = v / 1000;
>  
> + /* Composite sink PDO */
> + chip->tcpc_config.nr_snk_pdo = fusb302_composite_snk_pdo_array(chip);
> + chip->tcpc_config.snk_pdo = chip->snk_pdo;
> +
>   /*
>* Devicetree platforms should get extcon via phandle (not yet
>* supported). On ACPI platforms, we get the name from a device prop.
> -- 
> 2.7.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html