diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-03 11:43:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-03 17:08:42 +0000 |
| commit | b6877a477d356a7c07a6c173d58c34a0a6abb086 (patch) | |
| tree | 0f939dca004ae477cb4b1bd022b5a365d44b7dbf | |
| parent | ASoC: Prettify wm8960 logging (diff) | |
| download | linux-dev-b6877a477d356a7c07a6c173d58c34a0a6abb086.tar.xz linux-dev-b6877a477d356a7c07a6c173d58c34a0a6abb086.zip | |
ASoC: Move WM8960 platform data into include/sound
Avoids machine files having to peer into sound/soc which is a bit
rude and icky.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | include/sound/wm8960.h | 22 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8960.h | 10 |
3 files changed, 23 insertions, 10 deletions
diff --git a/include/sound/wm8960.h b/include/sound/wm8960.h new file mode 100644 index 000000000000..808a258e696c --- /dev/null +++ b/include/sound/wm8960.h @@ -0,0 +1,22 @@ +/* + * wm8960.h -- WM8960 Soc Audio driver platform data + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _WM8960_PDATA_H +#define _WM8960_PDATA_H + +#define WM8960_DRES_400R 0 +#define WM8960_DRES_200R 1 +#define WM8960_DRES_600R 2 +#define WM8960_DRES_150R 3 +#define WM8960_DRES_MAX 3 + +struct wm8960_data { + int dres; /* Discharge resistance for headphone outputs */ +}; + +#endif diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 35171e4354a2..cf5cb3f73b69 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -22,6 +22,7 @@ #include <sound/soc-dapm.h> #include <sound/initval.h> #include <sound/tlv.h> +#include <sound/wm8960.h> #include "wm8960.h" diff --git a/sound/soc/codecs/wm8960.h b/sound/soc/codecs/wm8960.h index c9af56c9d9d4..d67bfe1300da 100644 --- a/sound/soc/codecs/wm8960.h +++ b/sound/soc/codecs/wm8960.h @@ -114,14 +114,4 @@ extern struct snd_soc_dai wm8960_dai; extern struct snd_soc_codec_device soc_codec_dev_wm8960; -#define WM8960_DRES_400R 0 -#define WM8960_DRES_200R 1 -#define WM8960_DRES_600R 2 -#define WM8960_DRES_150R 3 -#define WM8960_DRES_MAX 3 - -struct wm8960_data { - int dres; -}; - #endif |