Skip to content

Commit 524196d

Browse files
torvaldstorvalds
committed
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
2 parents d36c301 + b793eb6 commit 524196d

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

‎sound/soc/codecs/wm8994.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"),
11901190
SND_SOC_DAPM_INPUT("DMIC2DAT"),
11911191
SND_SOC_DAPM_INPUT("Clock"),
11921192

1193-
SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),
11941193
SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,
11951194
SND_SOC_DAPM_PRE_PMU),
11961195

@@ -1509,8 +1508,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = {
15091508
{ "AIF2DACDAT", NULL, "AIF1DACDAT" },
15101509
{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },
15111510
{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },
1512-
{ "MICBIAS", NULL, "CLK_SYS" },
1513-
{ "MICBIAS", NULL, "MICBIAS Supply" },
1511+
{ "MICBIAS1", NULL, "CLK_SYS" },
1512+
{ "MICBIAS1", NULL, "MICBIAS Supply" },
1513+
{ "MICBIAS2", NULL, "CLK_SYS" },
1514+
{ "MICBIAS2", NULL, "MICBIAS Supply" },
15141515
};
15151516

15161517
static const struct snd_soc_dapm_route wm8994_intercon[] = {
@@ -2763,7 +2764,7 @@ static void wm8958_default_micdet(u16 status, void *data)
27632764
report = SND_JACK_MICROPHONE;
27642765

27652766
/* Everything else is buttons; just assign slots */
2766-
if (status & 0x1c0)
2767+
if (status & 0x1c)
27672768
report |= SND_JACK_BTN_0;
27682769

27692770
done:

‎sound/soc/sh/fsi-ak4642.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static int fsi_ak4642_remove(struct platform_device *pdev)
9797

9898
static struct fsi_ak4642_data fsi_a_ak4642 = {
9999
.name = "AK4642",
100-
.card = "FSIA (AK4642)",
100+
.card = "FSIA-AK4642",
101101
.cpu_dai = "fsia-dai",
102102
.codec = "ak4642-codec.0-0012",
103103
.platform = "sh_fsi.0",
@@ -106,7 +106,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = {
106106

107107
static struct fsi_ak4642_data fsi_b_ak4642 = {
108108
.name = "AK4642",
109-
.card = "FSIB (AK4642)",
109+
.card = "FSIB-AK4642",
110110
.cpu_dai = "fsib-dai",
111111
.codec = "ak4642-codec.0-0012",
112112
.platform = "sh_fsi.0",
@@ -115,7 +115,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = {
115115

116116
static struct fsi_ak4642_data fsi_a_ak4643 = {
117117
.name = "AK4643",
118-
.card = "FSIA (AK4643)",
118+
.card = "FSIA-AK4643",
119119
.cpu_dai = "fsia-dai",
120120
.codec = "ak4642-codec.0-0013",
121121
.platform = "sh_fsi.0",
@@ -124,7 +124,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = {
124124

125125
static struct fsi_ak4642_data fsi_b_ak4643 = {
126126
.name = "AK4643",
127-
.card = "FSIB (AK4643)",
127+
.card = "FSIB-AK4643",
128128
.cpu_dai = "fsib-dai",
129129
.codec = "ak4642-codec.0-0013",
130130
.platform = "sh_fsi.0",
@@ -133,7 +133,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = {
133133

134134
static struct fsi_ak4642_data fsi2_a_ak4642 = {
135135
.name = "AK4642",
136-
.card = "FSI2A (AK4642)",
136+
.card = "FSI2A-AK4642",
137137
.cpu_dai = "fsia-dai",
138138
.codec = "ak4642-codec.0-0012",
139139
.platform = "sh_fsi2",
@@ -142,7 +142,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = {
142142

143143
static struct fsi_ak4642_data fsi2_b_ak4642 = {
144144
.name = "AK4642",
145-
.card = "FSI2B (AK4642)",
145+
.card = "FSI2B-AK4642",
146146
.cpu_dai = "fsib-dai",
147147
.codec = "ak4642-codec.0-0012",
148148
.platform = "sh_fsi2",
@@ -151,7 +151,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = {
151151

152152
static struct fsi_ak4642_data fsi2_a_ak4643 = {
153153
.name = "AK4643",
154-
.card = "FSI2A (AK4643)",
154+
.card = "FSI2A-AK4643",
155155
.cpu_dai = "fsia-dai",
156156
.codec = "ak4642-codec.0-0013",
157157
.platform = "sh_fsi2",
@@ -160,7 +160,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = {
160160

161161
static struct fsi_ak4642_data fsi2_b_ak4643 = {
162162
.name = "AK4643",
163-
.card = "FSI2B (AK4643)",
163+
.card = "FSI2B-AK4643",
164164
.cpu_dai = "fsib-dai",
165165
.codec = "ak4642-codec.0-0013",
166166
.platform = "sh_fsi2",

‎sound/soc/sh/fsi-da7210.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = {
4242
};
4343

4444
static struct snd_soc_card fsi_soc_card = {
45-
.name = "FSI (DA7210)",
45+
.name = "FSI-DA7210",
4646
.dai_link = &fsi_da7210_dai,
4747
.num_links = 1,
4848
};

‎sound/soc/sh/fsi-hdmi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ static int fsi_hdmi_remove(struct platform_device *pdev)
8383

8484
static struct fsi_hdmi_data fsi2_a_hdmi = {
8585
.cpu_dai = "fsia-dai",
86-
.card = "FSI2A (SH MOBILE HDMI)",
86+
.card = "FSI2A-HDMI",
8787
.id = FSI_PORT_A,
8888
};
8989

9090
static struct fsi_hdmi_data fsi2_b_hdmi = {
9191
.cpu_dai = "fsib-dai",
92-
.card = "FSI2B (SH MOBILE HDMI)",
92+
.card = "FSI2B-HDMI",
9393
.id = FSI_PORT_B,
9494
};
9595

0 commit comments

Comments
 (0)