Commit a908a716 authored by Hans de Goede's avatar Hans de Goede Committed by Lee Jones
Browse files

ASoC/extcon: arizona: Move arizona jack code to sound/soc/codecs/arizona-jack.c 



The jack handling for arizona codecs is being refactored so that it is
done directly by the codec drivers, instead of having an extcon-driver
bind to a separate "arizona-extcon" child-device for this.

drivers/mfd/arizona-core.c has already been updated to no longer
instantiate an "arizona-extcon" child-device for the arizona codecs.

This means that the "arizona-extcon" driver is no longer useful
(there are no longer any devices for it to bind to).

This commit drops the extcon Kconfig / Makefile bits and moves
drivers/extcon/extcon-arizona.c to sound/soc/codecs/arizona-jack.c .

This is a preparation patch for converting the arizona extcon-driver into
a helper library for letting the arizona codec-drivers directly report jack
state through the standard sound/soc/soc-jack.c functions.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 505eb8df

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -19378,7 +19378,6 @@ F: Documentation/devicetree/bindings/sound/wlf,arizona.yaml 
F:	Documentation/hwmon/wm83??.rst

F:	arch/arm/mach-s3c/mach-crag6410*

F:	drivers/clk/clk-wm83*.c

F:	drivers/extcon/extcon-arizona.c

F:	drivers/gpio/gpio-*wm*.c

F:	drivers/gpio/gpio-arizona.c

F:	drivers/hwmon/wm83??-hwmon.c
@@ -19402,7 +19401,7 @@ F: include/linux/mfd/wm8400* 
F:	include/linux/regulator/arizona*

F:	include/linux/wm97xx.h

F:	include/sound/wm????.h

F:	sound/soc/codecs/arizona.?

F:	sound/soc/codecs/arizona*

F:	sound/soc/codecs/cs47l24*

F:	sound/soc/codecs/wm*

























drivers/extcon/Kconfig



+0
−8






























Original line number
Diff line number
Diff line







@@ -21,14 +21,6 @@ config EXTCON_ADC_JACK







	help









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



















config EXTCON_ARIZONA









	tristate "Wolfson Arizona EXTCON support"









	depends on MFD_ARIZONA && INPUT && SND_SOC









	help









	  Say Y here to enable support for external accessory detection









	  with Wolfson Arizona devices. These are audio CODECs with









	  advanced audio accessory detection support.



















config EXTCON_AXP288









	tristate "X-Power AXP288 EXTCON support"









	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
































drivers/extcon/Makefile



+0
−1






























Original line number
Diff line number
Diff line







@@ -6,7 +6,6 @@







obj-$(CONFIG_EXTCON)		+= extcon-core.o









extcon-core-objs		+= extcon.o devres.o









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









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









obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o









obj-$(CONFIG_EXTCON_FSA9480)	+= extcon-fsa9480.o









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