Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dce3c4b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-4.15' of... 

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.
parents 6bd5bb1e 4a4a8714

drivers/extcon/extcon-adc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/workqueue.h>

#include <linux/iio/consumer.h>

#include <linux/extcon/extcon-adc-jack.h>

#include <linux/extcon.h>

#include <linux/extcon-provider.h>



/**

 * struct adc_jack_data - internal data for adc_jack device driver

drivers/extcon/extcon-arizona.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/property.h>

#include <linux/regulator/consumer.h>

#include <linux/extcon.h>

#include <linux/extcon-provider.h>



#include <sound/soc.h>

drivers/extcon/extcon-axp288.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/notifier.h>

#include <linux/extcon.h>

#include <linux/extcon-provider.h>

#include <linux/regmap.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

drivers/extcon/extcon-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/extcon.h>

#include <linux/extcon-provider.h>

#include <linux/extcon/extcon-gpio.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

drivers/extcon/extcon-intel-cht-wc.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * more details.

 */



#include <linux/extcon.h>

#include <linux/extcon-provider.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/mfd/intel_soc_pmic.h>