| Message ID | 20190814132419.39759-2-heikki.krogerus@linux.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | eceddc4071e39807f080913656252e4526227647 |
| Headers | show |
| Series | usb: typec: fusb302: Small changes | expand |
On Wed, Aug 14, 2019 at 04:24:17PM +0300, Heikki Krogerus wrote: > Removing the deprecated fusb302 specific properties. There > are no more platforms using them. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/typec/tcpm/fusb302.c | 31 +++---------------------------- > 1 file changed, 3 insertions(+), 28 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c > index c524088246ee..074fbb17fa8b 100644 > --- a/drivers/usb/typec/tcpm/fusb302.c > +++ b/drivers/usb/typec/tcpm/fusb302.c > @@ -1670,29 +1670,6 @@ 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); > - > - /* > - * As max_snk_ma/mv/mw is not needed for tcpc_config, > - * those settings should be passed in via sink PDO, so > - * "fcs, max-sink-*" properties will be deprecated, to > - * perserve compatibility with existing users of them, > - * we read those properties to convert them to be a var > - * PDO. > - */ > - 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; > - > - 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) > { > @@ -1701,7 +1678,6 @@ static int fusb302_probe(struct i2c_client *client, > struct device *dev = &client->dev; > const char *name; > int ret = 0; > - u32 v; > > if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) { > dev_err(&client->dev, > @@ -1721,11 +1697,10 @@ static int fusb302_probe(struct i2c_client *client, > chip->tcpc_dev.fwnode = > device_get_named_child_node(dev, "connector"); > > - 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->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS); > + > + chip->tcpc_config.nr_snk_pdo = 1; > chip->tcpc_config.snk_pdo = chip->snk_pdo; > > /* > -- > 2.20.1 >
diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c index c524088246ee..074fbb17fa8b 100644 --- a/drivers/usb/typec/tcpm/fusb302.c +++ b/drivers/usb/typec/tcpm/fusb302.c @@ -1670,29 +1670,6 @@ 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); - - /* - * As max_snk_ma/mv/mw is not needed for tcpc_config, - * those settings should be passed in via sink PDO, so - * "fcs, max-sink-*" properties will be deprecated, to - * perserve compatibility with existing users of them, - * we read those properties to convert them to be a var - * PDO. - */ - 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; - - 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) { @@ -1701,7 +1678,6 @@ static int fusb302_probe(struct i2c_client *client, struct device *dev = &client->dev; const char *name; int ret = 0; - u32 v; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) { dev_err(&client->dev, @@ -1721,11 +1697,10 @@ static int fusb302_probe(struct i2c_client *client, chip->tcpc_dev.fwnode = device_get_named_child_node(dev, "connector"); - 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->snk_pdo[0] = PDO_FIXED(5000, 400, PDO_FIXED_FLAGS); + + chip->tcpc_config.nr_snk_pdo = 1; chip->tcpc_config.snk_pdo = chip->snk_pdo; /*
Removing the deprecated fusb302 specific properties. There are no more platforms using them. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- drivers/usb/typec/tcpm/fusb302.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)