Commit 52cb6a20 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Merge tag 'extcon-next-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v3.14

This patchset add new driver of extcon-max14577.c which detect various external
connector and fix minor issue of extcon provider driver(extcon-arizona/palams/
gpio.c). Also, update documentation of previous 'switch' porting guide and
extcon git repository url.

Detailed description for patchset:
- New driver of extcon-max14577.c
: Add extcon-max14577.c drvier to support Maxim MUIC(Micro USB Interface
Controller) which detect USB/TA/JIG/AUDIO-DOCK and additional accessory
according to each resistance when connected external connector.

- extcon-arizoan.c driver
: Code clean to use define macro instead of hex value
: Fix minor issue to reset back to our staring state
: Fix race with microphone detection and removal

- extcon-palmas.c driver
: Fix minor issue and renaming compatible string of Devicetree

- extcon-gpio.c driver
: Fix bug about ordering initialization of gpio pin on probe()
: Send uevent after wakeup from suspend state because some SoC
  haven't wakeup interrupt on suspend state.

- Documentation (Documentation/extcon/porting-android-switch-class)
: Fix switch class porting guide

- Update extcon git repository url
parents 19c05573 6544dfa5

Documentation/devicetree/bindings/extcon/extcon-palmas.txt

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ EXTCON FOR PALMAS/TWL CHIPS 


PALMAS USB COMPARATOR

Required Properties:

 - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"

 - compatible: should contain one of:

   * "ti,palmas-usb-vid".

   * "ti,twl6035-usb-vid".

   * "ti,palmas-usb" (DEPRECATED - use "ti,palmas-usb-vid").

   * "ti,twl6035-usb" (DEPRECATED - use "ti,twl6035-usb-vid").



Optional Properties:

 - ti,wakeup : To enable the wakeup comparator in probe

Documentation/extcon/porting-android-switch-class

+3 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ so that they are still compatible with legacy userspace processes. 
	Extcon's extended features for switch device drivers with

	complex features usually required magic numbers in state

	value of switch_dev. With extcon, such magic numbers that

	support multiple cables (

	support multiple cables are no more required or supported.



  1. Define cable names at edev->supported_cable.

  2. (Recommended) remove print_state callback.
@@ -114,11 +114,8 @@ exclusive, the two cables cannot be in ATTACHED state simulteneously. 


****** ABI Location



  If "CONFIG_ANDROID" is enabled and "CONFIG_ANDROID_SWITCH" is

disabled, /sys/class/switch/* are created as symbolic links to

/sys/class/extcon/*. Because CONFIG_ANDROID_SWITCH creates

/sys/class/switch directory, we disable symboling linking if

CONFIG_ANDROID_SWITCH is enabled.

  If "CONFIG_ANDROID" is enabled, /sys/class/switch/* are created

as symbolic links to /sys/class/extcon/*.



  The two files of switch class, name and state, are provided with

extcon, too. When the multistate support (STEP 2 of CHAPTER 1.) is

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3330,6 +3330,7 @@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON) 
M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Chanwoo Choi <cw00.choi@samsung.com>

L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git

S:	Maintained

F:	drivers/extcon/

F:	Documentation/extcon/

drivers/extcon/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ config EXTCON_ADC_JACK 
	help

	  Say Y here to enable extcon device driver based on ADC values.



config EXTCON_MAX14577

	tristate "MAX14577 EXTCON Support"

	depends on MFD_MAX14577

	select IRQ_DOMAIN

	select REGMAP_I2C

	help

	  If you say yes here you get support for the MUIC device of

	  Maxim MAX14577 PMIC. The MAX14577 MUIC is a USB port accessory

	  detector and switch.



config EXTCON_MAX77693

	tristate "MAX77693 EXTCON Support"

	depends on MFD_MAX77693 && INPUT

drivers/extcon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_OF_EXTCON) += of_extcon.o 
obj-$(CONFIG_EXTCON)		+= extcon-class.o

obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o

obj-$(CONFIG_EXTCON_MAX14577)	+= extcon-max14577.o

obj-$(CONFIG_EXTCON_MAX77693)	+= extcon-max77693.o

obj-$(CONFIG_EXTCON_MAX8997)	+= extcon-max8997.o

obj-$(CONFIG_EXTCON_ARIZONA)	+= extcon-arizona.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE