diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-04 14:47:35 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 11:17:37 +0200 |
| commit | 550bf8fec5f80c5569482a19e3efb27415f612e4 (patch) | |
| tree | ec22eaf93e14a987e98f5144760f15b4ab4d9515 /drivers/misc | |
| parent | 2bed15c8dc581b60f32d69ce207e14fbaf0542aa (diff) | |
Input: Add AB8500 AV Acc. Detection as platform drv
Adds AV Accessory detection driver functionality as a platform driver.
Driver allows detection of basic AV-Accessory connected to 3.5mm
AV-Connector. Supported accessories include headphone, headset, video and
carkit.
Driver controls the audio-in/video-out switch based on the
detected accessory type and notifies about button presses from
basic headsets (No ECI Support).
Accessory status and button presses are reported as standard input
events, if AB8500 ASoC Machine driver is configured.
For accessory properties reporting, ALSA JACK definitions (SND_JACK_*)
are used to report the features supported by the attached accessory.
Button presses are reported with KEY_MEDIA keycode.
Depends on: http://gerrit.lud.stericsson.com/gerrit/16910 for GPIO framework update.
ST-Ericsson ID: ER 275366
Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com>
Change-Id: Ie1c68120fc718710ecac2d3dafe4f3e7b1a53ac1
Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16256
Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com>
Conflicts:
arch/arm/mach-ux500/board-mop500-regulators.c
arch/arm/mach-ux500/board-mop500.c
sound/soc/ux500/ux500_ab8500.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/audio_io_dev/ste_audio_io_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/audio_io_dev/ste_audio_io_core.c b/drivers/misc/audio_io_dev/ste_audio_io_core.c index 129cd041e24..15d0273fc94 100644 --- a/drivers/misc/audio_io_dev/ste_audio_io_core.c +++ b/drivers/misc/audio_io_dev/ste_audio_io_core.c @@ -90,11 +90,11 @@ int ste_audio_io_core_api_init_data(struct platform_device *pdev) goto free_regulator_vdmic_vamic1_vamic2; } regulator_avsource = regulator_get(ptr_audio_codec_cnxt->dev, - "vcc-N2158"); + "vcc-avswitch"); if (IS_ERR(regulator_avsource)) { status = PTR_ERR(regulator_avsource); dev_err(ptr_audio_codec_cnxt->dev, - "Register error for vcc-N2158=%d", status); + "Register error for vcc-avswitch=%d", status); goto free_regulator_vdmic_vamic1_vamic2_vaudio; } |