Re: [PATCH 2/4] Allow passing platform_data for pxa2xx-ac97

Marek Vasut
2009-07-30T00:55:19Z

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

Dne Út 28. července 2009 07:28:20 Marek Vasut napsal(a):
> Dne Čt 23. července 2009 20:39:37 Marek Vasut napsal(a):
> > Dne Čt 23. července 2009 16:16:12 Marek Vasut napsal(a):
> > > Dne Čt 23. července 2009 12:27:41 Mark Brown napsal(a):
> > > > On Wed, Jul 22, 2009 at 01:02:40PM +0200, Marek Vasut wrote:
> > > > > struct snd_ac97_bus *ac97_bus;
> > > > > struct snd_ac97_template ac97_template;
> > > > > int ret;
> > > > > + pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
> > > > > + int id = dev->id < 0 ? 0 : dev->id;
> > > >
> > > > dev here is the AC97 controller device - if there's more than one
> > > > AC97 controller in the system they can each have the four child
> > > > devices. On the other hand, I don't think any of the PXA processors
> > > > have more than one AC97 controller so it'll never actually have any
> > > > impact.
> > > >
> > > > I think the best thing for now is to either warn if anything except
> > > > the primary codec has platform data or change the platform data to
> > > > have a variable something like primary_audio_pdata. The driver
> > > > doesn't appear to support secondary codecs anyway.
> > >
> > > Ok, here's a fixed patch.
> >
> > Argh, one more iteration here. There was a typo in the previous patch.
> > Sorry.
>
> Hi, well ... any updates ? Eric, is this patch ok with you ?

I made one more revision here as in case the platform_data aren't supplied,
the kernel obviously crashes.

[-- Attachment #2: 0001-Allow-passing-platform_data-for-pxa2xx-ac97.patch --]
[-- Type: text/x-patch, Size: 4083 bytes --]

From 207d54244768e94ce0144cba55acf4ae065e6ce0 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Tue, 21 Jul 2009 16:22:29 +0200
Subject: [PATCH] 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: Marek Vasut <marek.vasut@gmail.com>
---
arch/arm/mach-pxa/include/mach/audio.h | 3 +++
include/sound/ac97_codec.h | 3 +++
sound/arm/pxa2xx-ac97.c | 10 ++++++++++
sound/soc/pxa/pxa2xx-ac97.c | 12 +++++++++++-
4 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/include/mach/audio.h b/arch/arm/mach-pxa/include/mach/audio.h
index 16eb025..a3449e3 100644
--- a/arch/arm/mach-pxa/include/mach/audio.h
+++ b/arch/arm/mach-pxa/include/mach/audio.h
@@ -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);
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 9b1c098..3dae3f7 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -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
*/
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index c570ebd..6c00ea4 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -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 @@ err_remove:
err:
if (card)
snd_card_free(card);
+err_dev:
return ret;
}

diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index d9c94d7..7330e5c 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -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
--
1.6.3.3

[-- Attachment #3: Type: text/plain, Size: 160 bytes --]