Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: Correct WM8994 MICBIAS supply widget hookup
ASoC: Fix shift in WM8958 accessory detection default implementation
ASoC: sh: fsi-hdmi: fixup snd_soc_card name
ASoC: sh: fsi-da7210: fixup snd_soc_card name
ASoC: sh: fsi-ak4642: fixup snd_soc_card name
+16
-15
+5
-4
sound/soc/codecs/wm8994.c
+5
-4
sound/soc/codecs/wm8994.c
···
1190
1190
SND_SOC_DAPM_INPUT("DMIC2DAT"),
1191
1191
SND_SOC_DAPM_INPUT("Clock"),
1192
1192
1193
-
SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),
1194
1193
SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,
1195
1194
SND_SOC_DAPM_PRE_PMU),
1196
1195
···
1508
1509
{ "AIF2DACDAT", NULL, "AIF1DACDAT" },
1509
1510
{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },
1510
1511
{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },
1511
-
{ "MICBIAS", NULL, "CLK_SYS" },
1512
-
{ "MICBIAS", NULL, "MICBIAS Supply" },
1512
+
{ "MICBIAS1", NULL, "CLK_SYS" },
1513
+
{ "MICBIAS1", NULL, "MICBIAS Supply" },
1514
+
{ "MICBIAS2", NULL, "CLK_SYS" },
1515
+
{ "MICBIAS2", NULL, "MICBIAS Supply" },
1513
1516
};
1514
1517
1515
1518
static const struct snd_soc_dapm_route wm8994_intercon[] = {
···
2764
2763
report = SND_JACK_MICROPHONE;
2765
2764
2766
2765
/* Everything else is buttons; just assign slots */
2767
-
if (status & 0x1c0)
2766
+
if (status & 0x1c)
2768
2767
report |= SND_JACK_BTN_0;
2769
2768
2770
2769
done:
+8
-8
sound/soc/sh/fsi-ak4642.c
+8
-8
sound/soc/sh/fsi-ak4642.c
···
97
97
98
98
static struct fsi_ak4642_data fsi_a_ak4642 = {
99
99
.name = "AK4642",
100
-
.card = "FSIA (AK4642)",
100
+
.card = "FSIA-AK4642",
101
101
.cpu_dai = "fsia-dai",
102
102
.codec = "ak4642-codec.0-0012",
103
103
.platform = "sh_fsi.0",
···
106
106
107
107
static struct fsi_ak4642_data fsi_b_ak4642 = {
108
108
.name = "AK4642",
109
-
.card = "FSIB (AK4642)",
109
+
.card = "FSIB-AK4642",
110
110
.cpu_dai = "fsib-dai",
111
111
.codec = "ak4642-codec.0-0012",
112
112
.platform = "sh_fsi.0",
···
115
115
116
116
static struct fsi_ak4642_data fsi_a_ak4643 = {
117
117
.name = "AK4643",
118
-
.card = "FSIA (AK4643)",
118
+
.card = "FSIA-AK4643",
119
119
.cpu_dai = "fsia-dai",
120
120
.codec = "ak4642-codec.0-0013",
121
121
.platform = "sh_fsi.0",
···
124
124
125
125
static struct fsi_ak4642_data fsi_b_ak4643 = {
126
126
.name = "AK4643",
127
-
.card = "FSIB (AK4643)",
127
+
.card = "FSIB-AK4643",
128
128
.cpu_dai = "fsib-dai",
129
129
.codec = "ak4642-codec.0-0013",
130
130
.platform = "sh_fsi.0",
···
133
133
134
134
static struct fsi_ak4642_data fsi2_a_ak4642 = {
135
135
.name = "AK4642",
136
-
.card = "FSI2A (AK4642)",
136
+
.card = "FSI2A-AK4642",
137
137
.cpu_dai = "fsia-dai",
138
138
.codec = "ak4642-codec.0-0012",
139
139
.platform = "sh_fsi2",
···
142
142
143
143
static struct fsi_ak4642_data fsi2_b_ak4642 = {
144
144
.name = "AK4642",
145
-
.card = "FSI2B (AK4642)",
145
+
.card = "FSI2B-AK4642",
146
146
.cpu_dai = "fsib-dai",
147
147
.codec = "ak4642-codec.0-0012",
148
148
.platform = "sh_fsi2",
···
151
151
152
152
static struct fsi_ak4642_data fsi2_a_ak4643 = {
153
153
.name = "AK4643",
154
-
.card = "FSI2A (AK4643)",
154
+
.card = "FSI2A-AK4643",
155
155
.cpu_dai = "fsia-dai",
156
156
.codec = "ak4642-codec.0-0013",
157
157
.platform = "sh_fsi2",
···
160
160
161
161
static struct fsi_ak4642_data fsi2_b_ak4643 = {
162
162
.name = "AK4643",
163
-
.card = "FSI2B (AK4643)",
163
+
.card = "FSI2B-AK4643",
164
164
.cpu_dai = "fsib-dai",
165
165
.codec = "ak4642-codec.0-0013",
166
166
.platform = "sh_fsi2",
+1
-1
sound/soc/sh/fsi-da7210.c
+1
-1
sound/soc/sh/fsi-da7210.c
+2
-2
sound/soc/sh/fsi-hdmi.c
+2
-2
sound/soc/sh/fsi-hdmi.c
···
83
83
84
84
static struct fsi_hdmi_data fsi2_a_hdmi = {
85
85
.cpu_dai = "fsia-dai",
86
-
.card = "FSI2A (SH MOBILE HDMI)",
86
+
.card = "FSI2A-HDMI",
87
87
.id = FSI_PORT_A,
88
88
};
89
89
90
90
static struct fsi_hdmi_data fsi2_b_hdmi = {
91
91
.cpu_dai = "fsib-dai",
92
-
.card = "FSI2B (SH MOBILE HDMI)",
92
+
.card = "FSI2B-HDMI",
93
93
.id = FSI_PORT_B,
94
94
};
95
95