| Message ID | 1454679181-8949-4-git-send-email-tomeu.vizoso@collabora.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Thanks for putting this up Tomeu! On Fri, Feb 5, 2016 at 5:32 AM, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote: > From: Benson Leung <bleung@chromium.org> > > This adds power supply types for USB chargers defined in > the USB Type-C Specification 1.1 and in the > USB Power Delivery Specification Revision 2.0 V1.1. > > The following are added : > POWER_SUPPLY_TYPE_USB_TYPE_C, /* Type C Port */ > POWER_SUPPLY_TYPE_USB_PD, /* Type C Power Delivery Port */ > POWER_SUPPLY_TYPE_USB_PD_DRP, /* Type C PD Dual Role Port */ I authored this patch, but in looking back, the comments should be tweaked. USB_PD and USB_PD_DRP are not necessarily Type-C ports, as you may have USB_PD ports that are either Type-A or Type-B as well. Could you change these to be "USB Power Delivery Port" and "USB PD Dual Role Port"? > > Signed-off-by: Benson Leung <bleung@chromium.org> > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Reviewed-by: Alec Berg <alecaberg@chromium.org> > Reviewed-by: Vincent Palatin <vpalatin@chromium.org> > Reviewed-by: Todd Broch <tbroch@chromium.org> > --- > > drivers/power/power_supply_sysfs.c | 3 ++- > include/linux/power_supply.h | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c > index ed2d7fd0c734..80fed98832f9 100644 > --- a/drivers/power/power_supply_sysfs.c > +++ b/drivers/power/power_supply_sysfs.c > @@ -45,7 +45,8 @@ static ssize_t power_supply_show_property(struct device *dev, > char *buf) { > static char *type_text[] = { > "Unknown", "Battery", "UPS", "Mains", "USB", > - "USB_DCP", "USB_CDP", "USB_ACA" > + "USB_DCP", "USB_CDP", "USB_ACA", "USB_C", > + "USB_PD", "USB_PD_DRP" > }; > static char *status_text[] = { > "Unknown", "Charging", "Discharging", "Not charging", "Full" > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > index ef9f1592185d..206c3384c6fa 100644 > --- a/include/linux/power_supply.h > +++ b/include/linux/power_supply.h > @@ -163,6 +163,9 @@ enum power_supply_type { > POWER_SUPPLY_TYPE_USB_DCP, /* Dedicated Charging Port */ > POWER_SUPPLY_TYPE_USB_CDP, /* Charging Downstream Port */ > POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */ > + POWER_SUPPLY_TYPE_USB_TYPE_C, /* Type C Port */ > + POWER_SUPPLY_TYPE_USB_PD, /* Type C Power Delivery Port */ > + POWER_SUPPLY_TYPE_USB_PD_DRP, /* Type C PD Dual Role Port */ Same change as in commit message. Thanks! > }; > > enum power_supply_notifier_events {
On 5 February 2016 at 19:38, Benson Leung <bleung@chromium.org> wrote: > Thanks for putting this up Tomeu! No problem, thanks for the encouragement. > On Fri, Feb 5, 2016 at 5:32 AM, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote: >> From: Benson Leung <bleung@chromium.org> >> >> This adds power supply types for USB chargers defined in >> the USB Type-C Specification 1.1 and in the >> USB Power Delivery Specification Revision 2.0 V1.1. >> >> The following are added : >> POWER_SUPPLY_TYPE_USB_TYPE_C, /* Type C Port */ >> POWER_SUPPLY_TYPE_USB_PD, /* Type C Power Delivery Port */ >> POWER_SUPPLY_TYPE_USB_PD_DRP, /* Type C PD Dual Role Port */ > > I authored this patch, but in looking back, the comments should be tweaked. > USB_PD and USB_PD_DRP are not necessarily Type-C ports, as you may > have USB_PD ports that are either Type-A or Type-B as well. > > Could you change these to be "USB Power Delivery Port" and "USB PD > Dual Role Port"? I have gone with omitting the USB prefix, following the lead of the existing entries, do you agree with that? Thanks, Tomeu >> Signed-off-by: Benson Leung <bleung@chromium.org> >> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> >> Reviewed-by: Alec Berg <alecaberg@chromium.org> >> Reviewed-by: Vincent Palatin <vpalatin@chromium.org> >> Reviewed-by: Todd Broch <tbroch@chromium.org> >> --- >> >> drivers/power/power_supply_sysfs.c | 3 ++- >> include/linux/power_supply.h | 3 +++ >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c >> index ed2d7fd0c734..80fed98832f9 100644 >> --- a/drivers/power/power_supply_sysfs.c >> +++ b/drivers/power/power_supply_sysfs.c >> @@ -45,7 +45,8 @@ static ssize_t power_supply_show_property(struct device *dev, >> char *buf) { >> static char *type_text[] = { >> "Unknown", "Battery", "UPS", "Mains", "USB", >> - "USB_DCP", "USB_CDP", "USB_ACA" >> + "USB_DCP", "USB_CDP", "USB_ACA", "USB_C", >> + "USB_PD", "USB_PD_DRP" >> }; >> static char *status_text[] = { >> "Unknown", "Charging", "Discharging", "Not charging", "Full" >> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h >> index ef9f1592185d..206c3384c6fa 100644 >> --- a/include/linux/power_supply.h >> +++ b/include/linux/power_supply.h >> @@ -163,6 +163,9 @@ enum power_supply_type { >> POWER_SUPPLY_TYPE_USB_DCP, /* Dedicated Charging Port */ >> POWER_SUPPLY_TYPE_USB_CDP, /* Charging Downstream Port */ >> POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */ >> + POWER_SUPPLY_TYPE_USB_TYPE_C, /* Type C Port */ >> + POWER_SUPPLY_TYPE_USB_PD, /* Type C Power Delivery Port */ >> + POWER_SUPPLY_TYPE_USB_PD_DRP, /* Type C PD Dual Role Port */ > > Same change as in commit message. Thanks! > >> }; >> >> enum power_supply_notifier_events { > > > > > -- > Benson Leung > Senior Software Engineer, Chrom* OS > bleung@chromium.org -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Feb 11, 2016 at 2:00 AM, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote: >> Could you change these to be "USB Power Delivery Port" and "USB PD >> Dual Role Port"? > > I have gone with omitting the USB prefix, following the lead of the > existing entries, do you agree with that? Sounds good to me! Thanks, Benson
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index ed2d7fd0c734..80fed98832f9 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -45,7 +45,8 @@ static ssize_t power_supply_show_property(struct device *dev, char *buf) { static char *type_text[] = { "Unknown", "Battery", "UPS", "Mains", "USB", - "USB_DCP", "USB_CDP", "USB_ACA" + "USB_DCP", "USB_CDP", "USB_ACA", "USB_C", + "USB_PD", "USB_PD_DRP" }; static char *status_text[] = { "Unknown", "Charging", "Discharging", "Not charging", "Full" diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index ef9f1592185d..206c3384c6fa 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -163,6 +163,9 @@ enum power_supply_type { POWER_SUPPLY_TYPE_USB_DCP, /* Dedicated Charging Port */ POWER_SUPPLY_TYPE_USB_CDP, /* Charging Downstream Port */ POWER_SUPPLY_TYPE_USB_ACA, /* Accessory Charger Adapters */ + POWER_SUPPLY_TYPE_USB_TYPE_C, /* Type C Port */ + POWER_SUPPLY_TYPE_USB_PD, /* Type C Power Delivery Port */ + POWER_SUPPLY_TYPE_USB_PD_DRP, /* Type C PD Dual Role Port */ }; enum power_supply_notifier_events {