Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Hans de Goede <hdegoede@redhat.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Hans de Goede and committed by
Lee Jones
a908a716 505eb8df

+1 -11
+1 -2
MAINTAINERS
··· 19378 19378 F: Documentation/hwmon/wm83??.rst 19379 19379 F: arch/arm/mach-s3c/mach-crag6410* 19380 19380 F: drivers/clk/clk-wm83*.c 19381 - F: drivers/extcon/extcon-arizona.c 19382 19381 F: drivers/gpio/gpio-*wm*.c 19383 19382 F: drivers/gpio/gpio-arizona.c 19384 19383 F: drivers/hwmon/wm83??-hwmon.c ··· 19401 19402 F: include/linux/regulator/arizona* 19402 19403 F: include/linux/wm97xx.h 19403 19404 F: include/sound/wm????.h 19404 - F: sound/soc/codecs/arizona.? 19405 + F: sound/soc/codecs/arizona* 19405 19406 F: sound/soc/codecs/cs47l24* 19406 19407 F: sound/soc/codecs/wm* 19407 19408
-8
drivers/extcon/Kconfig
··· 21 21 help 22 22 Say Y here to enable extcon device driver based on ADC values. 23 23 24 - config EXTCON_ARIZONA 25 - tristate "Wolfson Arizona EXTCON support" 26 - depends on MFD_ARIZONA && INPUT && SND_SOC 27 - help 28 - Say Y here to enable support for external accessory detection 29 - with Wolfson Arizona devices. These are audio CODECs with 30 - advanced audio accessory detection support. 31 - 32 24 config EXTCON_AXP288 33 25 tristate "X-Power AXP288 EXTCON support" 34 26 depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI
-1
drivers/extcon/Makefile
··· 6 6 obj-$(CONFIG_EXTCON) += extcon-core.o 7 7 extcon-core-objs += extcon.o devres.o 8 8 obj-$(CONFIG_EXTCON_ADC_JACK) += extcon-adc-jack.o 9 - obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o 10 9 obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o 11 10 obj-$(CONFIG_EXTCON_FSA9480) += extcon-fsa9480.o 12 11 obj-$(CONFIG_EXTCON_GPIO) += extcon-gpio.o
drivers/extcon/extcon-arizona.c sound/soc/codecs/arizona-jack.c