Message ID | 20241114-usb-typec-controller-enhancements-v2-2-362376856aea@zuehlke.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | usb: typec: hd3ss3220: enhance driver with port type, power opmode, and role preference settings | expand |
On Thu, Nov 14, 2024 at 09:02:07AM +0100, Oliver Facklam wrote: > The type, data, and prefer_role properties were previously hard-coded > when creating the struct typec_capability. > > Use typec_get_fw_cap() to populate these fields based on the > respective fwnode properties, if present. > > Signed-off-by: Oliver Facklam <oliver.facklam@zuehlke.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/hd3ss3220.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c > index 56f74bf70895ca701083bde44a5bbe0b691551e1..e581272bb47de95dee8363a5491f543354fcbbf8 100644 > --- a/drivers/usb/typec/hd3ss3220.c > +++ b/drivers/usb/typec/hd3ss3220.c > @@ -264,7 +264,14 @@ static int hd3ss3220_probe(struct i2c_client *client) > typec_cap.type = TYPEC_PORT_DRP; > typec_cap.data = TYPEC_PORT_DRD; > typec_cap.ops = &hd3ss3220_ops; > - typec_cap.fwnode = connector; > + > + /* > + * Try to get properties from connector, > + * but continue with defaults anyway if they are not found > + */ > + ret = typec_get_fw_cap(&typec_cap, connector); > + if (ret != 0 && ret != -EINVAL && ret != -ENXIO) > + goto err_put_role; > > hd3ss3220->port = typec_register_port(&client->dev, &typec_cap); > if (IS_ERR(hd3ss3220->port)) { > > -- > 2.34.1
diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index 56f74bf70895ca701083bde44a5bbe0b691551e1..e581272bb47de95dee8363a5491f543354fcbbf8 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -264,7 +264,14 @@ static int hd3ss3220_probe(struct i2c_client *client) typec_cap.type = TYPEC_PORT_DRP; typec_cap.data = TYPEC_PORT_DRD; typec_cap.ops = &hd3ss3220_ops; - typec_cap.fwnode = connector; + + /* + * Try to get properties from connector, + * but continue with defaults anyway if they are not found + */ + ret = typec_get_fw_cap(&typec_cap, connector); + if (ret != 0 && ret != -EINVAL && ret != -ENXIO) + goto err_put_role; hd3ss3220->port = typec_register_port(&client->dev, &typec_cap); if (IS_ERR(hd3ss3220->port)) {
The type, data, and prefer_role properties were previously hard-coded when creating the struct typec_capability. Use typec_get_fw_cap() to populate these fields based on the respective fwnode properties, if present. Signed-off-by: Oliver Facklam <oliver.facklam@zuehlke.com> --- drivers/usb/typec/hd3ss3220.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)