diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:52:38 -0400 |
| commit | 710421cc7d295cc59eb2676fe2ba3bc3252c124e (patch) | |
| tree | 4aa11cd7ee64b394871195cb585f16700553f540 /include/sound/max98095.h | |
| parent | d7ef64a9f9987b29e3d911369a9d40122d5be2dd (diff) | |
| parent | f686c74cc3e78349d16d46fc72807354574b1516 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
ASoC: core: Don't set "(null)" as a driver name
ALSA: hda - Use LPIB for ATI/AMD chipsets as default
Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
ASoC: Tegra: Fix compile when debugfs not enabled
ASoC: spdif-dit: Add missing MODULE_*
SOUND: OSS: Remove Au1550 driver.
ALSA: hda - add Intel Panther Point HDMI codec id
ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
ALSA: hda - Fix input-src parse in patch_analog.c
ASoC: davinci-mcasp: enable ping-pong SRAM buffers
ASoC: add iPAQ hx4700 machine driver
ASoC: Asahi Kasei AK4641 codec driver
ALSA: hda - Enable Realtek ALC269 codec input layer beep
ALSA: intel8x0m: enable AMD8111 modem
ALSA: HDA: Add jack detection for HDMI
ALSA: sound, core, pcm_lib: fix xrun_log
ASoC: Max98095: Move existing NULL check before pointer dereference.
ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
ALSA: usb-audio - Add support for USB X-Fi S51 Pro
...
Diffstat (limited to 'include/sound/max98095.h')
| -rw-r--r-- | include/sound/max98095.h | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/include/sound/max98095.h b/include/sound/max98095.h new file mode 100644 index 000000000000..7513a42dd4aa --- /dev/null +++ b/include/sound/max98095.h | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | /* | ||
| 2 | * Platform data for MAX98095 | ||
| 3 | * | ||
| 4 | * Copyright 2011 Maxim Integrated Products | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms of the GNU General Public License as published by the | ||
| 8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 9 | * option) any later version. | ||
| 10 | * | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __SOUND_MAX98095_PDATA_H__ | ||
| 14 | #define __SOUND_MAX98095_PDATA_H__ | ||
| 15 | |||
| 16 | /* Equalizer filter response configuration */ | ||
| 17 | struct max98095_eq_cfg { | ||
| 18 | const char *name; | ||
| 19 | unsigned int rate; | ||
| 20 | u16 band1[5]; | ||
| 21 | u16 band2[5]; | ||
| 22 | u16 band3[5]; | ||
| 23 | u16 band4[5]; | ||
| 24 | u16 band5[5]; | ||
| 25 | }; | ||
| 26 | |||
| 27 | /* Biquad filter response configuration */ | ||
| 28 | struct max98095_biquad_cfg { | ||
| 29 | const char *name; | ||
| 30 | unsigned int rate; | ||
| 31 | u16 band1[5]; | ||
| 32 | u16 band2[5]; | ||
| 33 | }; | ||
| 34 | |||
| 35 | /* codec platform data */ | ||
| 36 | struct max98095_pdata { | ||
| 37 | |||
| 38 | /* Equalizers for DAI1 and DAI2 */ | ||
| 39 | struct max98095_eq_cfg *eq_cfg; | ||
| 40 | unsigned int eq_cfgcnt; | ||
| 41 | |||
| 42 | /* Biquad filter for DAI1 and DAI2 */ | ||
| 43 | struct max98095_biquad_cfg *bq_cfg; | ||
| 44 | unsigned int bq_cfgcnt; | ||
| 45 | |||
| 46 | /* Analog/digital microphone configuration: | ||
| 47 | * 0 = analog microphone input (normal setting) | ||
| 48 | * 1 = digital microphone input | ||
| 49 | */ | ||
| 50 | unsigned int digmic_left_mode:1; | ||
| 51 | unsigned int digmic_right_mode:1; | ||
| 52 | }; | ||
| 53 | |||
| 54 | #endif | ||