diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 12:48:23 +1000 |
| commit | 8e49fbd70c5888996be433512ab44666af708a23 (patch) | |
| tree | f7ee567bd8e35a785992c18c80883b5b6570b3d4 /sound/soc/codecs/wm8580.h | |
| parent | a07527daf4b80514fb8b898f073c843187e47f80 (diff) | |
| parent | 135e44aaa47c22b66c8d2acb54da1106a6c17598 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'sound/soc/codecs/wm8580.h')
| -rw-r--r-- | sound/soc/codecs/wm8580.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sound/soc/codecs/wm8580.h b/sound/soc/codecs/wm8580.h index 0dfb5ddde6a2..1d34656d0dcb 100644 --- a/sound/soc/codecs/wm8580.h +++ b/sound/soc/codecs/wm8580.h @@ -19,20 +19,17 @@ #define WM8580_PLLB 2 #define WM8580_MCLK 1 -#define WM8580_DAC_CLKSEL 2 -#define WM8580_CLKOUTSRC 3 +#define WM8580_CLKOUTSRC 2 -#define WM8580_CLKSRC_MCLK 1 -#define WM8580_CLKSRC_PLLA 2 -#define WM8580_CLKSRC_PLLB 3 -#define WM8580_CLKSRC_OSC 4 -#define WM8580_CLKSRC_NONE 5 +#define WM8580_CLKSRC_MCLK 1 +#define WM8580_CLKSRC_PLLA 2 +#define WM8580_CLKSRC_PLLB 3 +#define WM8580_CLKSRC_OSC 4 +#define WM8580_CLKSRC_NONE 5 +#define WM8580_CLKSRC_ADCMCLK 6 #define WM8580_DAI_PAIFRX 0 #define WM8580_DAI_PAIFTX 1 -extern struct snd_soc_dai wm8580_dai[]; -extern struct snd_soc_codec_device soc_codec_dev_wm8580; - #endif |