diff options
-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 @@ | |||
1 | /* | ||
2 | * wm8960.h -- WM8960 Soc Audio driver platform data | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef _WM8960_PDATA_H | ||
10 | #define _WM8960_PDATA_H | ||
11 | |||
12 | #define WM8960_DRES_400R 0 | ||
13 | #define WM8960_DRES_200R 1 | ||
14 | #define WM8960_DRES_600R 2 | ||
15 | #define WM8960_DRES_150R 3 | ||
16 | #define WM8960_DRES_MAX 3 | ||
17 | |||
18 | struct wm8960_data { | ||
19 | int dres; /* Discharge resistance for headphone outputs */ | ||
20 | }; | ||
21 | |||
22 | #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 @@ | |||
22 | #include <sound/soc-dapm.h> | 22 | #include <sound/soc-dapm.h> |
23 | #include <sound/initval.h> | 23 | #include <sound/initval.h> |
24 | #include <sound/tlv.h> | 24 | #include <sound/tlv.h> |
25 | #include <sound/wm8960.h> | ||
25 | 26 | ||
26 | #include "wm8960.h" | 27 | #include "wm8960.h" |
27 | 28 | ||
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 @@ | |||
114 | extern struct snd_soc_dai wm8960_dai; | 114 | extern struct snd_soc_dai wm8960_dai; |
115 | extern struct snd_soc_codec_device soc_codec_dev_wm8960; | 115 | extern struct snd_soc_codec_device soc_codec_dev_wm8960; |
116 | 116 | ||
117 | #define WM8960_DRES_400R 0 | ||
118 | #define WM8960_DRES_200R 1 | ||
119 | #define WM8960_DRES_600R 2 | ||
120 | #define WM8960_DRES_150R 3 | ||
121 | #define WM8960_DRES_MAX 3 | ||
122 | |||
123 | struct wm8960_data { | ||
124 | int dres; | ||
125 | }; | ||
126 | |||
127 | #endif | 117 | #endif |