OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The main change for this rc is notify USB charger present when 

vbus is there using new USB charger API.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJZ9ojfAAoJEEhZKYFQ1nG70g4IAJNeDnpWkzNVsM5Y8yQyWZSm
 sAULcX1hRSu71RzCRsXEnJ4Ur5XGrHdA67wJFyJV5JMlh2l1b+3pZfd22zv5XQJS
 3KPUQ4D89ZMEVzoaH6/mNM7TbIlGBS5f8g1HO+duevkVxoL2Fk1/4N04VousPhj9
 HZgdZzUft+5HMsosqMCH2s2KixwzNsmtq3pz5sadXI0yt3j4pqQwboKfOjUX+BRP
 Wh/ATvL+MpyqBn9TYGXRVXY4JKtA7h626OUPjqj6eM0lreXIcANA1eraOed79zR1
 hyTvz+GG7c+bHWOBnntuGsZp0UHUeAqpLEsV321PIqhpkqkFcGPl3a+t9mgLaJ4=
 =efLD
 -----END PGP SIGNATURE-----

Merge tag 'usb-ci-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

The main change for this rc is notify USB charger present when
vbus is there using new USB charger API.
This commit is contained in:
Greg Kroah-Hartman 2017-10-30 09:47:40 +01:00
parent 3a851c0312 2a53e060a0
commit 1f4d31f9aa
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/chipidea/Kconfig
View File

@ -9,7 +9,7 @@ config USB_CHIPIDEA
Dual-role switch (ID, OTG FSM, sysfs), Host-only, and
Peripheral-only.
When compiled dynamically, the module will be called ci-hdrc.ko.
When compiled dynamically, the module will be called ci_hdrc.ko.
if USB_CHIPIDEA

4
drivers/usb/chipidea/udc.c
View File

@ -1526,6 +1526,10 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
gadget_ready = 1;
spin_unlock_irqrestore(&ci->lock, flags);
if (ci->usb_phy)
usb_phy_set_charger_state(ci->usb_phy, is_active ?
USB_CHARGER_PRESENT : USB_CHARGER_ABSENT);
if (gadget_ready) {
if (is_active) {
pm_runtime_get_sync(&_gadget->dev);