diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2012-02-12 22:38:18 -0800 |
|---|---|---|
| committer | Lokesh Pathak <lpathak@nvidia.com> | 2012-02-23 05:08:59 -0800 |
| commit | d5f4cd89d4c6b15f704f4df4cf5024715e1e673a (patch) | |
| tree | e804125cb0098b482aa0591f4e99eb04ada68902 /sound/soc/codecs/tlv320aic326x.h | |
| parent | 98af80ca1135158a1de979c1917d50559672aef6 (diff) | |
asoc: codecs: aic326x: configure ASI2 as master
configure ASI2 as master and add missing dapm widgets and routes
Change-Id: If2f9c8361888ec40147cd5537f435c91e50cbcc8
Signed-off-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-on: http://git-master/r/84538
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc/codecs/tlv320aic326x.h')
| -rw-r--r-- | sound/soc/codecs/tlv320aic326x.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic326x.h b/sound/soc/codecs/tlv320aic326x.h index d81b34f8eb34..82f1fb73e908 100644 --- a/sound/soc/codecs/tlv320aic326x.h +++ b/sound/soc/codecs/tlv320aic326x.h @@ -25,6 +25,8 @@ #define AUDIO_NAME "aic3262" #define AIC3262_VERSION "1.1" +#define AIC3262_ASI2_MASTER 1 + /* Enable this macro allow for different ASI formats */ /*#define ASI_MULTI_FMT*/ #undef ASI_MULTI_FMT @@ -176,6 +178,7 @@ page, so fix that before commenting this line*/ #define HF_CLK_TRIM_R2 30 #define HF_CLK_TRIM_R3 31 #define HF_CLK_TRIM_R4 32 +#define ADC_FLAG_R1 36 #define DAC_FLAG_R1 37 #define DAC_FLAG_R2 38 @@ -538,6 +541,7 @@ struct aic3262_priv { u32 active_count; int current_dac_config[MAX_ASI_COUNT]; int current_adc_config[MAX_ASI_COUNT]; + int current_config; struct aic3262_asi_data asiCtxt[MAX_ASI_COUNT]; enum AIC3262_PLL_OPTION aic3262_pllclkin_option; u8 dac_clkin_option; @@ -552,6 +556,7 @@ struct aic3262_priv { u8 spk_amp; struct spi_device *spi; struct snd_soc_jack *headset_jack; + int codec_audio_mode; #if defined(LOCAL_REG_ACCESS) void *control_data; #endif |