diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-24 07:10:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 01:30:37 -0400 |
commit | a9ba615134ad32254fae84f16e1751854755135c (patch) | |
tree | af253bdc450833158c1cac1bc71a484e9ec070bb /include/sound | |
parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) |
ASoC: Rename WM8915 to WM8996
For marketing reasons the part will be called WM8996. In order to avoid
user confusion rename the driver to reflect this.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/wm8996.h (renamed from include/sound/wm8915.h) | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/sound/wm8915.h b/include/sound/wm8996.h index 5817d762f6f3..ea4d88f43975 100644 --- a/include/sound/wm8915.h +++ b/include/sound/wm8996.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/wm8915.h -- Platform data for WM8915 | 2 | * linux/sound/wm8996.h -- Platform data for WM8996 |
3 | * | 3 | * |
4 | * Copyright 2011 Wolfson Microelectronics. PLC. | 4 | * Copyright 2011 Wolfson Microelectronics. PLC. |
5 | * | 5 | * |
@@ -8,14 +8,14 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef __LINUX_SND_WM8903_H | 11 | #ifndef __LINUX_SND_WM8996_H |
12 | #define __LINUX_SND_WM8903_H | 12 | #define __LINUX_SND_WM8996_H |
13 | 13 | ||
14 | enum wm8915_inmode { | 14 | enum wm8996_inmode { |
15 | WM8915_DIFFERRENTIAL_1 = 0, /* IN1xP - IN1xN */ | 15 | WM8996_DIFFERRENTIAL_1 = 0, /* IN1xP - IN1xN */ |
16 | WM8915_INVERTING = 1, /* IN1xN */ | 16 | WM8996_INVERTING = 1, /* IN1xN */ |
17 | WM8915_NON_INVERTING = 2, /* IN1xP */ | 17 | WM8996_NON_INVERTING = 2, /* IN1xP */ |
18 | WM8915_DIFFERENTIAL_2 = 3, /* IN2xP - IN2xP */ | 18 | WM8996_DIFFERENTIAL_2 = 3, /* IN2xP - IN2xP */ |
19 | }; | 19 | }; |
20 | 20 | ||
21 | /** | 21 | /** |
@@ -25,23 +25,23 @@ enum wm8915_inmode { | |||
25 | * Configurations are expected to be generated using the ReTune Mobile | 25 | * Configurations are expected to be generated using the ReTune Mobile |
26 | * control panel in WISCE - see http://www.wolfsonmicro.com/wisce/ | 26 | * control panel in WISCE - see http://www.wolfsonmicro.com/wisce/ |
27 | */ | 27 | */ |
28 | struct wm8915_retune_mobile_config { | 28 | struct wm8996_retune_mobile_config { |
29 | const char *name; | 29 | const char *name; |
30 | int rate; | 30 | int rate; |
31 | u16 regs[20]; | 31 | u16 regs[20]; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | #define WM8915_SET_DEFAULT 0x10000 | 34 | #define WM8996_SET_DEFAULT 0x10000 |
35 | 35 | ||
36 | struct wm8915_pdata { | 36 | struct wm8996_pdata { |
37 | int irq_flags; /** Set IRQ trigger flags; default active low */ | 37 | int irq_flags; /** Set IRQ trigger flags; default active low */ |
38 | 38 | ||
39 | int ldo_ena; /** GPIO for LDO1; -1 for none */ | 39 | int ldo_ena; /** GPIO for LDO1; -1 for none */ |
40 | 40 | ||
41 | int micdet_def; /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */ | 41 | int micdet_def; /** Default MICDET_SRC/HP1FB_SRC/MICD_BIAS */ |
42 | 42 | ||
43 | enum wm8915_inmode inl_mode; | 43 | enum wm8996_inmode inl_mode; |
44 | enum wm8915_inmode inr_mode; | 44 | enum wm8996_inmode inr_mode; |
45 | 45 | ||
46 | u32 spkmute_seq; /** Value for register 0x802 */ | 46 | u32 spkmute_seq; /** Value for register 0x802 */ |
47 | 47 | ||
@@ -49,7 +49,7 @@ struct wm8915_pdata { | |||
49 | u32 gpio_default[5]; | 49 | u32 gpio_default[5]; |
50 | 50 | ||
51 | int num_retune_mobile_cfgs; | 51 | int num_retune_mobile_cfgs; |
52 | struct wm8915_retune_mobile_config *retune_mobile_cfgs; | 52 | struct wm8996_retune_mobile_config *retune_mobile_cfgs; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | #endif | 55 | #endif |