diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-27 12:36:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-27 12:36:06 +0200 |
| commit | 4dce3c4b9b581c4e54d3de083e1a97cb8ebf8c16 (patch) | |
| tree | 71d9ea7878f8c2501dbaed5d21d5d3ecaa582ff3 /drivers/phy/broadcom | |
| parent | 6bd5bb1ede67a9681d975c46c55bd8ebaa0926da (diff) | |
| parent | 4a4a87146a07c866ad2ef49cc32296e6583b1cee (diff) | |
Merge tag 'extcon-next-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into usb-next
Chanwoo writes:
Update extcon for 4.15
Detailed description for this pull request:
1. Split out extcon header file for consumer and provider device
: The extcon has two type of extcon devices as following.
- 'extcon provider deivce' adds new extcon device and detect
the state/properties of external connector. Also, it notifies the
state/properties to the extcon consumer device.
- 'extcon consumer device' gets the change state/properties
from extcon provider device.
Prior to that, include/linux/extcon.h contains all exported API
for both provider and consumer device driver. To clarify the meaning
of header file and to remove the wrong use-case on consumer device.
- include/linux/extcon-provider.h includes API for the provider device driver.
- include/linux/extcon.h includes the API for the consumer device driver.
2. Support the SmartDock accessory on extcon-max77843.c device driver
- Support the SmartDock accessory which detects following connectors
at the same time.
: USB host throught USB hub for mouse, keyboard and so on.
: MHL connector for video output.
: Charger connector for battery charging.
- It tested with Unitek Y-2165 MHL+OTG Hub Smart Phone Dock.
3. Fix the minor issue of extcon driver
- Delete the unneeded initialization in extcon-max14577.
- Make extcon_info static const in order to fix the warning.
Diffstat (limited to 'drivers/phy/broadcom')
| -rw-r--r-- | drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c index d099a0c8cee5..7ceea5ae2704 100644 --- a/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c +++ b/drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c @@ -12,7 +12,7 @@ */ #include <linux/delay.h> -#include <linux/extcon.h> +#include <linux/extcon-provider.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/init.h> |