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

Commit d84dbf33 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa' and... 

Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next
parents 4f1eacf5 97d62a30 7c47cd7f d7c42ff8

include/sound/rcar_snd.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ struct rsnd_ssi_platform_info { 
struct rsnd_src_platform_info {

	u32 convert_rate; /* sampling rate convert */

	int dma_id; /* for Gen2 SCU */

	int irq;

};



/*

sound/soc/omap/omap-hdmi-audio.c

+0 −1
Original line number Diff line number Diff line
@@ -393,7 +393,6 @@ static int omap_hdmi_audio_remove(struct platform_device *pdev) 
static struct platform_driver hdmi_audio_driver = {

	.driver = {

		.name = DRV_NAME,

		.owner = THIS_MODULE,

	},

	.probe = omap_hdmi_audio_probe,

	.remove = omap_hdmi_audio_remove,

sound/soc/pxa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ config SND_PXA910_SOC 
	  Marvell PXA910 reference platform.



config SND_SOC_TTC_DKB

	bool "SoC Audio support for TTC DKB"

	tristate "SoC Audio support for TTC DKB"

	depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y

	select PXA_SSP

	select SND_PXA_SOC_SSP

sound/soc/pxa/corgi.c

+1 −15
Original line number Diff line number Diff line
@@ -259,20 +259,6 @@ static const struct snd_kcontrol_new wm8731_corgi_controls[] = { 
		corgi_set_spk),

};



/*

 * Logic for a wm8731 as connected on a Sharp SL-C7x0 Device

 */

static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_nc_pin(dapm, "LLINEIN");

	snd_soc_dapm_nc_pin(dapm, "RLINEIN");



	return 0;

}



/* corgi digital audio interface glue - connects codec <--> CPU */

static struct snd_soc_dai_link corgi_dai = {

	.name = "WM8731",
@@ -281,7 +267,6 @@ static struct snd_soc_dai_link corgi_dai = { 
	.codec_dai_name = "wm8731-hifi",

	.platform_name = "pxa-pcm-audio",

	.codec_name = "wm8731.0-001b",

	.init = corgi_wm8731_init,

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

	.ops = &corgi_ops,
@@ -300,6 +285,7 @@ static struct snd_soc_card corgi = { 
	.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),

	.dapm_routes = corgi_audio_map,

	.num_dapm_routes = ARRAY_SIZE(corgi_audio_map),

	.fully_routed = true,

};



static int corgi_probe(struct platform_device *pdev)

sound/soc/pxa/e740_wm9705.c

+1 −19
Original line number Diff line number Diff line
@@ -88,24 +88,6 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"Mic Amp", NULL, "Mic (Internal)"},

};



static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_nc_pin(dapm, "HPOUTL");

	snd_soc_dapm_nc_pin(dapm, "HPOUTR");

	snd_soc_dapm_nc_pin(dapm, "PHONE");

	snd_soc_dapm_nc_pin(dapm, "LINEINL");

	snd_soc_dapm_nc_pin(dapm, "LINEINR");

	snd_soc_dapm_nc_pin(dapm, "CDINL");

	snd_soc_dapm_nc_pin(dapm, "CDINR");

	snd_soc_dapm_nc_pin(dapm, "PCBEEP");

	snd_soc_dapm_nc_pin(dapm, "MIC2");



	return 0;

}



static struct snd_soc_dai_link e740_dai[] = {

	{

		.name = "AC97",
@@ -114,7 +96,6 @@ static struct snd_soc_dai_link e740_dai[] = { 
		.codec_dai_name = "wm9705-hifi",

		.platform_name = "pxa-pcm-audio",

		.codec_name = "wm9705-codec",

		.init = e740_ac97_init,

	},

	{

		.name = "AC97 Aux",
@@ -136,6 +117,7 @@ static struct snd_soc_card e740 = { 
	.num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets),

	.dapm_routes = audio_map,

	.num_dapm_routes = ARRAY_SIZE(audio_map),

	.fully_routed = true,

};



static struct gpio e740_audio_gpios[] = {