1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * wm9713.c -- ALSA Soc WM9713 codec support 2 * wm9713.c -- ALSA Soc WM9713 codec support
4 * 3 *
5 * Copyright 2006-10 Wolfson Microelectronics 4 * Copyright 2006-10 Wolfson Microelectronics PLC.
6 * Author: Liam Girdwood <lrg@slimlogic.co.uk> 5 * Author: Liam Girdwood <lrg@slimlogic.co.uk>
7 * 6 *
>> 7 * This program is free software; you can redistribute it and/or modify it
>> 8 * under the terms of the GNU General Public License as published by the
>> 9 * Free Software Foundation; either version 2 of the License, or (at your
>> 10 * option) any later version.
>> 11 *
8 * Features:- 12 * Features:-
9 * 13 *
10 * o Support for AC97 Codec, Voice DAC and A 14 * o Support for AC97 Codec, Voice DAC and Aux DAC
11 * o Support for DAPM 15 * o Support for DAPM
12 */ 16 */
13 17
14 #include <linux/init.h> 18 #include <linux/init.h>
15 #include <linux/slab.h> 19 #include <linux/slab.h>
16 #include <linux/mfd/wm97xx.h> 20 #include <linux/mfd/wm97xx.h>
17 #include <linux/module.h> 21 #include <linux/module.h>
18 #include <linux/device.h> 22 #include <linux/device.h>
19 #include <linux/regmap.h> 23 #include <linux/regmap.h>
20 #include <sound/core.h> 24 #include <sound/core.h>
21 #include <sound/pcm.h> 25 #include <sound/pcm.h>
22 #include <sound/ac97_codec.h> 26 #include <sound/ac97_codec.h>
23 #include <sound/ac97/codec.h> 27 #include <sound/ac97/codec.h>
24 #include <sound/ac97/compat.h> 28 #include <sound/ac97/compat.h>
25 #include <sound/initval.h> 29 #include <sound/initval.h>
26 #include <sound/pcm_params.h> 30 #include <sound/pcm_params.h>
27 #include <sound/tlv.h> 31 #include <sound/tlv.h>
28 #include <sound/soc.h> 32 #include <sound/soc.h>
29 33
30 #include "wm9713.h" 34 #include "wm9713.h"
31 35
32 #define WM9713_VENDOR_ID 0x574d4c13 36 #define WM9713_VENDOR_ID 0x574d4c13
33 #define WM9713_VENDOR_ID_MASK 0xffffffff 37 #define WM9713_VENDOR_ID_MASK 0xffffffff
34 38
35 struct wm9713_priv { 39 struct wm9713_priv {
36 struct snd_ac97 *ac97; 40 struct snd_ac97 *ac97;
37 u32 pll_in; /* PLL input frequency */ 41 u32 pll_in; /* PLL input frequency */
38 unsigned int hp_mixer[2]; 42 unsigned int hp_mixer[2];
39 struct mutex lock; 43 struct mutex lock;
40 struct wm97xx_platform_data *mfd_pdata 44 struct wm97xx_platform_data *mfd_pdata;
41 }; 45 };
42 46
43 #define HPL_MIXER 0 47 #define HPL_MIXER 0
44 #define HPR_MIXER 1 48 #define HPR_MIXER 1
45 49
46 static const char *wm9713_mic_mixer[] = {"Ster 50 static const char *wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"};
47 static const char *wm9713_rec_mux[] = {"Stereo 51 static const char *wm9713_rec_mux[] = {"Stereo", "Left", "Right", "Mute"};
48 static const char *wm9713_rec_src[] = 52 static const char *wm9713_rec_src[] =
49 {"Mic 1", "Mic 2", "Line", "Mono In", 53 {"Mic 1", "Mic 2", "Line", "Mono In", "Headphone", "Speaker",
50 "Mono Out", "Zh"}; 54 "Mono Out", "Zh"};
51 static const char *wm9713_rec_gain[] = {"+1.5d 55 static const char *wm9713_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"};
52 static const char *wm9713_alc_select[] = {"Non 56 static const char *wm9713_alc_select[] = {"None", "Left", "Right", "Stereo"};
53 static const char *wm9713_mono_pga[] = {"Vmid" 57 static const char *wm9713_mono_pga[] = {"Vmid", "Zh", "Mono", "Inv"};
54 static const char *wm9713_spk_pga[] = 58 static const char *wm9713_spk_pga[] =
55 {"Vmid", "Zh", "Headphone", "Speaker", 59 {"Vmid", "Zh", "Headphone", "Speaker", "Inv", "Headphone Vmid",
56 "Speaker Vmid", "Inv Vmid"}; 60 "Speaker Vmid", "Inv Vmid"};
57 static const char *wm9713_hp_pga[] = {"Vmid", 61 static const char *wm9713_hp_pga[] = {"Vmid", "Zh", "Headphone",
58 "Headphone Vmid"}; 62 "Headphone Vmid"};
59 static const char *wm9713_out3_pga[] = {"Vmid" 63 static const char *wm9713_out3_pga[] = {"Vmid", "Zh", "Inv 1", "Inv 1 Vmid"};
60 static const char *wm9713_out4_pga[] = {"Vmid" 64 static const char *wm9713_out4_pga[] = {"Vmid", "Zh", "Inv 2", "Inv 2 Vmid"};
61 static const char *wm9713_dac_inv[] = 65 static const char *wm9713_dac_inv[] =
62 {"Off", "Mono", "Speaker", "Left Headp 66 {"Off", "Mono", "Speaker", "Left Headphone", "Right Headphone",
63 "Headphone Mono", "NC", "Vmid"}; 67 "Headphone Mono", "NC", "Vmid"};
64 static const char *wm9713_bass[] = {"Linear Co 68 static const char *wm9713_bass[] = {"Linear Control", "Adaptive Boost"};
65 static const char *wm9713_ng_type[] = {"Consta 69 static const char *wm9713_ng_type[] = {"Constant Gain", "Mute"};
66 static const char *wm9713_mic_select[] = {"Mic 70 static const char *wm9713_mic_select[] = {"Mic 1", "Mic 2 A", "Mic 2 B"};
67 static const char *wm9713_micb_select[] = {"MP 71 static const char *wm9713_micb_select[] = {"MPB", "MPA"};
68 72
69 static const struct soc_enum wm9713_enum[] = { 73 static const struct soc_enum wm9713_enum[] = {
70 SOC_ENUM_SINGLE(AC97_LINE, 3, 4, wm9713_mic_mi 74 SOC_ENUM_SINGLE(AC97_LINE, 3, 4, wm9713_mic_mixer), /* record mic mixer 0 */
71 SOC_ENUM_SINGLE(AC97_VIDEO, 14, 4, wm9713_rec_ 75 SOC_ENUM_SINGLE(AC97_VIDEO, 14, 4, wm9713_rec_mux), /* record mux hp 1 */
72 SOC_ENUM_SINGLE(AC97_VIDEO, 9, 4, wm9713_rec_m 76 SOC_ENUM_SINGLE(AC97_VIDEO, 9, 4, wm9713_rec_mux), /* record mux mono 2 */
73 SOC_ENUM_SINGLE(AC97_VIDEO, 3, 8, wm9713_rec_s 77 SOC_ENUM_SINGLE(AC97_VIDEO, 3, 8, wm9713_rec_src), /* record mux left 3 */
74 SOC_ENUM_SINGLE(AC97_VIDEO, 0, 8, wm9713_rec_s 78 SOC_ENUM_SINGLE(AC97_VIDEO, 0, 8, wm9713_rec_src), /* record mux right 4*/
75 SOC_ENUM_DOUBLE(AC97_CD, 14, 6, 2, wm9713_rec_ 79 SOC_ENUM_DOUBLE(AC97_CD, 14, 6, 2, wm9713_rec_gain), /* record step size 5 */
76 SOC_ENUM_SINGLE(AC97_PCI_SVID, 14, 4, wm9713_a 80 SOC_ENUM_SINGLE(AC97_PCI_SVID, 14, 4, wm9713_alc_select), /* alc source select 6*/
77 SOC_ENUM_SINGLE(AC97_REC_GAIN, 14, 4, wm9713_m 81 SOC_ENUM_SINGLE(AC97_REC_GAIN, 14, 4, wm9713_mono_pga), /* mono input select 7 */
78 SOC_ENUM_SINGLE(AC97_REC_GAIN, 11, 8, wm9713_s 82 SOC_ENUM_SINGLE(AC97_REC_GAIN, 11, 8, wm9713_spk_pga), /* speaker left input select 8 */
79 SOC_ENUM_SINGLE(AC97_REC_GAIN, 8, 8, wm9713_sp 83 SOC_ENUM_SINGLE(AC97_REC_GAIN, 8, 8, wm9713_spk_pga), /* speaker right input select 9 */
80 SOC_ENUM_SINGLE(AC97_REC_GAIN, 6, 3, wm9713_hp 84 SOC_ENUM_SINGLE(AC97_REC_GAIN, 6, 3, wm9713_hp_pga), /* headphone left input 10 */
81 SOC_ENUM_SINGLE(AC97_REC_GAIN, 4, 3, wm9713_hp 85 SOC_ENUM_SINGLE(AC97_REC_GAIN, 4, 3, wm9713_hp_pga), /* headphone right input 11 */
82 SOC_ENUM_SINGLE(AC97_REC_GAIN, 2, 4, wm9713_ou 86 SOC_ENUM_SINGLE(AC97_REC_GAIN, 2, 4, wm9713_out3_pga), /* out 3 source 12 */
83 SOC_ENUM_SINGLE(AC97_REC_GAIN, 0, 4, wm9713_ou 87 SOC_ENUM_SINGLE(AC97_REC_GAIN, 0, 4, wm9713_out4_pga), /* out 4 source 13 */
84 SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 13, 8, wm97 88 SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 13, 8, wm9713_dac_inv), /* dac invert 1 14 */
85 SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 10, 8, wm97 89 SOC_ENUM_SINGLE(AC97_REC_GAIN_MIC, 10, 8, wm9713_dac_inv), /* dac invert 2 15 */
86 SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, w 90 SOC_ENUM_SINGLE(AC97_GENERAL_PURPOSE, 15, 2, wm9713_bass), /* bass control 16 */
87 SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng 91 SOC_ENUM_SINGLE(AC97_PCI_SVID, 5, 2, wm9713_ng_type), /* noise gate type 17 */
88 SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713 92 SOC_ENUM_SINGLE(AC97_3D_CONTROL, 12, 3, wm9713_mic_select), /* mic selection 18 */
89 SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), / 93 SOC_ENUM_SINGLE_VIRT(2, wm9713_micb_select), /* mic selection 19 */
90 }; 94 };
91 95
92 static const DECLARE_TLV_DB_SCALE(out_tlv, -46 96 static const DECLARE_TLV_DB_SCALE(out_tlv, -4650, 150, 0);
93 static const DECLARE_TLV_DB_SCALE(main_tlv, -3 97 static const DECLARE_TLV_DB_SCALE(main_tlv, -3450, 150, 0);
94 static const DECLARE_TLV_DB_SCALE(misc_tlv, -1 98 static const DECLARE_TLV_DB_SCALE(misc_tlv, -1500, 300, 0);
95 static const DECLARE_TLV_DB_RANGE(mic_tlv, 99 static const DECLARE_TLV_DB_RANGE(mic_tlv,
96 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0), 100 0, 2, TLV_DB_SCALE_ITEM(1200, 600, 0),
97 3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0) 101 3, 3, TLV_DB_SCALE_ITEM(3000, 0, 0)
98 ); 102 );
99 103
100 static const struct snd_kcontrol_new wm9713_sn 104 static const struct snd_kcontrol_new wm9713_snd_ac97_controls[] = {
101 SOC_DOUBLE_TLV("Speaker Playback Volume", AC97 105 SOC_DOUBLE_TLV("Speaker Playback Volume", AC97_MASTER, 8, 0, 31, 1, out_tlv),
102 SOC_DOUBLE("Speaker Playback Switch", AC97_MAS 106 SOC_DOUBLE("Speaker Playback Switch", AC97_MASTER, 15, 7, 1, 1),
103 SOC_DOUBLE_TLV("Headphone Playback Volume", AC 107 SOC_DOUBLE_TLV("Headphone Playback Volume", AC97_HEADPHONE, 8, 0, 31, 1,
104 out_tlv), 108 out_tlv),
105 SOC_DOUBLE("Headphone Playback Switch", AC97_H 109 SOC_DOUBLE("Headphone Playback Switch", AC97_HEADPHONE, 15, 7, 1, 1),
106 SOC_DOUBLE_TLV("Line In Volume", AC97_PC_BEEP, 110 SOC_DOUBLE_TLV("Line In Volume", AC97_PC_BEEP, 8, 0, 31, 1, main_tlv),
107 SOC_DOUBLE_TLV("PCM Playback Volume", AC97_PHO 111 SOC_DOUBLE_TLV("PCM Playback Volume", AC97_PHONE, 8, 0, 31, 1, main_tlv),
108 SOC_SINGLE_TLV("Mic 1 Volume", AC97_MIC, 8, 31 112 SOC_SINGLE_TLV("Mic 1 Volume", AC97_MIC, 8, 31, 1, main_tlv),
109 SOC_SINGLE_TLV("Mic 2 Volume", AC97_MIC, 0, 31 113 SOC_SINGLE_TLV("Mic 2 Volume", AC97_MIC, 0, 31, 1, main_tlv),
110 SOC_SINGLE_TLV("Mic 1 Preamp Volume", AC97_3D_ 114 SOC_SINGLE_TLV("Mic 1 Preamp Volume", AC97_3D_CONTROL, 10, 3, 0, mic_tlv),
111 SOC_SINGLE_TLV("Mic 2 Preamp Volume", AC97_3D_ 115 SOC_SINGLE_TLV("Mic 2 Preamp Volume", AC97_3D_CONTROL, 12, 3, 0, mic_tlv),
112 116
113 SOC_SINGLE("Mic Boost (+20dB) Switch", AC97_LI 117 SOC_SINGLE("Mic Boost (+20dB) Switch", AC97_LINE, 5, 1, 0),
114 SOC_SINGLE("Mic Headphone Mixer Volume", AC97_ 118 SOC_SINGLE("Mic Headphone Mixer Volume", AC97_LINE, 0, 7, 1),
115 119
116 SOC_SINGLE("Capture Switch", AC97_CD, 15, 1, 1 120 SOC_SINGLE("Capture Switch", AC97_CD, 15, 1, 1),
117 SOC_ENUM("Capture Volume Steps", wm9713_enum[5 121 SOC_ENUM("Capture Volume Steps", wm9713_enum[5]),
118 SOC_DOUBLE("Capture Volume", AC97_CD, 8, 0, 31 122 SOC_DOUBLE("Capture Volume", AC97_CD, 8, 0, 31, 0),
119 SOC_SINGLE("Capture ZC Switch", AC97_CD, 7, 1, 123 SOC_SINGLE("Capture ZC Switch", AC97_CD, 7, 1, 0),
120 124
121 SOC_SINGLE_TLV("Capture to Headphone Volume", 125 SOC_SINGLE_TLV("Capture to Headphone Volume", AC97_VIDEO, 11, 7, 1, misc_tlv),
122 SOC_SINGLE("Capture to Mono Boost (+20dB) Swit 126 SOC_SINGLE("Capture to Mono Boost (+20dB) Switch", AC97_VIDEO, 8, 1, 0),
123 SOC_SINGLE("Capture ADC Boost (+20dB) Switch", 127 SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0),
124 128
125 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLA 129 SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0),
126 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_R 130 SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0),
127 SOC_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_ 131 SOC_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_REV, 4, 15, 0),
128 SOC_SINGLE("ALC Attack Time", AC97_CODEC_CLASS 132 SOC_SINGLE("ALC Attack Time", AC97_CODEC_CLASS_REV, 0, 15, 0),
129 SOC_ENUM("ALC Function", wm9713_enum[6]), 133 SOC_ENUM("ALC Function", wm9713_enum[6]),
130 SOC_SINGLE("ALC Max Volume", AC97_PCI_SVID, 11 134 SOC_SINGLE("ALC Max Volume", AC97_PCI_SVID, 11, 7, 0),
131 SOC_SINGLE("ALC ZC Timeout", AC97_PCI_SVID, 9, 135 SOC_SINGLE("ALC ZC Timeout", AC97_PCI_SVID, 9, 3, 0),
132 SOC_SINGLE("ALC ZC Switch", AC97_PCI_SVID, 8, 136 SOC_SINGLE("ALC ZC Switch", AC97_PCI_SVID, 8, 1, 0),
133 SOC_SINGLE("ALC NG Switch", AC97_PCI_SVID, 7, 137 SOC_SINGLE("ALC NG Switch", AC97_PCI_SVID, 7, 1, 0),
134 SOC_ENUM("ALC NG Type", wm9713_enum[17]), 138 SOC_ENUM("ALC NG Type", wm9713_enum[17]),
135 SOC_SINGLE("ALC NG Threshold", AC97_PCI_SVID, 139 SOC_SINGLE("ALC NG Threshold", AC97_PCI_SVID, 0, 31, 0),
136 140
137 SOC_DOUBLE("Speaker Playback ZC Switch", AC97_ 141 SOC_DOUBLE("Speaker Playback ZC Switch", AC97_MASTER, 14, 6, 1, 0),
138 SOC_DOUBLE("Headphone Playback ZC Switch", AC9 142 SOC_DOUBLE("Headphone Playback ZC Switch", AC97_HEADPHONE, 14, 6, 1, 0),
139 143
140 SOC_SINGLE("Out4 Playback Switch", AC97_MASTER 144 SOC_SINGLE("Out4 Playback Switch", AC97_MASTER_MONO, 15, 1, 1),
141 SOC_SINGLE("Out4 Playback ZC Switch", AC97_MAS 145 SOC_SINGLE("Out4 Playback ZC Switch", AC97_MASTER_MONO, 14, 1, 0),
142 SOC_SINGLE_TLV("Out4 Playback Volume", AC97_MA 146 SOC_SINGLE_TLV("Out4 Playback Volume", AC97_MASTER_MONO, 8, 31, 1, out_tlv),
143 147
144 SOC_SINGLE("Out3 Playback Switch", AC97_MASTER 148 SOC_SINGLE("Out3 Playback Switch", AC97_MASTER_MONO, 7, 1, 1),
145 SOC_SINGLE("Out3 Playback ZC Switch", AC97_MAS 149 SOC_SINGLE("Out3 Playback ZC Switch", AC97_MASTER_MONO, 6, 1, 0),
146 SOC_SINGLE_TLV("Out3 Playback Volume", AC97_MA 150 SOC_SINGLE_TLV("Out3 Playback Volume", AC97_MASTER_MONO, 0, 31, 1, out_tlv),
147 151
148 SOC_SINGLE_TLV("Mono Capture Volume", AC97_MAS 152 SOC_SINGLE_TLV("Mono Capture Volume", AC97_MASTER_TONE, 8, 31, 1, main_tlv),
149 SOC_SINGLE("Mono Playback Switch", AC97_MASTER 153 SOC_SINGLE("Mono Playback Switch", AC97_MASTER_TONE, 7, 1, 1),
150 SOC_SINGLE("Mono Playback ZC Switch", AC97_MAS 154 SOC_SINGLE("Mono Playback ZC Switch", AC97_MASTER_TONE, 6, 1, 0),
151 SOC_SINGLE_TLV("Mono Playback Volume", AC97_MA 155 SOC_SINGLE_TLV("Mono Playback Volume", AC97_MASTER_TONE, 0, 31, 1, out_tlv),
152 156
153 SOC_SINGLE_TLV("Headphone Mixer Beep Playback 157 SOC_SINGLE_TLV("Headphone Mixer Beep Playback Volume", AC97_AUX, 12, 7, 1,
154 misc_tlv), 158 misc_tlv),
155 SOC_SINGLE_TLV("Speaker Mixer Beep Playback Vo 159 SOC_SINGLE_TLV("Speaker Mixer Beep Playback Volume", AC97_AUX, 8, 7, 1,
156 misc_tlv), 160 misc_tlv),
157 SOC_SINGLE_TLV("Mono Mixer Beep Playback Volum 161 SOC_SINGLE_TLV("Mono Mixer Beep Playback Volume", AC97_AUX, 4, 7, 1, misc_tlv),
158 162
159 SOC_SINGLE_TLV("Voice Playback Headphone Volum 163 SOC_SINGLE_TLV("Voice Playback Headphone Volume", AC97_PCM, 12, 7, 1,
160 misc_tlv), 164 misc_tlv),
161 SOC_SINGLE("Voice Playback Master Volume", AC9 165 SOC_SINGLE("Voice Playback Master Volume", AC97_PCM, 8, 7, 1),
162 SOC_SINGLE("Voice Playback Mono Volume", AC97_ 166 SOC_SINGLE("Voice Playback Mono Volume", AC97_PCM, 4, 7, 1),
163 167
164 SOC_SINGLE_TLV("Headphone Mixer Aux Playback V 168 SOC_SINGLE_TLV("Headphone Mixer Aux Playback Volume", AC97_REC_SEL, 12, 7, 1,
165 misc_tlv), 169 misc_tlv),
166 170
167 SOC_SINGLE_TLV("Speaker Mixer Voice Playback V 171 SOC_SINGLE_TLV("Speaker Mixer Voice Playback Volume", AC97_PCM, 8, 7, 1,
168 misc_tlv), 172 misc_tlv),
169 SOC_SINGLE_TLV("Speaker Mixer Aux Playback Vol 173 SOC_SINGLE_TLV("Speaker Mixer Aux Playback Volume", AC97_REC_SEL, 8, 7, 1,
170 misc_tlv), 174 misc_tlv),
171 175
172 SOC_SINGLE_TLV("Mono Mixer Voice Playback Volu 176 SOC_SINGLE_TLV("Mono Mixer Voice Playback Volume", AC97_PCM, 4, 7, 1,
173 misc_tlv), 177 misc_tlv),
174 SOC_SINGLE_TLV("Mono Mixer Aux Playback Volume 178 SOC_SINGLE_TLV("Mono Mixer Aux Playback Volume", AC97_REC_SEL, 4, 7, 1,
175 misc_tlv), 179 misc_tlv),
176 180
177 SOC_SINGLE("Aux Playback Headphone Volume", AC 181 SOC_SINGLE("Aux Playback Headphone Volume", AC97_REC_SEL, 12, 7, 1),
178 SOC_SINGLE("Aux Playback Master Volume", AC97_ 182 SOC_SINGLE("Aux Playback Master Volume", AC97_REC_SEL, 8, 7, 1),
179 183
180 SOC_ENUM("Bass Control", wm9713_enum[16]), 184 SOC_ENUM("Bass Control", wm9713_enum[16]),
181 SOC_SINGLE("Bass Cut-off Switch", AC97_GENERAL 185 SOC_SINGLE("Bass Cut-off Switch", AC97_GENERAL_PURPOSE, 12, 1, 1),
182 SOC_SINGLE("Tone Cut-off Switch", AC97_GENERAL 186 SOC_SINGLE("Tone Cut-off Switch", AC97_GENERAL_PURPOSE, 4, 1, 1),
183 SOC_SINGLE("Playback Attenuate (-6dB) Switch", 187 SOC_SINGLE("Playback Attenuate (-6dB) Switch", AC97_GENERAL_PURPOSE, 6, 1, 0),
184 SOC_SINGLE("Bass Volume", AC97_GENERAL_PURPOSE 188 SOC_SINGLE("Bass Volume", AC97_GENERAL_PURPOSE, 8, 15, 1),
185 SOC_SINGLE("Tone Volume", AC97_GENERAL_PURPOSE 189 SOC_SINGLE("Tone Volume", AC97_GENERAL_PURPOSE, 0, 15, 1),
186 190
187 SOC_SINGLE("3D Upper Cut-off Switch", AC97_REC 191 SOC_SINGLE("3D Upper Cut-off Switch", AC97_REC_GAIN_MIC, 5, 1, 0),
188 SOC_SINGLE("3D Lower Cut-off Switch", AC97_REC 192 SOC_SINGLE("3D Lower Cut-off Switch", AC97_REC_GAIN_MIC, 4, 1, 0),
189 SOC_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 1 193 SOC_SINGLE("3D Depth", AC97_REC_GAIN_MIC, 0, 15, 1),
190 }; 194 };
191 195
192 static int wm9713_voice_shutdown(struct snd_so 196 static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w,
193 struct snd_kc 197 struct snd_kcontrol *kcontrol, int event)
194 { 198 {
195 struct snd_soc_component *component = 199 struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
196 200
197 if (WARN_ON(event != SND_SOC_DAPM_PRE_ 201 if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD))
198 return -EINVAL; 202 return -EINVAL;
199 203
200 /* Gracefully shut down the voice inte 204 /* Gracefully shut down the voice interface. */
201 snd_soc_component_update_bits(componen 205 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0f00, 0x0200);
202 schedule_timeout_interruptible(msecs_t 206 schedule_timeout_interruptible(msecs_to_jiffies(1));
203 snd_soc_component_update_bits(componen 207 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0f00, 0x0f00);
204 snd_soc_component_update_bits(componen 208 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0x1000, 0x1000);
205 209
206 return 0; 210 return 0;
207 } 211 }
208 212
209 static const unsigned int wm9713_mixer_mute_re 213 static const unsigned int wm9713_mixer_mute_regs[] = {
210 AC97_PC_BEEP, 214 AC97_PC_BEEP,
211 AC97_MASTER_TONE, 215 AC97_MASTER_TONE,
212 AC97_PHONE, 216 AC97_PHONE,
213 AC97_REC_SEL, 217 AC97_REC_SEL,
214 AC97_PCM, 218 AC97_PCM,
215 AC97_AUX, 219 AC97_AUX,
216 }; 220 };
217 221
218 /* We have to create a fake left and right HP 222 /* We have to create a fake left and right HP mixers because
219 * the codec only has a single control that is 223 * the codec only has a single control that is shared by both channels.
220 * This makes it impossible to determine the a 224 * This makes it impossible to determine the audio path using the current
221 * register map, thus we add a new (virtual) r 225 * register map, thus we add a new (virtual) register to help determine the
222 * audio route within the device. 226 * audio route within the device.
223 */ 227 */
224 static int wm9713_hp_mixer_put(struct snd_kcon 228 static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
225 struct snd_ctl_elem_value *ucontrol) 229 struct snd_ctl_elem_value *ucontrol)
226 { 230 {
227 struct snd_soc_dapm_context *dapm = sn 231 struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
228 struct snd_soc_component *component = 232 struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
229 struct wm9713_priv *wm9713 = snd_soc_c 233 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
230 unsigned int val = ucontrol->value.int 234 unsigned int val = ucontrol->value.integer.value[0];
231 struct soc_mixer_control *mc = 235 struct soc_mixer_control *mc =
232 (struct soc_mixer_control *)kc 236 (struct soc_mixer_control *)kcontrol->private_value;
233 unsigned int mixer, mask, shift, old; 237 unsigned int mixer, mask, shift, old;
234 struct snd_soc_dapm_update update = {} 238 struct snd_soc_dapm_update update = {};
235 bool change; 239 bool change;
236 240
237 mixer = mc->shift >> 8; 241 mixer = mc->shift >> 8;
238 shift = mc->shift & 0xff; 242 shift = mc->shift & 0xff;
239 mask = (1 << shift); 243 mask = (1 << shift);
240 244
241 mutex_lock(&wm9713->lock); 245 mutex_lock(&wm9713->lock);
242 old = wm9713->hp_mixer[mixer]; 246 old = wm9713->hp_mixer[mixer];
243 if (ucontrol->value.integer.value[0]) 247 if (ucontrol->value.integer.value[0])
244 wm9713->hp_mixer[mixer] |= mas 248 wm9713->hp_mixer[mixer] |= mask;
245 else 249 else
246 wm9713->hp_mixer[mixer] &= ~ma 250 wm9713->hp_mixer[mixer] &= ~mask;
247 251
248 change = old != wm9713->hp_mixer[mixer 252 change = old != wm9713->hp_mixer[mixer];
249 if (change) { 253 if (change) {
250 update.kcontrol = kcontrol; 254 update.kcontrol = kcontrol;
251 update.reg = wm9713_mixer_mute 255 update.reg = wm9713_mixer_mute_regs[shift];
252 update.mask = 0x8000; 256 update.mask = 0x8000;
253 if ((wm9713->hp_mixer[0] & mas 257 if ((wm9713->hp_mixer[0] & mask) ||
254 (wm9713->hp_mixer[1] & mas 258 (wm9713->hp_mixer[1] & mask))
255 update.val = 0x0; 259 update.val = 0x0;
256 else 260 else
257 update.val = 0x8000; 261 update.val = 0x8000;
258 262
259 snd_soc_dapm_mixer_update_powe 263 snd_soc_dapm_mixer_update_power(dapm, kcontrol, val,
260 &update); 264 &update);
261 } 265 }
262 266
263 mutex_unlock(&wm9713->lock); 267 mutex_unlock(&wm9713->lock);
264 268
265 return change; 269 return change;
266 } 270 }
267 271
268 static int wm9713_hp_mixer_get(struct snd_kcon 272 static int wm9713_hp_mixer_get(struct snd_kcontrol *kcontrol,
269 struct snd_ctl_elem_value *ucontrol) 273 struct snd_ctl_elem_value *ucontrol)
270 { 274 {
271 struct snd_soc_dapm_context *dapm = sn 275 struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
272 struct snd_soc_component *component = 276 struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
273 struct wm9713_priv *wm9713 = snd_soc_c 277 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
274 struct soc_mixer_control *mc = 278 struct soc_mixer_control *mc =
275 (struct soc_mixer_control *)kc 279 (struct soc_mixer_control *)kcontrol->private_value;
276 unsigned int mixer, shift; 280 unsigned int mixer, shift;
277 281
278 mixer = mc->shift >> 8; 282 mixer = mc->shift >> 8;
279 shift = mc->shift & 0xff; 283 shift = mc->shift & 0xff;
280 284
281 ucontrol->value.integer.value[0] = 285 ucontrol->value.integer.value[0] =
282 (wm9713->hp_mixer[mixer] >> sh 286 (wm9713->hp_mixer[mixer] >> shift) & 1;
283 287
284 return 0; 288 return 0;
285 } 289 }
286 290
287 #define WM9713_HP_MIXER_CTRL(xname, xmixer, xs 291 #define WM9713_HP_MIXER_CTRL(xname, xmixer, xshift) { \
288 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, . 292 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
289 .info = snd_soc_info_volsw, \ 293 .info = snd_soc_info_volsw, \
290 .get = wm9713_hp_mixer_get, .put = wm9 294 .get = wm9713_hp_mixer_get, .put = wm9713_hp_mixer_put, \
291 .private_value = SOC_DOUBLE_VALUE(SND_ 295 .private_value = SOC_DOUBLE_VALUE(SND_SOC_NOPM, \
292 xshift, xmixer, 1, 0, 0) \ 296 xshift, xmixer, 1, 0, 0) \
293 } 297 }
294 298
295 /* Left Headphone Mixers */ 299 /* Left Headphone Mixers */
296 static const struct snd_kcontrol_new wm9713_hp 300 static const struct snd_kcontrol_new wm9713_hpl_mixer_controls[] = {
297 WM9713_HP_MIXER_CTRL("Beep Playback Switch", H 301 WM9713_HP_MIXER_CTRL("Beep Playback Switch", HPL_MIXER, 5),
298 WM9713_HP_MIXER_CTRL("Voice Playback Switch", 302 WM9713_HP_MIXER_CTRL("Voice Playback Switch", HPL_MIXER, 4),
299 WM9713_HP_MIXER_CTRL("Aux Playback Switch", HP 303 WM9713_HP_MIXER_CTRL("Aux Playback Switch", HPL_MIXER, 3),
300 WM9713_HP_MIXER_CTRL("PCM Playback Switch", HP 304 WM9713_HP_MIXER_CTRL("PCM Playback Switch", HPL_MIXER, 2),
301 WM9713_HP_MIXER_CTRL("MonoIn Playback Switch", 305 WM9713_HP_MIXER_CTRL("MonoIn Playback Switch", HPL_MIXER, 1),
302 WM9713_HP_MIXER_CTRL("Bypass Playback Switch", 306 WM9713_HP_MIXER_CTRL("Bypass Playback Switch", HPL_MIXER, 0),
303 }; 307 };
304 308
305 /* Right Headphone Mixers */ 309 /* Right Headphone Mixers */
306 static const struct snd_kcontrol_new wm9713_hp 310 static const struct snd_kcontrol_new wm9713_hpr_mixer_controls[] = {
307 WM9713_HP_MIXER_CTRL("Beep Playback Switch", H 311 WM9713_HP_MIXER_CTRL("Beep Playback Switch", HPR_MIXER, 5),
308 WM9713_HP_MIXER_CTRL("Voice Playback Switch", 312 WM9713_HP_MIXER_CTRL("Voice Playback Switch", HPR_MIXER, 4),
309 WM9713_HP_MIXER_CTRL("Aux Playback Switch", HP 313 WM9713_HP_MIXER_CTRL("Aux Playback Switch", HPR_MIXER, 3),
310 WM9713_HP_MIXER_CTRL("PCM Playback Switch", HP 314 WM9713_HP_MIXER_CTRL("PCM Playback Switch", HPR_MIXER, 2),
311 WM9713_HP_MIXER_CTRL("MonoIn Playback Switch", 315 WM9713_HP_MIXER_CTRL("MonoIn Playback Switch", HPR_MIXER, 1),
312 WM9713_HP_MIXER_CTRL("Bypass Playback Switch", 316 WM9713_HP_MIXER_CTRL("Bypass Playback Switch", HPR_MIXER, 0),
313 }; 317 };
314 318
315 /* headphone capture mux */ 319 /* headphone capture mux */
316 static const struct snd_kcontrol_new wm9713_hp 320 static const struct snd_kcontrol_new wm9713_hp_rec_mux_controls =
317 SOC_DAPM_ENUM("Route", wm9713_enum[1]); 321 SOC_DAPM_ENUM("Route", wm9713_enum[1]);
318 322
319 /* headphone mic mux */ 323 /* headphone mic mux */
320 static const struct snd_kcontrol_new wm9713_hp 324 static const struct snd_kcontrol_new wm9713_hp_mic_mux_controls =
321 SOC_DAPM_ENUM("Route", wm9713_enum[0]); 325 SOC_DAPM_ENUM("Route", wm9713_enum[0]);
322 326
323 /* Speaker Mixer */ 327 /* Speaker Mixer */
324 static const struct snd_kcontrol_new wm9713_sp 328 static const struct snd_kcontrol_new wm9713_speaker_mixer_controls[] = {
325 SOC_DAPM_SINGLE("Beep Playback Switch", AC97_A 329 SOC_DAPM_SINGLE("Beep Playback Switch", AC97_AUX, 11, 1, 1),
326 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_ 330 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_PCM, 11, 1, 1),
327 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_RE 331 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_REC_SEL, 11, 1, 1),
328 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PH 332 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PHONE, 14, 1, 1),
329 SOC_DAPM_SINGLE("MonoIn Playback Switch", AC97 333 SOC_DAPM_SINGLE("MonoIn Playback Switch", AC97_MASTER_TONE, 14, 1, 1),
330 SOC_DAPM_SINGLE("Bypass Playback Switch", AC97 334 SOC_DAPM_SINGLE("Bypass Playback Switch", AC97_PC_BEEP, 14, 1, 1),
331 }; 335 };
332 336
333 /* Mono Mixer */ 337 /* Mono Mixer */
334 static const struct snd_kcontrol_new wm9713_mo 338 static const struct snd_kcontrol_new wm9713_mono_mixer_controls[] = {
335 SOC_DAPM_SINGLE("Beep Playback Switch", AC97_A 339 SOC_DAPM_SINGLE("Beep Playback Switch", AC97_AUX, 7, 1, 1),
336 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_ 340 SOC_DAPM_SINGLE("Voice Playback Switch", AC97_PCM, 7, 1, 1),
337 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_RE 341 SOC_DAPM_SINGLE("Aux Playback Switch", AC97_REC_SEL, 7, 1, 1),
338 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PH 342 SOC_DAPM_SINGLE("PCM Playback Switch", AC97_PHONE, 13, 1, 1),
339 SOC_DAPM_SINGLE("MonoIn Playback Switch", AC97 343 SOC_DAPM_SINGLE("MonoIn Playback Switch", AC97_MASTER_TONE, 13, 1, 1),
340 SOC_DAPM_SINGLE("Bypass Playback Switch", AC97 344 SOC_DAPM_SINGLE("Bypass Playback Switch", AC97_PC_BEEP, 13, 1, 1),
341 SOC_DAPM_SINGLE("Mic 1 Sidetone Switch", AC97_ 345 SOC_DAPM_SINGLE("Mic 1 Sidetone Switch", AC97_LINE, 7, 1, 1),
342 SOC_DAPM_SINGLE("Mic 2 Sidetone Switch", AC97_ 346 SOC_DAPM_SINGLE("Mic 2 Sidetone Switch", AC97_LINE, 6, 1, 1),
343 }; 347 };
344 348
345 /* mono mic mux */ 349 /* mono mic mux */
346 static const struct snd_kcontrol_new wm9713_mo 350 static const struct snd_kcontrol_new wm9713_mono_mic_mux_controls =
347 SOC_DAPM_ENUM("Route", wm9713_enum[2]); 351 SOC_DAPM_ENUM("Route", wm9713_enum[2]);
348 352
349 /* mono output mux */ 353 /* mono output mux */
350 static const struct snd_kcontrol_new wm9713_mo 354 static const struct snd_kcontrol_new wm9713_mono_mux_controls =
351 SOC_DAPM_ENUM("Route", wm9713_enum[7]); 355 SOC_DAPM_ENUM("Route", wm9713_enum[7]);
352 356
353 /* speaker left output mux */ 357 /* speaker left output mux */
354 static const struct snd_kcontrol_new wm9713_hp 358 static const struct snd_kcontrol_new wm9713_hp_spkl_mux_controls =
355 SOC_DAPM_ENUM("Route", wm9713_enum[8]); 359 SOC_DAPM_ENUM("Route", wm9713_enum[8]);
356 360
357 /* speaker right output mux */ 361 /* speaker right output mux */
358 static const struct snd_kcontrol_new wm9713_hp 362 static const struct snd_kcontrol_new wm9713_hp_spkr_mux_controls =
359 SOC_DAPM_ENUM("Route", wm9713_enum[9]); 363 SOC_DAPM_ENUM("Route", wm9713_enum[9]);
360 364
361 /* headphone left output mux */ 365 /* headphone left output mux */
362 static const struct snd_kcontrol_new wm9713_hp 366 static const struct snd_kcontrol_new wm9713_hpl_out_mux_controls =
363 SOC_DAPM_ENUM("Route", wm9713_enum[10]); 367 SOC_DAPM_ENUM("Route", wm9713_enum[10]);
364 368
365 /* headphone right output mux */ 369 /* headphone right output mux */
366 static const struct snd_kcontrol_new wm9713_hp 370 static const struct snd_kcontrol_new wm9713_hpr_out_mux_controls =
367 SOC_DAPM_ENUM("Route", wm9713_enum[11]); 371 SOC_DAPM_ENUM("Route", wm9713_enum[11]);
368 372
369 /* Out3 mux */ 373 /* Out3 mux */
370 static const struct snd_kcontrol_new wm9713_ou 374 static const struct snd_kcontrol_new wm9713_out3_mux_controls =
371 SOC_DAPM_ENUM("Route", wm9713_enum[12]); 375 SOC_DAPM_ENUM("Route", wm9713_enum[12]);
372 376
373 /* Out4 mux */ 377 /* Out4 mux */
374 static const struct snd_kcontrol_new wm9713_ou 378 static const struct snd_kcontrol_new wm9713_out4_mux_controls =
375 SOC_DAPM_ENUM("Route", wm9713_enum[13]); 379 SOC_DAPM_ENUM("Route", wm9713_enum[13]);
376 380
377 /* DAC inv mux 1 */ 381 /* DAC inv mux 1 */
378 static const struct snd_kcontrol_new wm9713_da 382 static const struct snd_kcontrol_new wm9713_dac_inv1_mux_controls =
379 SOC_DAPM_ENUM("Route", wm9713_enum[14]); 383 SOC_DAPM_ENUM("Route", wm9713_enum[14]);
380 384
381 /* DAC inv mux 2 */ 385 /* DAC inv mux 2 */
382 static const struct snd_kcontrol_new wm9713_da 386 static const struct snd_kcontrol_new wm9713_dac_inv2_mux_controls =
383 SOC_DAPM_ENUM("Route", wm9713_enum[15]); 387 SOC_DAPM_ENUM("Route", wm9713_enum[15]);
384 388
385 /* Capture source left */ 389 /* Capture source left */
386 static const struct snd_kcontrol_new wm9713_re 390 static const struct snd_kcontrol_new wm9713_rec_srcl_mux_controls =
387 SOC_DAPM_ENUM("Route", wm9713_enum[3]); 391 SOC_DAPM_ENUM("Route", wm9713_enum[3]);
388 392
389 /* Capture source right */ 393 /* Capture source right */
390 static const struct snd_kcontrol_new wm9713_re 394 static const struct snd_kcontrol_new wm9713_rec_srcr_mux_controls =
391 SOC_DAPM_ENUM("Route", wm9713_enum[4]); 395 SOC_DAPM_ENUM("Route", wm9713_enum[4]);
392 396
393 /* mic source */ 397 /* mic source */
394 static const struct snd_kcontrol_new wm9713_mi 398 static const struct snd_kcontrol_new wm9713_mic_sel_mux_controls =
395 SOC_DAPM_ENUM("Route", wm9713_enum[18]); 399 SOC_DAPM_ENUM("Route", wm9713_enum[18]);
396 400
397 /* mic source B virtual control */ 401 /* mic source B virtual control */
398 static const struct snd_kcontrol_new wm9713_mi 402 static const struct snd_kcontrol_new wm9713_micb_sel_mux_controls =
399 SOC_DAPM_ENUM("Route", wm9713_enum[19]); 403 SOC_DAPM_ENUM("Route", wm9713_enum[19]);
400 404
401 static const struct snd_soc_dapm_widget wm9713 405 static const struct snd_soc_dapm_widget wm9713_dapm_widgets[] = {
402 SND_SOC_DAPM_MUX("Capture Headphone Mux", SND_ 406 SND_SOC_DAPM_MUX("Capture Headphone Mux", SND_SOC_NOPM, 0, 0,
403 &wm9713_hp_rec_mux_controls), 407 &wm9713_hp_rec_mux_controls),
404 SND_SOC_DAPM_MUX("Sidetone Mux", SND_SOC_NOPM, 408 SND_SOC_DAPM_MUX("Sidetone Mux", SND_SOC_NOPM, 0, 0,
405 &wm9713_hp_mic_mux_controls), 409 &wm9713_hp_mic_mux_controls),
406 SND_SOC_DAPM_MUX("Capture Mono Mux", SND_SOC_N 410 SND_SOC_DAPM_MUX("Capture Mono Mux", SND_SOC_NOPM, 0, 0,
407 &wm9713_mono_mic_mux_controls), 411 &wm9713_mono_mic_mux_controls),
408 SND_SOC_DAPM_MUX("Mono Out Mux", SND_SOC_NOPM, 412 SND_SOC_DAPM_MUX("Mono Out Mux", SND_SOC_NOPM, 0, 0,
409 &wm9713_mono_mux_controls), 413 &wm9713_mono_mux_controls),
410 SND_SOC_DAPM_MUX("Left Speaker Out Mux", SND_S 414 SND_SOC_DAPM_MUX("Left Speaker Out Mux", SND_SOC_NOPM, 0, 0,
411 &wm9713_hp_spkl_mux_controls), 415 &wm9713_hp_spkl_mux_controls),
412 SND_SOC_DAPM_MUX("Right Speaker Out Mux", SND_ 416 SND_SOC_DAPM_MUX("Right Speaker Out Mux", SND_SOC_NOPM, 0, 0,
413 &wm9713_hp_spkr_mux_controls), 417 &wm9713_hp_spkr_mux_controls),
414 SND_SOC_DAPM_MUX("Left Headphone Out Mux", SND 418 SND_SOC_DAPM_MUX("Left Headphone Out Mux", SND_SOC_NOPM, 0, 0,
415 &wm9713_hpl_out_mux_controls), 419 &wm9713_hpl_out_mux_controls),
416 SND_SOC_DAPM_MUX("Right Headphone Out Mux", SN 420 SND_SOC_DAPM_MUX("Right Headphone Out Mux", SND_SOC_NOPM, 0, 0,
417 &wm9713_hpr_out_mux_controls), 421 &wm9713_hpr_out_mux_controls),
418 SND_SOC_DAPM_MUX("Out 3 Mux", SND_SOC_NOPM, 0, 422 SND_SOC_DAPM_MUX("Out 3 Mux", SND_SOC_NOPM, 0, 0,
419 &wm9713_out3_mux_controls), 423 &wm9713_out3_mux_controls),
420 SND_SOC_DAPM_MUX("Out 4 Mux", SND_SOC_NOPM, 0, 424 SND_SOC_DAPM_MUX("Out 4 Mux", SND_SOC_NOPM, 0, 0,
421 &wm9713_out4_mux_controls), 425 &wm9713_out4_mux_controls),
422 SND_SOC_DAPM_MUX("DAC Inv Mux 1", SND_SOC_NOPM 426 SND_SOC_DAPM_MUX("DAC Inv Mux 1", SND_SOC_NOPM, 0, 0,
423 &wm9713_dac_inv1_mux_controls), 427 &wm9713_dac_inv1_mux_controls),
424 SND_SOC_DAPM_MUX("DAC Inv Mux 2", SND_SOC_NOPM 428 SND_SOC_DAPM_MUX("DAC Inv Mux 2", SND_SOC_NOPM, 0, 0,
425 &wm9713_dac_inv2_mux_controls), 429 &wm9713_dac_inv2_mux_controls),
426 SND_SOC_DAPM_MUX("Left Capture Source", SND_SO 430 SND_SOC_DAPM_MUX("Left Capture Source", SND_SOC_NOPM, 0, 0,
427 &wm9713_rec_srcl_mux_controls), 431 &wm9713_rec_srcl_mux_controls),
428 SND_SOC_DAPM_MUX("Right Capture Source", SND_S 432 SND_SOC_DAPM_MUX("Right Capture Source", SND_SOC_NOPM, 0, 0,
429 &wm9713_rec_srcr_mux_controls), 433 &wm9713_rec_srcr_mux_controls),
430 SND_SOC_DAPM_MUX("Mic A Source", SND_SOC_NOPM, 434 SND_SOC_DAPM_MUX("Mic A Source", SND_SOC_NOPM, 0, 0,
431 &wm9713_mic_sel_mux_controls), 435 &wm9713_mic_sel_mux_controls),
432 SND_SOC_DAPM_MUX("Mic B Source", SND_SOC_NOPM, 436 SND_SOC_DAPM_MUX("Mic B Source", SND_SOC_NOPM, 0, 0,
433 &wm9713_micb_sel_mux_controls), 437 &wm9713_micb_sel_mux_controls),
434 SND_SOC_DAPM_MIXER("Left HP Mixer", AC97_EXTEN 438 SND_SOC_DAPM_MIXER("Left HP Mixer", AC97_EXTENDED_MID, 3, 1,
435 &wm9713_hpl_mixer_controls[0], ARRAY_S 439 &wm9713_hpl_mixer_controls[0], ARRAY_SIZE(wm9713_hpl_mixer_controls)),
436 SND_SOC_DAPM_MIXER("Right HP Mixer", AC97_EXTE 440 SND_SOC_DAPM_MIXER("Right HP Mixer", AC97_EXTENDED_MID, 2, 1,
437 &wm9713_hpr_mixer_controls[0], ARRAY_S 441 &wm9713_hpr_mixer_controls[0], ARRAY_SIZE(wm9713_hpr_mixer_controls)),
438 SND_SOC_DAPM_MIXER("Mono Mixer", AC97_EXTENDED 442 SND_SOC_DAPM_MIXER("Mono Mixer", AC97_EXTENDED_MID, 0, 1,
439 &wm9713_mono_mixer_controls[0], ARRAY_ 443 &wm9713_mono_mixer_controls[0], ARRAY_SIZE(wm9713_mono_mixer_controls)),
440 SND_SOC_DAPM_MIXER("Speaker Mixer", AC97_EXTEN 444 SND_SOC_DAPM_MIXER("Speaker Mixer", AC97_EXTENDED_MID, 1, 1,
441 &wm9713_speaker_mixer_controls[0], 445 &wm9713_speaker_mixer_controls[0],
442 ARRAY_SIZE(wm9713_speaker_mixer_contro 446 ARRAY_SIZE(wm9713_speaker_mixer_controls)),
443 SND_SOC_DAPM_DAC("Left DAC", "Left HiFi Playba 447 SND_SOC_DAPM_DAC("Left DAC", "Left HiFi Playback", AC97_EXTENDED_MID, 7, 1),
444 SND_SOC_DAPM_DAC("Right DAC", "Right HiFi Play 448 SND_SOC_DAPM_DAC("Right DAC", "Right HiFi Playback", AC97_EXTENDED_MID, 6, 1),
445 SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_NOPM, 449 SND_SOC_DAPM_MIXER("AC97 Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
446 SND_SOC_DAPM_MIXER("HP Mixer", SND_SOC_NOPM, 0 450 SND_SOC_DAPM_MIXER("HP Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
447 SND_SOC_DAPM_MIXER("Line Mixer", SND_SOC_NOPM, 451 SND_SOC_DAPM_MIXER("Line Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
448 SND_SOC_DAPM_MIXER("Capture Mixer", SND_SOC_NO 452 SND_SOC_DAPM_MIXER("Capture Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
449 SND_SOC_DAPM_DAC_E("Voice DAC", "Voice Playbac 453 SND_SOC_DAPM_DAC_E("Voice DAC", "Voice Playback", AC97_EXTENDED_MID, 12, 1,
450 wm9713_voice_shutdown, SND_ 454 wm9713_voice_shutdown, SND_SOC_DAPM_PRE_PMD),
451 SND_SOC_DAPM_DAC("Aux DAC", "Aux Playback", AC 455 SND_SOC_DAPM_DAC("Aux DAC", "Aux Playback", AC97_EXTENDED_MID, 11, 1),
452 SND_SOC_DAPM_PGA("Left ADC", AC97_EXTENDED_MID 456 SND_SOC_DAPM_PGA("Left ADC", AC97_EXTENDED_MID, 5, 1, NULL, 0),
453 SND_SOC_DAPM_PGA("Right ADC", AC97_EXTENDED_MI 457 SND_SOC_DAPM_PGA("Right ADC", AC97_EXTENDED_MID, 4, 1, NULL, 0),
454 SND_SOC_DAPM_ADC("Left HiFi ADC", "Left HiFi C 458 SND_SOC_DAPM_ADC("Left HiFi ADC", "Left HiFi Capture", SND_SOC_NOPM, 0, 0),
455 SND_SOC_DAPM_ADC("Right HiFi ADC", "Right HiFi 459 SND_SOC_DAPM_ADC("Right HiFi ADC", "Right HiFi Capture", SND_SOC_NOPM, 0, 0),
456 SND_SOC_DAPM_ADC("Left Voice ADC", "Left Voice 460 SND_SOC_DAPM_ADC("Left Voice ADC", "Left Voice Capture", SND_SOC_NOPM, 0, 0),
457 SND_SOC_DAPM_ADC("Right Voice ADC", "Right Voi 461 SND_SOC_DAPM_ADC("Right Voice ADC", "Right Voice Capture", SND_SOC_NOPM, 0, 0),
458 SND_SOC_DAPM_PGA("Left Headphone", AC97_EXTEND 462 SND_SOC_DAPM_PGA("Left Headphone", AC97_EXTENDED_MSTATUS, 10, 1, NULL, 0),
459 SND_SOC_DAPM_PGA("Right Headphone", AC97_EXTEN 463 SND_SOC_DAPM_PGA("Right Headphone", AC97_EXTENDED_MSTATUS, 9, 1, NULL, 0),
460 SND_SOC_DAPM_PGA("Left Speaker", AC97_EXTENDED 464 SND_SOC_DAPM_PGA("Left Speaker", AC97_EXTENDED_MSTATUS, 8, 1, NULL, 0),
461 SND_SOC_DAPM_PGA("Right Speaker", AC97_EXTENDE 465 SND_SOC_DAPM_PGA("Right Speaker", AC97_EXTENDED_MSTATUS, 7, 1, NULL, 0),
462 SND_SOC_DAPM_PGA("Out 3", AC97_EXTENDED_MSTATU 466 SND_SOC_DAPM_PGA("Out 3", AC97_EXTENDED_MSTATUS, 11, 1, NULL, 0),
463 SND_SOC_DAPM_PGA("Out 4", AC97_EXTENDED_MSTATU 467 SND_SOC_DAPM_PGA("Out 4", AC97_EXTENDED_MSTATUS, 12, 1, NULL, 0),
464 SND_SOC_DAPM_PGA("Mono Out", AC97_EXTENDED_MST 468 SND_SOC_DAPM_PGA("Mono Out", AC97_EXTENDED_MSTATUS, 13, 1, NULL, 0),
465 SND_SOC_DAPM_PGA("Left Line In", AC97_EXTENDED 469 SND_SOC_DAPM_PGA("Left Line In", AC97_EXTENDED_MSTATUS, 6, 1, NULL, 0),
466 SND_SOC_DAPM_PGA("Right Line In", AC97_EXTENDE 470 SND_SOC_DAPM_PGA("Right Line In", AC97_EXTENDED_MSTATUS, 5, 1, NULL, 0),
467 SND_SOC_DAPM_PGA("Mono In", AC97_EXTENDED_MSTA 471 SND_SOC_DAPM_PGA("Mono In", AC97_EXTENDED_MSTATUS, 4, 1, NULL, 0),
468 SND_SOC_DAPM_PGA("Mic A PGA", AC97_EXTENDED_MS 472 SND_SOC_DAPM_PGA("Mic A PGA", AC97_EXTENDED_MSTATUS, 3, 1, NULL, 0),
469 SND_SOC_DAPM_PGA("Mic B PGA", AC97_EXTENDED_MS 473 SND_SOC_DAPM_PGA("Mic B PGA", AC97_EXTENDED_MSTATUS, 2, 1, NULL, 0),
470 SND_SOC_DAPM_PGA("Mic A Pre Amp", AC97_EXTENDE 474 SND_SOC_DAPM_PGA("Mic A Pre Amp", AC97_EXTENDED_MSTATUS, 1, 1, NULL, 0),
471 SND_SOC_DAPM_PGA("Mic B Pre Amp", AC97_EXTENDE 475 SND_SOC_DAPM_PGA("Mic B Pre Amp", AC97_EXTENDED_MSTATUS, 0, 1, NULL, 0),
472 SND_SOC_DAPM_MICBIAS("Mic Bias", AC97_EXTENDED 476 SND_SOC_DAPM_MICBIAS("Mic Bias", AC97_EXTENDED_MSTATUS, 14, 1),
473 SND_SOC_DAPM_OUTPUT("MONO"), 477 SND_SOC_DAPM_OUTPUT("MONO"),
474 SND_SOC_DAPM_OUTPUT("HPL"), 478 SND_SOC_DAPM_OUTPUT("HPL"),
475 SND_SOC_DAPM_OUTPUT("HPR"), 479 SND_SOC_DAPM_OUTPUT("HPR"),
476 SND_SOC_DAPM_OUTPUT("SPKL"), 480 SND_SOC_DAPM_OUTPUT("SPKL"),
477 SND_SOC_DAPM_OUTPUT("SPKR"), 481 SND_SOC_DAPM_OUTPUT("SPKR"),
478 SND_SOC_DAPM_OUTPUT("OUT3"), 482 SND_SOC_DAPM_OUTPUT("OUT3"),
479 SND_SOC_DAPM_OUTPUT("OUT4"), 483 SND_SOC_DAPM_OUTPUT("OUT4"),
480 SND_SOC_DAPM_INPUT("LINEL"), 484 SND_SOC_DAPM_INPUT("LINEL"),
481 SND_SOC_DAPM_INPUT("LINER"), 485 SND_SOC_DAPM_INPUT("LINER"),
482 SND_SOC_DAPM_INPUT("MONOIN"), 486 SND_SOC_DAPM_INPUT("MONOIN"),
483 SND_SOC_DAPM_INPUT("PCBEEP"), 487 SND_SOC_DAPM_INPUT("PCBEEP"),
484 SND_SOC_DAPM_INPUT("MIC1"), 488 SND_SOC_DAPM_INPUT("MIC1"),
485 SND_SOC_DAPM_INPUT("MIC2A"), 489 SND_SOC_DAPM_INPUT("MIC2A"),
486 SND_SOC_DAPM_INPUT("MIC2B"), 490 SND_SOC_DAPM_INPUT("MIC2B"),
487 SND_SOC_DAPM_VMID("VMID"), 491 SND_SOC_DAPM_VMID("VMID"),
488 }; 492 };
489 493
490 static const struct snd_soc_dapm_route wm9713_ 494 static const struct snd_soc_dapm_route wm9713_audio_map[] = {
491 /* left HP mixer */ 495 /* left HP mixer */
492 {"Left HP Mixer", "Beep Playback Switc 496 {"Left HP Mixer", "Beep Playback Switch", "PCBEEP"},
493 {"Left HP Mixer", "Voice Playback Swit 497 {"Left HP Mixer", "Voice Playback Switch", "Voice DAC"},
494 {"Left HP Mixer", "Aux Playback Switch 498 {"Left HP Mixer", "Aux Playback Switch", "Aux DAC"},
495 {"Left HP Mixer", "Bypass Playback Swi 499 {"Left HP Mixer", "Bypass Playback Switch", "Left Line In"},
496 {"Left HP Mixer", "PCM Playback Switch 500 {"Left HP Mixer", "PCM Playback Switch", "Left DAC"},
497 {"Left HP Mixer", "MonoIn Playback Swi 501 {"Left HP Mixer", "MonoIn Playback Switch", "Mono In"},
498 {"Left HP Mixer", NULL, "Capture Head 502 {"Left HP Mixer", NULL, "Capture Headphone Mux"},
499 503
500 /* right HP mixer */ 504 /* right HP mixer */
501 {"Right HP Mixer", "Beep Playback Swit 505 {"Right HP Mixer", "Beep Playback Switch", "PCBEEP"},
502 {"Right HP Mixer", "Voice Playback Swi 506 {"Right HP Mixer", "Voice Playback Switch", "Voice DAC"},
503 {"Right HP Mixer", "Aux Playback Switc 507 {"Right HP Mixer", "Aux Playback Switch", "Aux DAC"},
504 {"Right HP Mixer", "Bypass Playback Sw 508 {"Right HP Mixer", "Bypass Playback Switch", "Right Line In"},
505 {"Right HP Mixer", "PCM Playback Switc 509 {"Right HP Mixer", "PCM Playback Switch", "Right DAC"},
506 {"Right HP Mixer", "MonoIn Playback Sw 510 {"Right HP Mixer", "MonoIn Playback Switch", "Mono In"},
507 {"Right HP Mixer", NULL, "Capture Hea 511 {"Right HP Mixer", NULL, "Capture Headphone Mux"},
508 512
509 /* virtual mixer - mixes left & right 513 /* virtual mixer - mixes left & right channels for spk and mono */
510 {"AC97 Mixer", NULL, "Left DAC"}, 514 {"AC97 Mixer", NULL, "Left DAC"},
511 {"AC97 Mixer", NULL, "Right DAC"}, 515 {"AC97 Mixer", NULL, "Right DAC"},
512 {"Line Mixer", NULL, "Right Line In"}, 516 {"Line Mixer", NULL, "Right Line In"},
513 {"Line Mixer", NULL, "Left Line In"}, 517 {"Line Mixer", NULL, "Left Line In"},
514 {"HP Mixer", NULL, "Left HP Mixer"}, 518 {"HP Mixer", NULL, "Left HP Mixer"},
515 {"HP Mixer", NULL, "Right HP Mixer"}, 519 {"HP Mixer", NULL, "Right HP Mixer"},
516 {"Capture Mixer", NULL, "Left Capture 520 {"Capture Mixer", NULL, "Left Capture Source"},
517 {"Capture Mixer", NULL, "Right Capture 521 {"Capture Mixer", NULL, "Right Capture Source"},
518 522
519 /* speaker mixer */ 523 /* speaker mixer */
520 {"Speaker Mixer", "Beep Playback Switc 524 {"Speaker Mixer", "Beep Playback Switch", "PCBEEP"},
521 {"Speaker Mixer", "Voice Playback Swit 525 {"Speaker Mixer", "Voice Playback Switch", "Voice DAC"},
522 {"Speaker Mixer", "Aux Playback Switch 526 {"Speaker Mixer", "Aux Playback Switch", "Aux DAC"},
523 {"Speaker Mixer", "Bypass Playback Swi 527 {"Speaker Mixer", "Bypass Playback Switch", "Line Mixer"},
524 {"Speaker Mixer", "PCM Playback Switch 528 {"Speaker Mixer", "PCM Playback Switch", "AC97 Mixer"},
525 {"Speaker Mixer", "MonoIn Playback Swi 529 {"Speaker Mixer", "MonoIn Playback Switch", "Mono In"},
526 530
527 /* mono mixer */ 531 /* mono mixer */
528 {"Mono Mixer", "Beep Playback Switch", 532 {"Mono Mixer", "Beep Playback Switch", "PCBEEP"},
529 {"Mono Mixer", "Voice Playback Switch" 533 {"Mono Mixer", "Voice Playback Switch", "Voice DAC"},
530 {"Mono Mixer", "Aux Playback Switch", 534 {"Mono Mixer", "Aux Playback Switch", "Aux DAC"},
531 {"Mono Mixer", "Bypass Playback Switch 535 {"Mono Mixer", "Bypass Playback Switch", "Line Mixer"},
532 {"Mono Mixer", "PCM Playback Switch", 536 {"Mono Mixer", "PCM Playback Switch", "AC97 Mixer"},
533 {"Mono Mixer", "Mic 1 Sidetone Switch" 537 {"Mono Mixer", "Mic 1 Sidetone Switch", "Mic A PGA"},
534 {"Mono Mixer", "Mic 2 Sidetone Switch" 538 {"Mono Mixer", "Mic 2 Sidetone Switch", "Mic B PGA"},
535 {"Mono Mixer", NULL, "Capture Mono Mu 539 {"Mono Mixer", NULL, "Capture Mono Mux"},
536 540
537 /* DAC inv mux 1 */ 541 /* DAC inv mux 1 */
538 {"DAC Inv Mux 1", "Mono", "Mono Mixer" 542 {"DAC Inv Mux 1", "Mono", "Mono Mixer"},
539 {"DAC Inv Mux 1", "Speaker", "Speaker 543 {"DAC Inv Mux 1", "Speaker", "Speaker Mixer"},
540 {"DAC Inv Mux 1", "Left Headphone", "L 544 {"DAC Inv Mux 1", "Left Headphone", "Left HP Mixer"},
541 {"DAC Inv Mux 1", "Right Headphone", " 545 {"DAC Inv Mux 1", "Right Headphone", "Right HP Mixer"},
542 {"DAC Inv Mux 1", "Headphone Mono", "H 546 {"DAC Inv Mux 1", "Headphone Mono", "HP Mixer"},
543 547
544 /* DAC inv mux 2 */ 548 /* DAC inv mux 2 */
545 {"DAC Inv Mux 2", "Mono", "Mono Mixer" 549 {"DAC Inv Mux 2", "Mono", "Mono Mixer"},
546 {"DAC Inv Mux 2", "Speaker", "Speaker 550 {"DAC Inv Mux 2", "Speaker", "Speaker Mixer"},
547 {"DAC Inv Mux 2", "Left Headphone", "L 551 {"DAC Inv Mux 2", "Left Headphone", "Left HP Mixer"},
548 {"DAC Inv Mux 2", "Right Headphone", " 552 {"DAC Inv Mux 2", "Right Headphone", "Right HP Mixer"},
549 {"DAC Inv Mux 2", "Headphone Mono", "H 553 {"DAC Inv Mux 2", "Headphone Mono", "HP Mixer"},
550 554
551 /* headphone left mux */ 555 /* headphone left mux */
552 {"Left Headphone Out Mux", "Headphone" 556 {"Left Headphone Out Mux", "Headphone", "Left HP Mixer"},
553 557
554 /* headphone right mux */ 558 /* headphone right mux */
555 {"Right Headphone Out Mux", "Headphone 559 {"Right Headphone Out Mux", "Headphone", "Right HP Mixer"},
556 560
557 /* speaker left mux */ 561 /* speaker left mux */
558 {"Left Speaker Out Mux", "Headphone", 562 {"Left Speaker Out Mux", "Headphone", "Left HP Mixer"},
559 {"Left Speaker Out Mux", "Speaker", "S 563 {"Left Speaker Out Mux", "Speaker", "Speaker Mixer"},
560 {"Left Speaker Out Mux", "Inv", "DAC I 564 {"Left Speaker Out Mux", "Inv", "DAC Inv Mux 1"},
561 565
562 /* speaker right mux */ 566 /* speaker right mux */
563 {"Right Speaker Out Mux", "Headphone", 567 {"Right Speaker Out Mux", "Headphone", "Right HP Mixer"},
564 {"Right Speaker Out Mux", "Speaker", " 568 {"Right Speaker Out Mux", "Speaker", "Speaker Mixer"},
565 {"Right Speaker Out Mux", "Inv", "DAC 569 {"Right Speaker Out Mux", "Inv", "DAC Inv Mux 2"},
566 570
567 /* mono mux */ 571 /* mono mux */
568 {"Mono Out Mux", "Mono", "Mono Mixer"} 572 {"Mono Out Mux", "Mono", "Mono Mixer"},
569 {"Mono Out Mux", "Inv", "DAC Inv Mux 1 573 {"Mono Out Mux", "Inv", "DAC Inv Mux 1"},
570 574
571 /* out 3 mux */ 575 /* out 3 mux */
572 {"Out 3 Mux", "Inv 1", "DAC Inv Mux 1" 576 {"Out 3 Mux", "Inv 1", "DAC Inv Mux 1"},
573 577
574 /* out 4 mux */ 578 /* out 4 mux */
575 {"Out 4 Mux", "Inv 2", "DAC Inv Mux 2" 579 {"Out 4 Mux", "Inv 2", "DAC Inv Mux 2"},
576 580
577 /* output pga */ 581 /* output pga */
578 {"HPL", NULL, "Left Headphone"}, 582 {"HPL", NULL, "Left Headphone"},
579 {"Left Headphone", NULL, "Left Headpho 583 {"Left Headphone", NULL, "Left Headphone Out Mux"},
580 {"HPR", NULL, "Right Headphone"}, 584 {"HPR", NULL, "Right Headphone"},
581 {"Right Headphone", NULL, "Right Headp 585 {"Right Headphone", NULL, "Right Headphone Out Mux"},
582 {"OUT3", NULL, "Out 3"}, 586 {"OUT3", NULL, "Out 3"},
583 {"Out 3", NULL, "Out 3 Mux"}, 587 {"Out 3", NULL, "Out 3 Mux"},
584 {"OUT4", NULL, "Out 4"}, 588 {"OUT4", NULL, "Out 4"},
585 {"Out 4", NULL, "Out 4 Mux"}, 589 {"Out 4", NULL, "Out 4 Mux"},
586 {"SPKL", NULL, "Left Speaker"}, 590 {"SPKL", NULL, "Left Speaker"},
587 {"Left Speaker", NULL, "Left Speaker O 591 {"Left Speaker", NULL, "Left Speaker Out Mux"},
588 {"SPKR", NULL, "Right Speaker"}, 592 {"SPKR", NULL, "Right Speaker"},
589 {"Right Speaker", NULL, "Right Speaker 593 {"Right Speaker", NULL, "Right Speaker Out Mux"},
590 {"MONO", NULL, "Mono Out"}, 594 {"MONO", NULL, "Mono Out"},
591 {"Mono Out", NULL, "Mono Out Mux"}, 595 {"Mono Out", NULL, "Mono Out Mux"},
592 596
593 /* input pga */ 597 /* input pga */
594 {"Left Line In", NULL, "LINEL"}, 598 {"Left Line In", NULL, "LINEL"},
595 {"Right Line In", NULL, "LINER"}, 599 {"Right Line In", NULL, "LINER"},
596 {"Mono In", NULL, "MONOIN"}, 600 {"Mono In", NULL, "MONOIN"},
597 {"Mic A PGA", NULL, "Mic A Pre Amp"}, 601 {"Mic A PGA", NULL, "Mic A Pre Amp"},
598 {"Mic B PGA", NULL, "Mic B Pre Amp"}, 602 {"Mic B PGA", NULL, "Mic B Pre Amp"},
599 603
600 /* left capture select */ 604 /* left capture select */
601 {"Left Capture Source", "Mic 1", "Mic 605 {"Left Capture Source", "Mic 1", "Mic A Pre Amp"},
602 {"Left Capture Source", "Mic 2", "Mic 606 {"Left Capture Source", "Mic 2", "Mic B Pre Amp"},
603 {"Left Capture Source", "Line", "LINEL 607 {"Left Capture Source", "Line", "LINEL"},
604 {"Left Capture Source", "Mono In", "MO 608 {"Left Capture Source", "Mono In", "MONOIN"},
605 {"Left Capture Source", "Headphone", " 609 {"Left Capture Source", "Headphone", "Left HP Mixer"},
606 {"Left Capture Source", "Speaker", "Sp 610 {"Left Capture Source", "Speaker", "Speaker Mixer"},
607 {"Left Capture Source", "Mono Out", "M 611 {"Left Capture Source", "Mono Out", "Mono Mixer"},
608 612
609 /* right capture select */ 613 /* right capture select */
610 {"Right Capture Source", "Mic 1", "Mic 614 {"Right Capture Source", "Mic 1", "Mic A Pre Amp"},
611 {"Right Capture Source", "Mic 2", "Mic 615 {"Right Capture Source", "Mic 2", "Mic B Pre Amp"},
612 {"Right Capture Source", "Line", "LINE 616 {"Right Capture Source", "Line", "LINER"},
613 {"Right Capture Source", "Mono In", "M 617 {"Right Capture Source", "Mono In", "MONOIN"},
614 {"Right Capture Source", "Headphone", 618 {"Right Capture Source", "Headphone", "Right HP Mixer"},
615 {"Right Capture Source", "Speaker", "S 619 {"Right Capture Source", "Speaker", "Speaker Mixer"},
616 {"Right Capture Source", "Mono Out", " 620 {"Right Capture Source", "Mono Out", "Mono Mixer"},
617 621
618 /* left ADC */ 622 /* left ADC */
619 {"Left ADC", NULL, "Left Capture Sourc 623 {"Left ADC", NULL, "Left Capture Source"},
620 {"Left Voice ADC", NULL, "Left ADC"}, 624 {"Left Voice ADC", NULL, "Left ADC"},
621 {"Left HiFi ADC", NULL, "Left ADC"}, 625 {"Left HiFi ADC", NULL, "Left ADC"},
622 626
623 /* right ADC */ 627 /* right ADC */
624 {"Right ADC", NULL, "Right Capture Sou 628 {"Right ADC", NULL, "Right Capture Source"},
625 {"Right Voice ADC", NULL, "Right ADC"} 629 {"Right Voice ADC", NULL, "Right ADC"},
626 {"Right HiFi ADC", NULL, "Right ADC"}, 630 {"Right HiFi ADC", NULL, "Right ADC"},
627 631
628 /* mic */ 632 /* mic */
629 {"Mic A Pre Amp", NULL, "Mic A Source" 633 {"Mic A Pre Amp", NULL, "Mic A Source"},
630 {"Mic A Source", "Mic 1", "MIC1"}, 634 {"Mic A Source", "Mic 1", "MIC1"},
631 {"Mic A Source", "Mic 2 A", "MIC2A"}, 635 {"Mic A Source", "Mic 2 A", "MIC2A"},
632 {"Mic A Source", "Mic 2 B", "Mic B Sou 636 {"Mic A Source", "Mic 2 B", "Mic B Source"},
633 {"Mic B Pre Amp", "MPB", "Mic B Source 637 {"Mic B Pre Amp", "MPB", "Mic B Source"},
634 {"Mic B Source", NULL, "MIC2B"}, 638 {"Mic B Source", NULL, "MIC2B"},
635 639
636 /* headphone capture */ 640 /* headphone capture */
637 {"Capture Headphone Mux", "Stereo", "C 641 {"Capture Headphone Mux", "Stereo", "Capture Mixer"},
638 {"Capture Headphone Mux", "Left", "Lef 642 {"Capture Headphone Mux", "Left", "Left Capture Source"},
639 {"Capture Headphone Mux", "Right", "Ri 643 {"Capture Headphone Mux", "Right", "Right Capture Source"},
640 644
641 /* mono capture */ 645 /* mono capture */
642 {"Capture Mono Mux", "Stereo", "Captur 646 {"Capture Mono Mux", "Stereo", "Capture Mixer"},
643 {"Capture Mono Mux", "Left", "Left Cap 647 {"Capture Mono Mux", "Left", "Left Capture Source"},
644 {"Capture Mono Mux", "Right", "Right C 648 {"Capture Mono Mux", "Right", "Right Capture Source"},
645 }; 649 };
646 650
647 static bool wm9713_readable_reg(struct device 651 static bool wm9713_readable_reg(struct device *dev, unsigned int reg)
648 { 652 {
649 switch (reg) { 653 switch (reg) {
650 case AC97_RESET ... AC97_PCM_SURR_DAC_ 654 case AC97_RESET ... AC97_PCM_SURR_DAC_RATE:
651 case AC97_PCM_LR_ADC_RATE: 655 case AC97_PCM_LR_ADC_RATE:
652 case AC97_CENTER_LFE_MASTER: 656 case AC97_CENTER_LFE_MASTER:
653 case AC97_SPDIF ... AC97_LINE1_LEVEL: 657 case AC97_SPDIF ... AC97_LINE1_LEVEL:
654 case AC97_GPIO_CFG ... 0x5c: 658 case AC97_GPIO_CFG ... 0x5c:
655 case AC97_CODEC_CLASS_REV ... AC97_PCI 659 case AC97_CODEC_CLASS_REV ... AC97_PCI_SID:
656 case 0x74 ... AC97_VENDOR_ID2: 660 case 0x74 ... AC97_VENDOR_ID2:
657 return true; 661 return true;
658 default: 662 default:
659 return false; 663 return false;
660 } 664 }
661 } 665 }
662 666
663 static bool wm9713_writeable_reg(struct device 667 static bool wm9713_writeable_reg(struct device *dev, unsigned int reg)
664 { 668 {
665 switch (reg) { 669 switch (reg) {
666 case AC97_VENDOR_ID1: 670 case AC97_VENDOR_ID1:
667 case AC97_VENDOR_ID2: 671 case AC97_VENDOR_ID2:
668 return false; 672 return false;
669 default: 673 default:
670 return wm9713_readable_reg(dev 674 return wm9713_readable_reg(dev, reg);
671 } 675 }
672 } 676 }
673 677
674 static const struct reg_default wm9713_reg_def 678 static const struct reg_default wm9713_reg_defaults[] = {
675 { 0x02, 0x8080 }, /* Speaker Out 679 { 0x02, 0x8080 }, /* Speaker Output Volume */
676 { 0x04, 0x8080 }, /* Headphone O 680 { 0x04, 0x8080 }, /* Headphone Output Volume */
677 { 0x06, 0x8080 }, /* Out3/OUT4 V 681 { 0x06, 0x8080 }, /* Out3/OUT4 Volume */
678 { 0x08, 0xc880 }, /* Mono Volume 682 { 0x08, 0xc880 }, /* Mono Volume */
679 { 0x0a, 0xe808 }, /* LINEIN Volu 683 { 0x0a, 0xe808 }, /* LINEIN Volume */
680 { 0x0c, 0xe808 }, /* DAC PGA Vol 684 { 0x0c, 0xe808 }, /* DAC PGA Volume */
681 { 0x0e, 0x0808 }, /* MIC PGA Vol 685 { 0x0e, 0x0808 }, /* MIC PGA Volume */
682 { 0x10, 0x00da }, /* MIC Routing 686 { 0x10, 0x00da }, /* MIC Routing Control */
683 { 0x12, 0x8000 }, /* Record PGA 687 { 0x12, 0x8000 }, /* Record PGA Volume */
684 { 0x14, 0xd600 }, /* Record Rout 688 { 0x14, 0xd600 }, /* Record Routing */
685 { 0x16, 0xaaa0 }, /* PCBEEP Volu 689 { 0x16, 0xaaa0 }, /* PCBEEP Volume */
686 { 0x18, 0xaaa0 }, /* VxDAC Volum 690 { 0x18, 0xaaa0 }, /* VxDAC Volume */
687 { 0x1a, 0xaaa0 }, /* AUXDAC Volu 691 { 0x1a, 0xaaa0 }, /* AUXDAC Volume */
688 { 0x1c, 0x0000 }, /* Output PGA 692 { 0x1c, 0x0000 }, /* Output PGA Mux */
689 { 0x1e, 0x0000 }, /* DAC 3D cont 693 { 0x1e, 0x0000 }, /* DAC 3D control */
690 { 0x20, 0x0f0f }, /* DAC Tone Co 694 { 0x20, 0x0f0f }, /* DAC Tone Control*/
691 { 0x22, 0x0040 }, /* MIC Input S 695 { 0x22, 0x0040 }, /* MIC Input Select & Bias */
692 { 0x24, 0x0000 }, /* Output Volu 696 { 0x24, 0x0000 }, /* Output Volume Mapping & Jack */
693 { 0x26, 0x7f00 }, /* Powerdown C 697 { 0x26, 0x7f00 }, /* Powerdown Ctrl/Stat*/
694 { 0x28, 0x0405 }, /* Extended Au 698 { 0x28, 0x0405 }, /* Extended Audio ID */
695 { 0x2a, 0x0410 }, /* Extended Au 699 { 0x2a, 0x0410 }, /* Extended Audio Start/Ctrl */
696 { 0x2c, 0xbb80 }, /* Audio DACs 700 { 0x2c, 0xbb80 }, /* Audio DACs Sample Rate */
697 { 0x2e, 0xbb80 }, /* AUXDAC Samp 701 { 0x2e, 0xbb80 }, /* AUXDAC Sample Rate */
698 { 0x32, 0xbb80 }, /* Audio ADCs 702 { 0x32, 0xbb80 }, /* Audio ADCs Sample Rate */
699 { 0x36, 0x4523 }, /* PCM codec c 703 { 0x36, 0x4523 }, /* PCM codec control */
700 { 0x3a, 0x2000 }, /* SPDIF contr 704 { 0x3a, 0x2000 }, /* SPDIF control */
701 { 0x3c, 0xfdff }, /* Powerdown 1 705 { 0x3c, 0xfdff }, /* Powerdown 1 */
702 { 0x3e, 0xffff }, /* Powerdown 2 706 { 0x3e, 0xffff }, /* Powerdown 2 */
703 { 0x40, 0x0000 }, /* General Pur 707 { 0x40, 0x0000 }, /* General Purpose */
704 { 0x42, 0x0000 }, /* Fast Power- 708 { 0x42, 0x0000 }, /* Fast Power-Up Control */
705 { 0x44, 0x0080 }, /* MCLK/PLL Co 709 { 0x44, 0x0080 }, /* MCLK/PLL Control */
706 { 0x46, 0x0000 }, /* MCLK/PLL Co 710 { 0x46, 0x0000 }, /* MCLK/PLL Control */
707 { 0x4c, 0xfffe }, /* GPIO Pin Co 711 { 0x4c, 0xfffe }, /* GPIO Pin Configuration */
708 { 0x4e, 0xffff }, /* GPIO Pin Po 712 { 0x4e, 0xffff }, /* GPIO Pin Polarity / Type */
709 { 0x50, 0x0000 }, /* GPIO Pin St 713 { 0x50, 0x0000 }, /* GPIO Pin Sticky */
710 { 0x52, 0x0000 }, /* GPIO Pin Wa 714 { 0x52, 0x0000 }, /* GPIO Pin Wake-Up */
711 /* GPIO Pin St 715 /* GPIO Pin Status */
712 { 0x56, 0xfffe }, /* GPIO Pin Sh 716 { 0x56, 0xfffe }, /* GPIO Pin Sharing */
713 { 0x58, 0x4000 }, /* GPIO PullUp 717 { 0x58, 0x4000 }, /* GPIO PullUp/PullDown */
714 { 0x5a, 0x0000 }, /* Additional 718 { 0x5a, 0x0000 }, /* Additional Functions 1 */
715 { 0x5c, 0x0000 }, /* Additional 719 { 0x5c, 0x0000 }, /* Additional Functions 2 */
716 { 0x60, 0xb032 }, /* ALC Control 720 { 0x60, 0xb032 }, /* ALC Control */
717 { 0x62, 0x3e00 }, /* ALC / Noise 721 { 0x62, 0x3e00 }, /* ALC / Noise Gate Control */
718 { 0x64, 0x0000 }, /* AUXDAC inpu 722 { 0x64, 0x0000 }, /* AUXDAC input control */
719 { 0x74, 0x0000 }, /* Digitiser R 723 { 0x74, 0x0000 }, /* Digitiser Reg 1 */
720 { 0x76, 0x0006 }, /* Digitiser R 724 { 0x76, 0x0006 }, /* Digitiser Reg 2 */
721 { 0x78, 0x0001 }, /* Digitiser R 725 { 0x78, 0x0001 }, /* Digitiser Reg 3 */
722 { 0x7a, 0x0000 }, /* Digitiser R 726 { 0x7a, 0x0000 }, /* Digitiser Read Back */
723 }; 727 };
724 728
725 static const struct regmap_config wm9713_regma 729 static const struct regmap_config wm9713_regmap_config = {
726 .reg_bits = 16, 730 .reg_bits = 16,
727 .reg_stride = 2, 731 .reg_stride = 2,
728 .val_bits = 16, 732 .val_bits = 16,
729 .max_register = 0x7e, 733 .max_register = 0x7e,
730 .cache_type = REGCACHE_MAPLE, !! 734 .cache_type = REGCACHE_RBTREE,
731 735
732 .reg_defaults = wm9713_reg_defaults, 736 .reg_defaults = wm9713_reg_defaults,
733 .num_reg_defaults = ARRAY_SIZE(wm9713_ 737 .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults),
734 .volatile_reg = regmap_ac97_default_vo 738 .volatile_reg = regmap_ac97_default_volatile,
735 .readable_reg = wm9713_readable_reg, 739 .readable_reg = wm9713_readable_reg,
736 .writeable_reg = wm9713_writeable_reg, 740 .writeable_reg = wm9713_writeable_reg,
737 }; 741 };
738 742
739 /* PLL divisors */ 743 /* PLL divisors */
740 struct _pll_div { 744 struct _pll_div {
741 u32 divsel:1; 745 u32 divsel:1;
742 u32 divctl:1; 746 u32 divctl:1;
743 u32 lf:1; 747 u32 lf:1;
744 u32 n:4; 748 u32 n:4;
745 u32 k:24; 749 u32 k:24;
746 }; 750 };
747 751
748 /* The size in bits of the PLL divide multipli 752 /* The size in bits of the PLL divide multiplied by 10
749 * to allow rounding later */ 753 * to allow rounding later */
750 #define FIXED_PLL_SIZE ((1 << 22) * 10) 754 #define FIXED_PLL_SIZE ((1 << 22) * 10)
751 755
752 static void pll_factors(struct snd_soc_compone 756 static void pll_factors(struct snd_soc_component *component,
753 struct _pll_div *pll_div, unsigned int 757 struct _pll_div *pll_div, unsigned int source)
754 { 758 {
755 u64 Kpart; 759 u64 Kpart;
756 unsigned int K, Ndiv, Nmod, target; 760 unsigned int K, Ndiv, Nmod, target;
757 761
758 /* The PLL output is always 98.304MHz. !! 762 /* The the PLL output is always 98.304MHz. */
759 target = 98304000; 763 target = 98304000;
760 764
761 /* If the input frequency is over 14.4 765 /* If the input frequency is over 14.4MHz then scale it down. */
762 if (source > 14400000) { 766 if (source > 14400000) {
763 source >>= 1; 767 source >>= 1;
764 pll_div->divsel = 1; 768 pll_div->divsel = 1;
765 769
766 if (source > 14400000) { 770 if (source > 14400000) {
767 source >>= 1; 771 source >>= 1;
768 pll_div->divctl = 1; 772 pll_div->divctl = 1;
769 } else 773 } else
770 pll_div->divctl = 0; 774 pll_div->divctl = 0;
771 775
772 } else { 776 } else {
773 pll_div->divsel = 0; 777 pll_div->divsel = 0;
774 pll_div->divctl = 0; 778 pll_div->divctl = 0;
775 } 779 }
776 780
777 /* Low frequency sources require an ad 781 /* Low frequency sources require an additional divide in the
778 * loop. 782 * loop.
779 */ 783 */
780 if (source < 8192000) { 784 if (source < 8192000) {
781 pll_div->lf = 1; 785 pll_div->lf = 1;
782 target >>= 2; 786 target >>= 2;
783 } else 787 } else
784 pll_div->lf = 0; 788 pll_div->lf = 0;
785 789
786 Ndiv = target / source; 790 Ndiv = target / source;
787 if ((Ndiv < 5) || (Ndiv > 12)) 791 if ((Ndiv < 5) || (Ndiv > 12))
788 dev_warn(component->dev, 792 dev_warn(component->dev,
789 "WM9713 PLL N value %u 793 "WM9713 PLL N value %u out of recommended range!\n",
790 Ndiv); 794 Ndiv);
791 795
792 pll_div->n = Ndiv; 796 pll_div->n = Ndiv;
793 Nmod = target % source; 797 Nmod = target % source;
794 Kpart = FIXED_PLL_SIZE * (long long)Nm 798 Kpart = FIXED_PLL_SIZE * (long long)Nmod;
795 799
796 do_div(Kpart, source); 800 do_div(Kpart, source);
797 801
798 K = Kpart & 0xFFFFFFFF; 802 K = Kpart & 0xFFFFFFFF;
799 803
800 /* Check if we need to round */ 804 /* Check if we need to round */
801 if ((K % 10) >= 5) 805 if ((K % 10) >= 5)
802 K += 5; 806 K += 5;
803 807
804 /* Move down to proper range now round 808 /* Move down to proper range now rounding is done */
805 K /= 10; 809 K /= 10;
806 810
807 pll_div->k = K; 811 pll_div->k = K;
808 } 812 }
809 813
810 /* !! 814 /**
811 * Please note that changing the PLL input fre 815 * Please note that changing the PLL input frequency may require
812 * resynchronisation with the AC97 controller. 816 * resynchronisation with the AC97 controller.
813 */ 817 */
814 static int wm9713_set_pll(struct snd_soc_compo 818 static int wm9713_set_pll(struct snd_soc_component *component,
815 int pll_id, unsigned int freq_in, unsi 819 int pll_id, unsigned int freq_in, unsigned int freq_out)
816 { 820 {
817 struct wm9713_priv *wm9713 = snd_soc_c 821 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
818 u16 reg, reg2; 822 u16 reg, reg2;
819 struct _pll_div pll_div; 823 struct _pll_div pll_div;
820 824
821 /* turn PLL off ? */ 825 /* turn PLL off ? */
822 if (freq_in == 0) { 826 if (freq_in == 0) {
823 /* disable PLL power and selec 827 /* disable PLL power and select ext source */
824 snd_soc_component_update_bits( 828 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0080, 0x0080);
825 snd_soc_component_update_bits( 829 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0x0200, 0x0200);
826 wm9713->pll_in = 0; 830 wm9713->pll_in = 0;
827 return 0; 831 return 0;
828 } 832 }
829 833
830 pll_factors(component, &pll_div, freq_ 834 pll_factors(component, &pll_div, freq_in);
831 835
832 if (pll_div.k == 0) { 836 if (pll_div.k == 0) {
833 reg = (pll_div.n << 12) | (pll 837 reg = (pll_div.n << 12) | (pll_div.lf << 11) |
834 (pll_div.divsel << 9) 838 (pll_div.divsel << 9) | (pll_div.divctl << 8);
835 snd_soc_component_write(compon 839 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
836 } else { 840 } else {
837 /* write the fractional k to t 841 /* write the fractional k to the reg 0x46 pages */
838 reg2 = (pll_div.n << 12) | (pl 842 reg2 = (pll_div.n << 12) | (pll_div.lf << 11) | (1 << 10) |
839 (pll_div.divsel << 9) 843 (pll_div.divsel << 9) | (pll_div.divctl << 8);
840 844
841 /* K [21:20] */ 845 /* K [21:20] */
842 reg = reg2 | (0x5 << 4) | (pll 846 reg = reg2 | (0x5 << 4) | (pll_div.k >> 20);
843 snd_soc_component_write(compon 847 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
844 848
845 /* K [19:16] */ 849 /* K [19:16] */
846 reg = reg2 | (0x4 << 4) | ((pl 850 reg = reg2 | (0x4 << 4) | ((pll_div.k >> 16) & 0xf);
847 snd_soc_component_write(compon 851 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
848 852
849 /* K [15:12] */ 853 /* K [15:12] */
850 reg = reg2 | (0x3 << 4) | ((pl 854 reg = reg2 | (0x3 << 4) | ((pll_div.k >> 12) & 0xf);
851 snd_soc_component_write(compon 855 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
852 856
853 /* K [11:8] */ 857 /* K [11:8] */
854 reg = reg2 | (0x2 << 4) | ((pl 858 reg = reg2 | (0x2 << 4) | ((pll_div.k >> 8) & 0xf);
855 snd_soc_component_write(compon 859 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
856 860
857 /* K [7:4] */ 861 /* K [7:4] */
858 reg = reg2 | (0x1 << 4) | ((pl 862 reg = reg2 | (0x1 << 4) | ((pll_div.k >> 4) & 0xf);
859 snd_soc_component_write(compon 863 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
860 864
861 reg = reg2 | (0x0 << 4) | (pll 865 reg = reg2 | (0x0 << 4) | (pll_div.k & 0xf); /* K [3:0] */
862 snd_soc_component_write(compon 866 snd_soc_component_write(component, AC97_LINE1_LEVEL, reg);
863 } 867 }
864 868
865 /* turn PLL on and select as source */ 869 /* turn PLL on and select as source */
866 snd_soc_component_update_bits(componen 870 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0x0200, 0x0000);
867 snd_soc_component_update_bits(componen 871 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0080, 0x0000);
868 wm9713->pll_in = freq_in; 872 wm9713->pll_in = freq_in;
869 873
870 /* wait 10ms AC97 link frames for the 874 /* wait 10ms AC97 link frames for the link to stabilise */
871 schedule_timeout_interruptible(msecs_t 875 schedule_timeout_interruptible(msecs_to_jiffies(10));
872 return 0; 876 return 0;
873 } 877 }
874 878
875 static int wm9713_set_dai_pll(struct snd_soc_d 879 static int wm9713_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
876 int source, unsigned int freq_ 880 int source, unsigned int freq_in, unsigned int freq_out)
877 { 881 {
878 struct snd_soc_component *component = 882 struct snd_soc_component *component = codec_dai->component;
879 return wm9713_set_pll(component, pll_i 883 return wm9713_set_pll(component, pll_id, freq_in, freq_out);
880 } 884 }
881 885
882 /* 886 /*
883 * Tristate the PCM DAI lines, tristate can be 887 * Tristate the PCM DAI lines, tristate can be disabled by calling
884 * wm9713_set_dai_fmt() 888 * wm9713_set_dai_fmt()
885 */ 889 */
886 static int wm9713_set_dai_tristate(struct snd_ 890 static int wm9713_set_dai_tristate(struct snd_soc_dai *codec_dai,
887 int tristate) 891 int tristate)
888 { 892 {
889 struct snd_soc_component *component = 893 struct snd_soc_component *component = codec_dai->component;
890 894
891 if (tristate) 895 if (tristate)
892 snd_soc_component_update_bits( 896 snd_soc_component_update_bits(component, AC97_CENTER_LFE_MASTER,
893 0x6000, 0x 897 0x6000, 0x0000);
894 898
895 return 0; 899 return 0;
896 } 900 }
897 901
898 /* 902 /*
899 * Configure WM9713 clock dividers. 903 * Configure WM9713 clock dividers.
900 * Voice DAC needs 256 FS 904 * Voice DAC needs 256 FS
901 */ 905 */
902 static int wm9713_set_dai_clkdiv(struct snd_so 906 static int wm9713_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
903 int div_id, int div) 907 int div_id, int div)
904 { 908 {
905 struct snd_soc_component *component = 909 struct snd_soc_component *component = codec_dai->component;
906 910
907 switch (div_id) { 911 switch (div_id) {
908 case WM9713_PCMCLK_DIV: 912 case WM9713_PCMCLK_DIV:
909 snd_soc_component_update_bits( 913 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0f00, div);
910 break; 914 break;
911 case WM9713_CLKA_MULT: 915 case WM9713_CLKA_MULT:
912 snd_soc_component_update_bits( 916 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0002, div);
913 break; 917 break;
914 case WM9713_CLKB_MULT: 918 case WM9713_CLKB_MULT:
915 snd_soc_component_update_bits( 919 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x0004, div);
916 break; 920 break;
917 case WM9713_HIFI_DIV: 921 case WM9713_HIFI_DIV:
918 snd_soc_component_update_bits( 922 snd_soc_component_update_bits(component, AC97_HANDSET_RATE, 0x7000, div);
919 break; 923 break;
920 case WM9713_PCMBCLK_DIV: 924 case WM9713_PCMBCLK_DIV:
921 snd_soc_component_update_bits( 925 snd_soc_component_update_bits(component, AC97_CENTER_LFE_MASTER, 0x0e00, div);
922 break; 926 break;
923 case WM9713_PCMCLK_PLL_DIV: 927 case WM9713_PCMCLK_PLL_DIV:
924 snd_soc_component_update_bits( 928 snd_soc_component_update_bits(component, AC97_LINE1_LEVEL,
925 0x007f, di 929 0x007f, div | 0x60);
926 break; 930 break;
927 case WM9713_HIFI_PLL_DIV: 931 case WM9713_HIFI_PLL_DIV:
928 snd_soc_component_update_bits( 932 snd_soc_component_update_bits(component, AC97_LINE1_LEVEL,
929 0x007f, di 933 0x007f, div | 0x70);
930 break; 934 break;
931 default: 935 default:
932 return -EINVAL; 936 return -EINVAL;
933 } 937 }
934 938
935 return 0; 939 return 0;
936 } 940 }
937 941
938 static int wm9713_set_dai_fmt(struct snd_soc_d 942 static int wm9713_set_dai_fmt(struct snd_soc_dai *codec_dai,
939 unsigned int fmt) 943 unsigned int fmt)
940 { 944 {
941 struct snd_soc_component *component = 945 struct snd_soc_component *component = codec_dai->component;
942 u16 gpio = snd_soc_component_read(comp !! 946 u16 gpio = snd_soc_component_read32(component, AC97_GPIO_CFG) & 0xffc5;
943 u16 reg = 0x8000; 947 u16 reg = 0x8000;
944 948
945 /* clock masters */ 949 /* clock masters */
946 switch (fmt & SND_SOC_DAIFMT_MASTER_MA 950 switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
947 case SND_SOC_DAIFMT_CBM_CFM: 951 case SND_SOC_DAIFMT_CBM_CFM:
948 reg |= 0x4000; 952 reg |= 0x4000;
949 gpio |= 0x0010; 953 gpio |= 0x0010;
950 break; 954 break;
951 case SND_SOC_DAIFMT_CBM_CFS: 955 case SND_SOC_DAIFMT_CBM_CFS:
952 reg |= 0x6000; 956 reg |= 0x6000;
953 gpio |= 0x0018; 957 gpio |= 0x0018;
954 break; 958 break;
955 case SND_SOC_DAIFMT_CBS_CFS: 959 case SND_SOC_DAIFMT_CBS_CFS:
956 reg |= 0x2000; 960 reg |= 0x2000;
957 gpio |= 0x001a; 961 gpio |= 0x001a;
958 break; 962 break;
959 case SND_SOC_DAIFMT_CBS_CFM: 963 case SND_SOC_DAIFMT_CBS_CFM:
960 gpio |= 0x0012; 964 gpio |= 0x0012;
961 break; 965 break;
962 } 966 }
963 967
964 /* clock inversion */ 968 /* clock inversion */
965 switch (fmt & SND_SOC_DAIFMT_INV_MASK) 969 switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
966 case SND_SOC_DAIFMT_IB_IF: 970 case SND_SOC_DAIFMT_IB_IF:
967 reg |= 0x00c0; 971 reg |= 0x00c0;
968 break; 972 break;
969 case SND_SOC_DAIFMT_IB_NF: 973 case SND_SOC_DAIFMT_IB_NF:
970 reg |= 0x0080; 974 reg |= 0x0080;
971 break; 975 break;
972 case SND_SOC_DAIFMT_NB_IF: 976 case SND_SOC_DAIFMT_NB_IF:
973 reg |= 0x0040; 977 reg |= 0x0040;
974 break; 978 break;
975 } 979 }
976 980
977 /* DAI format */ 981 /* DAI format */
978 switch (fmt & SND_SOC_DAIFMT_FORMAT_MA 982 switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
979 case SND_SOC_DAIFMT_I2S: 983 case SND_SOC_DAIFMT_I2S:
980 reg |= 0x0002; 984 reg |= 0x0002;
981 break; 985 break;
982 case SND_SOC_DAIFMT_RIGHT_J: 986 case SND_SOC_DAIFMT_RIGHT_J:
983 break; 987 break;
984 case SND_SOC_DAIFMT_LEFT_J: 988 case SND_SOC_DAIFMT_LEFT_J:
985 reg |= 0x0001; 989 reg |= 0x0001;
986 break; 990 break;
987 case SND_SOC_DAIFMT_DSP_A: 991 case SND_SOC_DAIFMT_DSP_A:
988 reg |= 0x0003; 992 reg |= 0x0003;
989 break; 993 break;
990 case SND_SOC_DAIFMT_DSP_B: 994 case SND_SOC_DAIFMT_DSP_B:
991 reg |= 0x0043; 995 reg |= 0x0043;
992 break; 996 break;
993 } 997 }
994 998
995 snd_soc_component_write(component, AC9 999 snd_soc_component_write(component, AC97_GPIO_CFG, gpio);
996 snd_soc_component_write(component, AC9 1000 snd_soc_component_write(component, AC97_CENTER_LFE_MASTER, reg);
997 return 0; 1001 return 0;
998 } 1002 }
999 1003
1000 static int wm9713_pcm_hw_params(struct snd_pc 1004 static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream,
1001 struct snd_pc 1005 struct snd_pcm_hw_params *params,
1002 struct snd_so 1006 struct snd_soc_dai *dai)
1003 { 1007 {
1004 struct snd_soc_component *component = 1008 struct snd_soc_component *component = dai->component;
1005 1009
1006 /* enable PCM interface in master mod 1010 /* enable PCM interface in master mode */
1007 switch (params_width(params)) { 1011 switch (params_width(params)) {
1008 case 16: 1012 case 16:
1009 break; 1013 break;
1010 case 20: 1014 case 20:
1011 snd_soc_component_update_bits 1015 snd_soc_component_update_bits(component, AC97_CENTER_LFE_MASTER,
1012 0x000c, 0 1016 0x000c, 0x0004);
1013 break; 1017 break;
1014 case 24: 1018 case 24:
1015 snd_soc_component_update_bits 1019 snd_soc_component_update_bits(component, AC97_CENTER_LFE_MASTER,
1016 0x000c, 0 1020 0x000c, 0x0008);
1017 break; 1021 break;
1018 case 32: 1022 case 32:
1019 snd_soc_component_update_bits 1023 snd_soc_component_update_bits(component, AC97_CENTER_LFE_MASTER,
1020 0x000c, 0 1024 0x000c, 0x000c);
1021 break; 1025 break;
1022 } 1026 }
1023 return 0; 1027 return 0;
1024 } 1028 }
1025 1029
1026 static int ac97_hifi_prepare(struct snd_pcm_s 1030 static int ac97_hifi_prepare(struct snd_pcm_substream *substream,
1027 struct snd_soc_d 1031 struct snd_soc_dai *dai)
1028 { 1032 {
1029 struct snd_soc_component *component = 1033 struct snd_soc_component *component = dai->component;
1030 struct snd_pcm_runtime *runtime = sub 1034 struct snd_pcm_runtime *runtime = substream->runtime;
1031 int reg; 1035 int reg;
1032 1036
1033 snd_soc_component_update_bits(compone 1037 snd_soc_component_update_bits(component, AC97_EXTENDED_STATUS, 0x0001, 0x0001);
1034 1038
1035 if (substream->stream == SNDRV_PCM_ST 1039 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
1036 reg = AC97_PCM_FRONT_DAC_RATE 1040 reg = AC97_PCM_FRONT_DAC_RATE;
1037 else 1041 else
1038 reg = AC97_PCM_LR_ADC_RATE; 1042 reg = AC97_PCM_LR_ADC_RATE;
1039 1043
1040 return snd_soc_component_write(compon 1044 return snd_soc_component_write(component, reg, runtime->rate);
1041 } 1045 }
1042 1046
1043 static int ac97_aux_prepare(struct snd_pcm_su 1047 static int ac97_aux_prepare(struct snd_pcm_substream *substream,
1044 struct snd_soc_da 1048 struct snd_soc_dai *dai)
1045 { 1049 {
1046 struct snd_soc_component *component = 1050 struct snd_soc_component *component = dai->component;
1047 struct snd_pcm_runtime *runtime = sub 1051 struct snd_pcm_runtime *runtime = substream->runtime;
1048 1052
1049 snd_soc_component_update_bits(compone 1053 snd_soc_component_update_bits(component, AC97_EXTENDED_STATUS, 0x0001, 0x0001);
1050 snd_soc_component_update_bits(compone 1054 snd_soc_component_update_bits(component, AC97_PCI_SID, 0x8000, 0x8000);
1051 1055
1052 if (substream->stream != SNDRV_PCM_ST 1056 if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
1053 return -ENODEV; 1057 return -ENODEV;
1054 1058
1055 return snd_soc_component_write(compon 1059 return snd_soc_component_write(component, AC97_PCM_SURR_DAC_RATE, runtime->rate);
1056 } 1060 }
1057 1061
1058 #define WM9713_RATES (SNDRV_PCM_RATE_8000 | 1062 #define WM9713_RATES (SNDRV_PCM_RATE_8000 | \
1059 SNDRV_PCM_RATE_11025 | 1063 SNDRV_PCM_RATE_11025 | \
1060 SNDRV_PCM_RATE_22050 | 1064 SNDRV_PCM_RATE_22050 | \
1061 SNDRV_PCM_RATE_44100 | 1065 SNDRV_PCM_RATE_44100 | \
1062 SNDRV_PCM_RATE_48000) 1066 SNDRV_PCM_RATE_48000)
1063 1067
1064 #define WM9713_PCM_RATES (SNDRV_PCM_RATE_8000 1068 #define WM9713_PCM_RATES (SNDRV_PCM_RATE_8000 | \
1065 SNDRV_PCM_RATE_1102 1069 SNDRV_PCM_RATE_11025 | \
1066 SNDRV_PCM_RATE_1600 1070 SNDRV_PCM_RATE_16000 | \
1067 SNDRV_PCM_RATE_2205 1071 SNDRV_PCM_RATE_22050 | \
1068 SNDRV_PCM_RATE_4410 1072 SNDRV_PCM_RATE_44100 | \
1069 SNDRV_PCM_RATE_4800 1073 SNDRV_PCM_RATE_48000)
1070 1074
1071 #define WM9713_PCM_FORMATS \ 1075 #define WM9713_PCM_FORMATS \
1072 (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_ 1076 (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
1073 SNDRV_PCM_FMTBIT_S24_LE) 1077 SNDRV_PCM_FMTBIT_S24_LE)
1074 1078
1075 static const struct snd_soc_dai_ops wm9713_da 1079 static const struct snd_soc_dai_ops wm9713_dai_ops_hifi = {
1076 .prepare = ac97_hifi_prepare, 1080 .prepare = ac97_hifi_prepare,
1077 .set_clkdiv = wm9713_set_dai_clkd 1081 .set_clkdiv = wm9713_set_dai_clkdiv,
1078 .set_pll = wm9713_set_dai_pll, 1082 .set_pll = wm9713_set_dai_pll,
1079 }; 1083 };
1080 1084
1081 static const struct snd_soc_dai_ops wm9713_da 1085 static const struct snd_soc_dai_ops wm9713_dai_ops_aux = {
1082 .prepare = ac97_aux_prepare, 1086 .prepare = ac97_aux_prepare,
1083 .set_clkdiv = wm9713_set_dai_clkd 1087 .set_clkdiv = wm9713_set_dai_clkdiv,
1084 .set_pll = wm9713_set_dai_pll, 1088 .set_pll = wm9713_set_dai_pll,
1085 }; 1089 };
1086 1090
1087 static const struct snd_soc_dai_ops wm9713_da 1091 static const struct snd_soc_dai_ops wm9713_dai_ops_voice = {
1088 .hw_params = wm9713_pcm_hw_param 1092 .hw_params = wm9713_pcm_hw_params,
1089 .set_clkdiv = wm9713_set_dai_clkd 1093 .set_clkdiv = wm9713_set_dai_clkdiv,
1090 .set_pll = wm9713_set_dai_pll, 1094 .set_pll = wm9713_set_dai_pll,
1091 .set_fmt = wm9713_set_dai_fmt, 1095 .set_fmt = wm9713_set_dai_fmt,
1092 .set_tristate = wm9713_set_dai_tris 1096 .set_tristate = wm9713_set_dai_tristate,
1093 }; 1097 };
1094 1098
1095 static struct snd_soc_dai_driver wm9713_dai[] 1099 static struct snd_soc_dai_driver wm9713_dai[] = {
1096 { 1100 {
1097 .name = "wm9713-hifi", 1101 .name = "wm9713-hifi",
1098 .playback = { 1102 .playback = {
1099 .stream_name = "HiFi Playback 1103 .stream_name = "HiFi Playback",
1100 .channels_min = 1, 1104 .channels_min = 1,
1101 .channels_max = 2, 1105 .channels_max = 2,
1102 .rates = WM9713_RATES, 1106 .rates = WM9713_RATES,
1103 .formats = SND_SOC_STD_AC97_F 1107 .formats = SND_SOC_STD_AC97_FMTS,},
1104 .capture = { 1108 .capture = {
1105 .stream_name = "HiFi Capture" 1109 .stream_name = "HiFi Capture",
1106 .channels_min = 1, 1110 .channels_min = 1,
1107 .channels_max = 2, 1111 .channels_max = 2,
1108 .rates = WM9713_RATES, 1112 .rates = WM9713_RATES,
1109 .formats = SND_SOC_STD_AC97_F 1113 .formats = SND_SOC_STD_AC97_FMTS,},
1110 .ops = &wm9713_dai_ops_hifi, 1114 .ops = &wm9713_dai_ops_hifi,
1111 }, 1115 },
1112 { 1116 {
1113 .name = "wm9713-aux", 1117 .name = "wm9713-aux",
1114 .playback = { 1118 .playback = {
1115 .stream_name = "Aux Playback" 1119 .stream_name = "Aux Playback",
1116 .channels_min = 1, 1120 .channels_min = 1,
1117 .channels_max = 1, 1121 .channels_max = 1,
1118 .rates = WM9713_RATES, 1122 .rates = WM9713_RATES,
1119 .formats = SND_SOC_STD_AC97_F 1123 .formats = SND_SOC_STD_AC97_FMTS,},
1120 .ops = &wm9713_dai_ops_aux, 1124 .ops = &wm9713_dai_ops_aux,
1121 }, 1125 },
1122 { 1126 {
1123 .name = "wm9713-voice", 1127 .name = "wm9713-voice",
1124 .playback = { 1128 .playback = {
1125 .stream_name = "Voice Playbac 1129 .stream_name = "Voice Playback",
1126 .channels_min = 1, 1130 .channels_min = 1,
1127 .channels_max = 1, 1131 .channels_max = 1,
1128 .rates = WM9713_PCM_RATES, 1132 .rates = WM9713_PCM_RATES,
1129 .formats = WM9713_PCM_FORMATS 1133 .formats = WM9713_PCM_FORMATS,},
1130 .capture = { 1134 .capture = {
1131 .stream_name = "Voice Capture 1135 .stream_name = "Voice Capture",
1132 .channels_min = 1, 1136 .channels_min = 1,
1133 .channels_max = 2, 1137 .channels_max = 2,
1134 .rates = WM9713_PCM_RATES, 1138 .rates = WM9713_PCM_RATES,
1135 .formats = WM9713_PCM_FORMATS 1139 .formats = WM9713_PCM_FORMATS,},
1136 .ops = &wm9713_dai_ops_voice, 1140 .ops = &wm9713_dai_ops_voice,
1137 .symmetric_rate = 1, !! 1141 .symmetric_rates = 1,
1138 }, 1142 },
1139 }; 1143 };
1140 1144
1141 static int wm9713_set_bias_level(struct snd_s 1145 static int wm9713_set_bias_level(struct snd_soc_component *component,
1142 enum snd_soc 1146 enum snd_soc_bias_level level)
1143 { 1147 {
1144 switch (level) { 1148 switch (level) {
1145 case SND_SOC_BIAS_ON: 1149 case SND_SOC_BIAS_ON:
1146 /* enable thermal shutdown */ 1150 /* enable thermal shutdown */
1147 snd_soc_component_update_bits 1151 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0xe400, 0x0000);
1148 break; 1152 break;
1149 case SND_SOC_BIAS_PREPARE: 1153 case SND_SOC_BIAS_PREPARE:
1150 break; 1154 break;
1151 case SND_SOC_BIAS_STANDBY: 1155 case SND_SOC_BIAS_STANDBY:
1152 /* enable master bias and vmi 1156 /* enable master bias and vmid */
1153 snd_soc_component_update_bits 1157 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0xc400, 0x0000);
1154 snd_soc_component_write(compo 1158 snd_soc_component_write(component, AC97_POWERDOWN, 0x0000);
1155 break; 1159 break;
1156 case SND_SOC_BIAS_OFF: 1160 case SND_SOC_BIAS_OFF:
1157 /* disable everything includi 1161 /* disable everything including AC link */
1158 snd_soc_component_write(compo 1162 snd_soc_component_write(component, AC97_EXTENDED_MID, 0xffff);
1159 snd_soc_component_write(compo 1163 snd_soc_component_write(component, AC97_EXTENDED_MSTATUS, 0xffff);
1160 snd_soc_component_write(compo 1164 snd_soc_component_write(component, AC97_POWERDOWN, 0xffff);
1161 break; 1165 break;
1162 } 1166 }
1163 return 0; 1167 return 0;
1164 } 1168 }
1165 1169
1166 static int wm9713_soc_suspend(struct snd_soc_ 1170 static int wm9713_soc_suspend(struct snd_soc_component *component)
1167 { 1171 {
1168 /* Disable everything except touchpan 1172 /* Disable everything except touchpanel - that will be handled
1169 * by the touch driver and left disab 1173 * by the touch driver and left disabled if touch is not in
1170 * use. */ 1174 * use. */
1171 snd_soc_component_update_bits(compone 1175 snd_soc_component_update_bits(component, AC97_EXTENDED_MID, 0x7fff,
1172 0x7fff); 1176 0x7fff);
1173 snd_soc_component_write(component, AC 1177 snd_soc_component_write(component, AC97_EXTENDED_MSTATUS, 0xffff);
1174 snd_soc_component_write(component, AC 1178 snd_soc_component_write(component, AC97_POWERDOWN, 0x6f00);
1175 snd_soc_component_write(component, AC 1179 snd_soc_component_write(component, AC97_POWERDOWN, 0xffff);
1176 1180
1177 return 0; 1181 return 0;
1178 } 1182 }
1179 1183
1180 static int wm9713_soc_resume(struct snd_soc_c 1184 static int wm9713_soc_resume(struct snd_soc_component *component)
1181 { 1185 {
1182 struct wm9713_priv *wm9713 = snd_soc_ 1186 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
1183 int ret; 1187 int ret;
1184 1188
1185 ret = snd_ac97_reset(wm9713->ac97, tr 1189 ret = snd_ac97_reset(wm9713->ac97, true, WM9713_VENDOR_ID,
1186 WM9713_VENDOR_ID_MASK); 1190 WM9713_VENDOR_ID_MASK);
1187 if (ret < 0) 1191 if (ret < 0)
1188 return ret; 1192 return ret;
1189 1193
1190 snd_soc_component_force_bias_level(co 1194 snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
1191 1195
1192 /* do we need to re-start the PLL ? * 1196 /* do we need to re-start the PLL ? */
1193 if (wm9713->pll_in) 1197 if (wm9713->pll_in)
1194 wm9713_set_pll(component, 0, 1198 wm9713_set_pll(component, 0, wm9713->pll_in, 0);
1195 1199
1196 /* only synchronise the codec if warm 1200 /* only synchronise the codec if warm reset failed */
1197 if (ret == 0) { 1201 if (ret == 0) {
1198 regcache_mark_dirty(component 1202 regcache_mark_dirty(component->regmap);
1199 snd_soc_component_cache_sync( 1203 snd_soc_component_cache_sync(component);
1200 } 1204 }
1201 1205
1202 return ret; 1206 return ret;
1203 } 1207 }
1204 1208
1205 static int wm9713_soc_probe(struct snd_soc_co 1209 static int wm9713_soc_probe(struct snd_soc_component *component)
1206 { 1210 {
1207 struct wm9713_priv *wm9713 = snd_soc_ 1211 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
1208 struct regmap *regmap = NULL; 1212 struct regmap *regmap = NULL;
1209 1213
1210 if (wm9713->mfd_pdata) { 1214 if (wm9713->mfd_pdata) {
1211 wm9713->ac97 = wm9713->mfd_pd 1215 wm9713->ac97 = wm9713->mfd_pdata->ac97;
1212 regmap = wm9713->mfd_pdata->r 1216 regmap = wm9713->mfd_pdata->regmap;
1213 } else if (IS_ENABLED(CONFIG_SND_SOC_ 1217 } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) {
1214 wm9713->ac97 = snd_soc_new_ac 1218 wm9713->ac97 = snd_soc_new_ac97_component(component, WM9713_VENDOR_ID,
1215 1219 WM9713_VENDOR_ID_MASK);
1216 if (IS_ERR(wm9713->ac97)) 1220 if (IS_ERR(wm9713->ac97))
1217 return PTR_ERR(wm9713 1221 return PTR_ERR(wm9713->ac97);
1218 regmap = regmap_init_ac97(wm9 1222 regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config);
1219 if (IS_ERR(regmap)) { 1223 if (IS_ERR(regmap)) {
1220 snd_soc_free_ac97_com 1224 snd_soc_free_ac97_component(wm9713->ac97);
1221 return PTR_ERR(regmap 1225 return PTR_ERR(regmap);
1222 } 1226 }
1223 } else { 1227 } else {
1224 return -ENXIO; 1228 return -ENXIO;
1225 } 1229 }
1226 1230
1227 snd_soc_component_init_regmap(compone 1231 snd_soc_component_init_regmap(component, regmap);
1228 1232
1229 /* unmute the adc - move to kcontrol 1233 /* unmute the adc - move to kcontrol */
1230 snd_soc_component_update_bits(compone 1234 snd_soc_component_update_bits(component, AC97_CD, 0x7fff, 0x0000);
1231 1235
1232 return 0; 1236 return 0;
1233 } 1237 }
1234 1238
1235 static void wm9713_soc_remove(struct snd_soc_ 1239 static void wm9713_soc_remove(struct snd_soc_component *component)
1236 { 1240 {
1237 struct wm9713_priv *wm9713 = snd_soc_ 1241 struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component);
1238 1242
1239 if (IS_ENABLED(CONFIG_SND_SOC_AC97_BU 1243 if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9713->mfd_pdata) {
1240 snd_soc_component_exit_regmap 1244 snd_soc_component_exit_regmap(component);
1241 snd_soc_free_ac97_component(w 1245 snd_soc_free_ac97_component(wm9713->ac97);
1242 } 1246 }
1243 } 1247 }
1244 1248
1245 static const struct snd_soc_component_driver 1249 static const struct snd_soc_component_driver soc_component_dev_wm9713 = {
1246 .probe = wm9713_soc_ 1250 .probe = wm9713_soc_probe,
1247 .remove = wm9713_soc_ 1251 .remove = wm9713_soc_remove,
1248 .suspend = wm9713_soc_ 1252 .suspend = wm9713_soc_suspend,
1249 .resume = wm9713_soc_ 1253 .resume = wm9713_soc_resume,
1250 .set_bias_level = wm9713_set_ 1254 .set_bias_level = wm9713_set_bias_level,
1251 .controls = wm9713_snd_ 1255 .controls = wm9713_snd_ac97_controls,
1252 .num_controls = ARRAY_SIZE( 1256 .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls),
1253 .dapm_widgets = wm9713_dapm 1257 .dapm_widgets = wm9713_dapm_widgets,
1254 .num_dapm_widgets = ARRAY_SIZE( 1258 .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets),
1255 .dapm_routes = wm9713_audi 1259 .dapm_routes = wm9713_audio_map,
1256 .num_dapm_routes = ARRAY_SIZE( 1260 .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map),
1257 .idle_bias_on = 1, 1261 .idle_bias_on = 1,
1258 .use_pmdown_time = 1, 1262 .use_pmdown_time = 1,
1259 .endianness = 1, 1263 .endianness = 1,
>> 1264 .non_legacy_dai_naming = 1,
1260 }; 1265 };
1261 1266
1262 static int wm9713_probe(struct platform_devic 1267 static int wm9713_probe(struct platform_device *pdev)
1263 { 1268 {
1264 struct wm9713_priv *wm9713; 1269 struct wm9713_priv *wm9713;
1265 1270
1266 wm9713 = devm_kzalloc(&pdev->dev, siz 1271 wm9713 = devm_kzalloc(&pdev->dev, sizeof(*wm9713), GFP_KERNEL);
1267 if (wm9713 == NULL) 1272 if (wm9713 == NULL)
1268 return -ENOMEM; 1273 return -ENOMEM;
1269 1274
1270 mutex_init(&wm9713->lock); 1275 mutex_init(&wm9713->lock);
1271 1276
1272 wm9713->mfd_pdata = dev_get_platdata( 1277 wm9713->mfd_pdata = dev_get_platdata(&pdev->dev);
1273 platform_set_drvdata(pdev, wm9713); 1278 platform_set_drvdata(pdev, wm9713);
1274 1279
1275 return devm_snd_soc_register_componen 1280 return devm_snd_soc_register_component(&pdev->dev,
1276 &soc_component_dev_wm 1281 &soc_component_dev_wm9713, wm9713_dai, ARRAY_SIZE(wm9713_dai));
1277 } 1282 }
1278 1283
1279 static struct platform_driver wm9713_codec_dr 1284 static struct platform_driver wm9713_codec_driver = {
1280 .driver = { 1285 .driver = {
1281 .name = "wm9713-codec 1286 .name = "wm9713-codec",
1282 }, 1287 },
1283 1288
1284 .probe = wm9713_probe, 1289 .probe = wm9713_probe,
1285 }; 1290 };
1286 1291
1287 module_platform_driver(wm9713_codec_driver); 1292 module_platform_driver(wm9713_codec_driver);
1288 1293
1289 MODULE_DESCRIPTION("ASoC WM9713/WM9714 driver 1294 MODULE_DESCRIPTION("ASoC WM9713/WM9714 driver");
1290 MODULE_AUTHOR("Liam Girdwood"); 1295 MODULE_AUTHOR("Liam Girdwood");
1291 MODULE_LICENSE("GPL"); 1296 MODULE_LICENSE("GPL");
1292 1297
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.