diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-22 15:04:56 +0200 |
| commit | b99374450c03bf5081b88995d91d34fb9b2fd040 (patch) | |
| tree | b6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /include/linux/exynos_audio.h | |
| parent | a39819e88ea4546218b581d7f061a99ca91d825b (diff) | |
| parent | e2f984e707f517f24041b70018770b20b71cb6a6 (diff) | |
| download | kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2 | |
Merge remote-tracking branch 'github/cm-11.0'
Conflicts:
firmware/Makefile
firmware/epen/W9001_B713.bin.ihex
firmware/epen/W9001_B746.bin.ihex
firmware/epen/W9001_B746JD.bin.ihex
firmware/epen/W9001_B746L.bin.ihex
firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'include/linux/exynos_audio.h')
| -rw-r--r-- | include/linux/exynos_audio.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/exynos_audio.h b/include/linux/exynos_audio.h index b510119..c429ffc 100644 --- a/include/linux/exynos_audio.h +++ b/include/linux/exynos_audio.h @@ -22,6 +22,15 @@ #ifndef _LINUX_EXYNOS_T0_SOUND_H #define _LINUX_EXYNOS_T0_SOUND_H +#ifdef CONFIG_USE_ADC_DET +struct jack_zone { + unsigned int adc_high; + unsigned int delay_ms; + unsigned int check_count; + unsigned int jack_type; +}; +#endif + struct exynos_sound_platform_data { void (*set_lineout_switch) (int on); void (*set_ext_main_mic) (int on); @@ -33,6 +42,11 @@ struct exynos_sound_platform_data { #endif int dcs_offset_l; int dcs_offset_r; +#ifdef CONFIG_USE_ADC_DET + struct jack_zone *zones; + int num_zones; + int use_jackdet_type; +#endif }; #ifdef CONFIG_EXYNOS_SOUND_PLATFORM_DATA |