Skip to contentSkip to conversation

usb: phy: show USB charger type for user

PATCH RESEND Superseded Peter Chen 2 participants 4 messages Dec 3, 2019 USB

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Peter Chen

author
#0 lore raw

PATCH RESEND v2 1/2 usb: phy: show USB charger type for user

Current USB charger framework only shows charger state for user, but the user may also need charger type for further use, add support for it.

---
Changes for v2:
- Some string unalignment for usb_chger_type
- Add ABI documentation for USB charger uevent

 drivers/usb/phy/phy.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/usb/phy/phy.c +12 -1
index 0277f62739a2..ad2554630889 100644
@@ -34,6 +34,14 @@ struct phy_devm {
 	struct notifier_block *nb;
 };
 
+static const char *const usb_chger_type[] = {
+	[UNKNOWN_TYPE]			= "USB_CHARGER_UNKNOWN_TYPE",
+	[SDP_TYPE]			= "USB_CHARGER_SDP_TYPE",
+	[CDP_TYPE]			= "USB_CHARGER_CDP_TYPE",
+	[DCP_TYPE]			= "USB_CHARGER_DCP_TYPE",
+	[ACA_TYPE]			= "USB_CHARGER_ACA_TYPE",
+};
+
 static struct usb_phy *__usb_find_phy(struct list_head *list,
 	enum usb_phy_type type)
 {
@@ -98,7 +106,8 @@ static void usb_phy_notify_charger_work(struct work_struct *work)
 {
 	struct usb_phy *usb_phy = container_of(work, struct usb_phy, chg_work);
 	char uchger_state[50] = { 0 };
-	char *envp[] = { uchger_state, NULL };
+	char uchger_type[50] = { 0 };
+	char *envp[] = { uchger_state, uchger_type, NULL };
 	unsigned int min, max;
 
 	switch (usb_phy->chg_state) {
@@ -122,6 +131,8 @@ static void usb_phy_notify_charger_work(struct work_struct *work)
 		return;
 	}
 
+	snprintf(uchger_type, ARRAY_SIZE(uchger_type),
+		 "USB_CHARGER_TYPE=%s", usb_chger_type[usb_phy->chg_type]);
 	kobject_uevent_env(&usb_phy->dev->kobj, KOBJ_CHANGE, envp);
 }
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH RESEND v2 2/2 Doc: ABI: add usb charger uevent

When the USB charger is inserted or removed, the users could get USB charger state and type through the uevent.

---
 Documentation/ABI/testing/usb-charger-uevent | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Documentation/ABI/testing/usb-charger-uevent
Documentation/ABI/testing/usb-charger-uevent new file +45 -0
new file mode 100644
index 000000000000..93ffd3a54a7f
@@ -0,0 +1,45 @@
+What:		Raise a uevent when a USB charger is inserted or removed
+Date:		2019-11-11
+KernelVersion:	5.5
+Contact:	[email protected]
+Description:	There are two USB charger states:
+		USB_CHARGER_ABSENT
+		USB_CHARGER_PRESENT
+		There are five USB charger types:
+		USB_CHARGER_UNKNOWN_TYPE
+		USB_CHARGER_SDP_TYPE
+		USB_CHARGER_CDP_TYPE
+		USB_CHARGER_DCP_TYPE
+		USB_CHARGER_ACA_TYPE
+
+		Here are two examples taken using udevadm monitor -p when
+		USB charger is online:
+		UDEV  [227.425096] change   /devices/soc0/usbphynop1 (platform)
+		ACTION=change
+		DEVPATH=/devices/soc0/usbphynop1
+		DRIVER=usb_phy_generic
+		MODALIAS=of:Nusbphynop1T(null)Cusb-nop-xceiv
+		OF_COMPATIBLE_0=usb-nop-xceiv
+		OF_COMPATIBLE_N=1
+		OF_FULLNAME=/usbphynop1
+		OF_NAME=usbphynop1
+		SEQNUM=2493
+		SUBSYSTEM=platform
+		USB_CHARGER_STATE=USB_CHARGER_PRESENT
+		USB_CHARGER_TYPE=USB_CHARGER_SDP_TYPE
+		USEC_INITIALIZED=227422826
+
+		USB charger is offline:
+		KERNEL[229.533933] change   /devices/soc0/usbphynop1 (platform)
+		ACTION=change
+		DEVPATH=/devices/soc0/usbphynop1
+		DRIVER=usb_phy_generic
+		MODALIAS=of:Nusbphynop1T(null)Cusb-nop-xceiv
+		OF_COMPATIBLE_0=usb-nop-xceiv
+		OF_COMPATIBLE_N=1
+		OF_FULLNAME=/usbphynop1
+		OF_NAME=usbphynop1
+		SEQNUM=2494
+		SUBSYSTEM=platform
+		USB_CHARGER_STATE=USB_CHARGER_ABSENT
+		USB_CHARGER_TYPE=USB_CHARGER_UNKNOWN_TYPE
Signature · 1 line
2.17.1
maintainer
#2 lore raw

Re: [PATCH RESEND v2 2/2] Doc: ABI: add usb charger uevent

Quoted 15 lines · Peter Chen

When the USB charger is inserted or removed, the users could get USB charger state and type through the uevent.

---
 Documentation/ABI/testing/usb-charger-uevent | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Documentation/ABI/testing/usb-charger-uevent
Documentation/ABI/testing/usb-charger-uevent new file +0 -0
new file mode 100644
index 000000000000..93ffd3a54a7f

Documentation/ABI/testing/usb-charger-uevent line 3

Quoted 3 lines
Documentation/ABI/testing/usb-charger-uevent new file +3 -0
@@ -0,0 +1,45 @@
+What:		Raise a uevent when a USB charger is inserted or removed
+Date:		2019-11-11
+KernelVersion:	5.5

No new features for 5.5, this would be 5.6, right?

thanks,

greg k-h

author
#3 lore raw

RE: [PATCH RESEND v2 2/2] Doc: ABI: add usb charger uevent

Quoted 14 lines

Documentation/ABI/testing/usb-charger-uevent line 3

Quoted 11 lines
Documentation/ABI/testing/usb-charger-uevent new file +3 -0
new file mode 100644
index 000000000000..93ffd3a54a7f
@@ -0,0 +1,45 @@
+What:		Raise a uevent when a USB charger is inserted or removed
+Date:		2019-11-11
+KernelVersion:	5.5

No new features for 5.5, this would be 5.6, right?

Yes, thanks.

Peter