| Message ID | 20231113221528.749481-3-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: connector: usb: provide bindings for altmodes | expand |
On Tue, Nov 14, 2023 at 12:13:28AM +0200, Dmitry Baryshkov wrote: > As stated in the changelog for the commit 7b458a4c5d73 ("usb: typec: Add > typec_port_register_altmodes()"), the code should be adjusted according > to the AltMode bindings. As the SVID is 16 bits wide (according to the > USB PD Spec), use fwnode_property_read_u16() to read it. > > Acked-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/platform/x86/intel/chtwc_int33fe.c | 2 +- > drivers/usb/typec/class.c | 5 +++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c > index 848baecc1bb0..93f75ba1dafd 100644 > --- a/drivers/platform/x86/intel/chtwc_int33fe.c > +++ b/drivers/platform/x86/intel/chtwc_int33fe.c > @@ -136,7 +136,7 @@ static const struct software_node altmodes_node = { > }; > > static const struct property_entry dp_altmode_properties[] = { > - PROPERTY_ENTRY_U32("svid", 0xff01), > + PROPERTY_ENTRY_U16("svid", 0xff01), > PROPERTY_ENTRY_U32("vdo", 0x0c0086), > { } > }; > diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c > index 6ec2a94e6fad..4251d44137b6 100644 > --- a/drivers/usb/typec/class.c > +++ b/drivers/usb/typec/class.c > @@ -2238,7 +2238,8 @@ void typec_port_register_altmodes(struct typec_port *port, > struct typec_altmode_desc desc; > struct typec_altmode *alt; > size_t index = 0; > - u32 svid, vdo; > + u16 svid; > + u32 vdo; > int ret; > > altmodes_node = device_get_named_child_node(&port->dev, "altmodes"); > @@ -2246,7 +2247,7 @@ void typec_port_register_altmodes(struct typec_port *port, > return; /* No altmodes specified */ > > fwnode_for_each_child_node(altmodes_node, child) { > - ret = fwnode_property_read_u32(child, "svid", &svid); > + ret = fwnode_property_read_u16(child, "svid", &svid); > if (ret) { > dev_err(&port->dev, "Error reading svid for altmode %s\n", > fwnode_get_name(child)); > -- > 2.42.0
diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c index 848baecc1bb0..93f75ba1dafd 100644 --- a/drivers/platform/x86/intel/chtwc_int33fe.c +++ b/drivers/platform/x86/intel/chtwc_int33fe.c @@ -136,7 +136,7 @@ static const struct software_node altmodes_node = { }; static const struct property_entry dp_altmode_properties[] = { - PROPERTY_ENTRY_U32("svid", 0xff01), + PROPERTY_ENTRY_U16("svid", 0xff01), PROPERTY_ENTRY_U32("vdo", 0x0c0086), { } }; diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 6ec2a94e6fad..4251d44137b6 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -2238,7 +2238,8 @@ void typec_port_register_altmodes(struct typec_port *port, struct typec_altmode_desc desc; struct typec_altmode *alt; size_t index = 0; - u32 svid, vdo; + u16 svid; + u32 vdo; int ret; altmodes_node = device_get_named_child_node(&port->dev, "altmodes"); @@ -2246,7 +2247,7 @@ void typec_port_register_altmodes(struct typec_port *port, return; /* No altmodes specified */ fwnode_for_each_child_node(altmodes_node, child) { - ret = fwnode_property_read_u32(child, "svid", &svid); + ret = fwnode_property_read_u16(child, "svid", &svid); if (ret) { dev_err(&port->dev, "Error reading svid for altmode %s\n", fwnode_get_name(child));
As stated in the changelog for the commit 7b458a4c5d73 ("usb: typec: Add typec_port_register_altmodes()"), the code should be adjusted according to the AltMode bindings. As the SVID is 16 bits wide (according to the USB PD Spec), use fwnode_property_read_u16() to read it. Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/platform/x86/intel/chtwc_int33fe.c | 2 +- drivers/usb/typec/class.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)