Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524196d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d36c3018 b793eb60

sound/soc/codecs/wm8994.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -1190,7 +1190,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"), 
SND_SOC_DAPM_INPUT("DMIC2DAT"),

SND_SOC_DAPM_INPUT("DMIC2DAT"),

SND_SOC_DAPM_INPUT("Clock"),

SND_SOC_DAPM_INPUT("Clock"),





SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),

SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,

SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,

		      SND_SOC_DAPM_PRE_PMU),

		      SND_SOC_DAPM_PRE_PMU),
@@ -1509,8 +1508,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = { 
	{ "AIF2DACDAT", NULL, "AIF1DACDAT" },

	{ "AIF2DACDAT", NULL, "AIF1DACDAT" },

	{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },

	{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },

	{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },

	{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },

	{ "MICBIAS", NULL, "CLK_SYS" },

	{ "MICBIAS1", NULL, "CLK_SYS" },

	{ "MICBIAS", NULL, "MICBIAS Supply" },

	{ "MICBIAS1", NULL, "MICBIAS Supply" },

	{ "MICBIAS2", NULL, "CLK_SYS" },

	{ "MICBIAS2", NULL, "MICBIAS Supply" },

};

};





static const struct snd_soc_dapm_route wm8994_intercon[] = {

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

	report = SND_JACK_MICROPHONE;





	/* Everything else is buttons; just assign slots */

	/* Everything else is buttons; just assign slots */

	if (status & 0x1c0)

	if (status & 0x1c)

		report |= SND_JACK_BTN_0;

		report |= SND_JACK_BTN_0;





done:

done:

sound/soc/sh/fsi-ak4642.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ static int fsi_ak4642_remove(struct platform_device *pdev) 




static struct fsi_ak4642_data fsi_a_ak4642 = {

static struct fsi_ak4642_data fsi_a_ak4642 = {

	.name		= "AK4642",

	.name		= "AK4642",

	.card		= "FSIA (AK4642)",

	.card		= "FSIA-AK4642",

	.cpu_dai	= "fsia-dai",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0012",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi.0",

	.platform	= "sh_fsi.0",
@@ -106,7 +106,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = { 




static struct fsi_ak4642_data fsi_b_ak4642 = {

static struct fsi_ak4642_data fsi_b_ak4642 = {

	.name		= "AK4642",

	.name		= "AK4642",

	.card		= "FSIB (AK4642)",

	.card		= "FSIB-AK4642",

	.cpu_dai	= "fsib-dai",

	.cpu_dai	= "fsib-dai",

	.codec		= "ak4642-codec.0-0012",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi.0",

	.platform	= "sh_fsi.0",
@@ -115,7 +115,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = { 




static struct fsi_ak4642_data fsi_a_ak4643 = {

static struct fsi_ak4642_data fsi_a_ak4643 = {

	.name		= "AK4643",

	.name		= "AK4643",

	.card		= "FSIA (AK4643)",

	.card		= "FSIA-AK4643",

	.cpu_dai	= "fsia-dai",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi.0",

	.platform	= "sh_fsi.0",
@@ -124,7 +124,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = { 




static struct fsi_ak4642_data fsi_b_ak4643 = {

static struct fsi_ak4642_data fsi_b_ak4643 = {

	.name		= "AK4643",

	.name		= "AK4643",

	.card		= "FSIB (AK4643)",

	.card		= "FSIB-AK4643",

	.cpu_dai	= "fsib-dai",

	.cpu_dai	= "fsib-dai",

	.codec		= "ak4642-codec.0-0013",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi.0",

	.platform	= "sh_fsi.0",
@@ -133,7 +133,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = { 




static struct fsi_ak4642_data fsi2_a_ak4642 = {

static struct fsi_ak4642_data fsi2_a_ak4642 = {

	.name		= "AK4642",

	.name		= "AK4642",

	.card		= "FSI2A (AK4642)",

	.card		= "FSI2A-AK4642",

	.cpu_dai	= "fsia-dai",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0012",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi2",

	.platform	= "sh_fsi2",
@@ -142,7 +142,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = { 




static struct fsi_ak4642_data fsi2_b_ak4642 = {

static struct fsi_ak4642_data fsi2_b_ak4642 = {

	.name		= "AK4642",

	.name		= "AK4642",

	.card		= "FSI2B (AK4642)",

	.card		= "FSI2B-AK4642",

	.cpu_dai	= "fsib-dai",

	.cpu_dai	= "fsib-dai",

	.codec		= "ak4642-codec.0-0012",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi2",

	.platform	= "sh_fsi2",
@@ -151,7 +151,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = { 




static struct fsi_ak4642_data fsi2_a_ak4643 = {

static struct fsi_ak4642_data fsi2_a_ak4643 = {

	.name		= "AK4643",

	.name		= "AK4643",

	.card		= "FSI2A (AK4643)",

	.card		= "FSI2A-AK4643",

	.cpu_dai	= "fsia-dai",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.platform	= "sh_fsi2",
@@ -160,7 +160,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = { 




static struct fsi_ak4642_data fsi2_b_ak4643 = {

static struct fsi_ak4642_data fsi2_b_ak4643 = {

	.name		= "AK4643",

	.name		= "AK4643",

	.card		= "FSI2B (AK4643)",

	.card		= "FSI2B-AK4643",

	.cpu_dai	= "fsib-dai",

	.cpu_dai	= "fsib-dai",

	.codec		= "ak4642-codec.0-0013",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.platform	= "sh_fsi2",

sound/soc/sh/fsi-da7210.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { 
};

};





static struct snd_soc_card fsi_soc_card = {

static struct snd_soc_card fsi_soc_card = {

	.name		= "FSI (DA7210)",

	.name		= "FSI-DA7210",

	.dai_link	= &fsi_da7210_dai,

	.dai_link	= &fsi_da7210_dai,

	.num_links	= 1,

	.num_links	= 1,

};

};

sound/soc/sh/fsi-hdmi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,13 +83,13 @@ static int fsi_hdmi_remove(struct platform_device *pdev) 




static struct fsi_hdmi_data fsi2_a_hdmi = {

static struct fsi_hdmi_data fsi2_a_hdmi = {

	.cpu_dai	= "fsia-dai",

	.cpu_dai	= "fsia-dai",

	.card		= "FSI2A (SH MOBILE HDMI)",

	.card		= "FSI2A-HDMI",

	.id		= FSI_PORT_A,

	.id		= FSI_PORT_A,

};

};





static struct fsi_hdmi_data fsi2_b_hdmi = {

static struct fsi_hdmi_data fsi2_b_hdmi = {

	.cpu_dai	= "fsib-dai",

	.cpu_dai	= "fsib-dai",

	.card		= "FSI2B (SH MOBILE HDMI)",

	.card		= "FSI2B-HDMI",

	.id		= FSI_PORT_B,

	.id		= FSI_PORT_B,

};

};