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

Merge remote-tracking branches 'asoc/topic/multi-codec',... 

Merge remote-tracking branches 'asoc/topic/multi-codec', 'asoc/topic/mxs-saif', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/omap' and 'asoc/topic/pxa' into asoc-next
parents 41967b77 93b0f3ee 8c2727f9 d206f661 bb66f2dc 6d3efa40

arch/arm/mach-pxa/spitz.c

+9 −0
Original line number Diff line number Diff line
@@ -923,6 +923,14 @@ static void __init spitz_i2c_init(void) 
static inline void spitz_i2c_init(void) {}

#endif



/******************************************************************************

 * Audio devices

 ******************************************************************************/

static inline void spitz_audio_init(void)

{

	platform_device_register_simple("spitz-audio", -1, NULL, 0);

}



/******************************************************************************

 * Machine init

 ******************************************************************************/
@@ -970,6 +978,7 @@ static void __init spitz_init(void) 
	spitz_nor_init();

	spitz_nand_init();

	spitz_i2c_init();

	spitz_audio_init();

}



static void __init spitz_fixup(struct tag *tags, char **cmdline)

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,9 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, 
				     struct device_node **framemaster);

int snd_soc_of_get_dai_name(struct device_node *of_node,

			    const char **dai_name);

int snd_soc_of_get_dai_link_codecs(struct device *dev,

				   struct device_node *of_node,

				   struct snd_soc_dai_link *dai_link);



#include <sound/soc-dai.h>

sound/soc/mxs/mxs-saif.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static int mxs_saif_probe(struct platform_device *pdev) 


	saif->dev = &pdev->dev;

	ret = devm_request_irq(&pdev->dev, saif->irq, mxs_saif_irq, 0,

			       "mxs-saif", saif);

			       dev_name(&pdev->dev), saif);

	if (ret) {

		dev_err(&pdev->dev, "failed to request irq\n");

		return ret;

sound/soc/mxs/mxs-sgtl5000.c

+0 −7
Original line number Diff line number Diff line
@@ -49,13 +49,6 @@ static int mxs_sgtl5000_hw_params(struct snd_pcm_substream *substream, 
		break;

	}



	/* Sgtl5000 sysclk should be >= 8MHz and <= 27M */

	if (mclk < 8000000 || mclk > 27000000) {

		dev_err(codec_dai->dev, "Invalid mclk frequency: %u.%03uMHz\n",

			mclk / 1000000, mclk / 1000 % 1000);

		return -EINVAL;

	}



	/* Set SGTL5000's SYSCLK (provided by SAIF MCLK) */

	ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, 0);

	if (ret) {

sound/soc/omap/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ config SND_OMAP_SOC_N810 
	  Say Y if you want to add support for SoC audio on Nokia N810.



config SND_OMAP_SOC_RX51

	tristate "SoC Audio support for Nokia RX-51"

	depends on SND_OMAP_SOC && ARM && (MACH_NOKIA_RX51 || COMPILE_TEST) && I2C

	tristate "SoC Audio support for Nokia N900 (RX-51)"

	depends on SND_OMAP_SOC && ARM && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2

	depends on GPIOLIB

	help

	  Say Y if you want to add support for SoC audio on Nokia RX-51

	  hardware. This is also known as Nokia N900 product.

	  Say Y if you want to add support for SoC audio on Nokia N900

	  cellphone.



config SND_OMAP_SOC_AMS_DELTA

	tristate "SoC Audio support for Amstrad E3 (Delta) videophone"