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

Commit 4ac0478f authored by Marek Vasut's avatar Marek Vasut Committed by Mark Brown
Browse files

ALSA: Allow passing platform_data for pxa2xx-ac97 



This patch adds support for passing platform data to ac97 bus devices
from PXA2xx-AC97 driver..

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 30230f4c

arch/arm/mach-pxa/include/mach/audio.h

+3 −0
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 


#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/ac97_codec.h>



/*

 * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95)

 *              a -1 value means no gpio will be used for reset

 * @codec_pdata: AC97 codec platform_data



 * reset_gpio should only be specified for pxa27x CPUs where a silicon

 * bug prevents correct operation of the reset line. If not specified,
@@ -20,6 +22,7 @@ typedef struct { 
	void (*resume)(void *);

	void *priv;

	int reset_gpio;

	void *codec_pdata[AC97_BUS_MAX_DEVICES];

} pxa2xx_audio_ops_t;



extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops);

include/sound/ac97_codec.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
#include "control.h"

#include "info.h"



/* maximum number of devices on the AC97 bus */

#define	AC97_BUS_MAX_DEVICES	4



/*

 *  AC'97 codec registers

 */

sound/arm/pxa2xx-ac97.c

+10 −0
Original line number Diff line number Diff line
@@ -170,6 +170,13 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) 
	struct snd_ac97_bus *ac97_bus;

	struct snd_ac97_template ac97_template;

	int ret;

	pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;



	if (dev->id >= 0) {

		dev_err(&dev->dev, "PXA2xx has only one AC97 port.\n");

		ret = -ENXIO;

		goto err_dev;

	}



	ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			      THIS_MODULE, 0, &card);
@@ -200,6 +207,8 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) 
	snprintf(card->longname, sizeof(card->longname),

		 "%s (%s)", dev->dev.driver->name, card->mixername);



	if (pdata && pdata->codec_data)

		snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata);

	snd_card_set_dev(card, &dev->dev);

	ret = snd_card_register(card);

	if (ret == 0) {
@@ -212,6 +221,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) 
err:

	if (card)

		snd_card_free(card);

err_dev:

	return ret;

}

sound/soc/pxa/pxa2xx-ac97.c

+11 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <mach/hardware.h>

#include <mach/regs-ac97.h>

#include <mach/dma.h>

#include <mach/audio.h>



#include "pxa2xx-pcm.h"

#include "pxa2xx-ac97.h"
@@ -241,9 +242,18 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops); 
static int __devinit pxa2xx_ac97_dev_probe(struct platform_device *pdev)

{

	int i;

	pxa2xx_audio_ops_t *pdata = pdev->dev.platform_data;



	for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++)

	if (pdev->id >= 0) {

		dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n");

		return -ENXIO;

	}



	for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++) {

		pxa_ac97_dai[i].dev = &pdev->dev;

		if (pdata && pdata->codec_pdata)

			pxa_ac97_dai[i].ac97_pdata = pdata->codec_pdata;

	}



	/* Punt most of the init to the SoC probe; we may need the machine

	 * driver to do interesting things with the clocking to get us up