From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Subject: Re: [PATCH] Allow passing platform_data to devices attached to AC97 bus Date: Tue, 21 Jul 2009 17:40:01 +0200 Message-ID: <200907211740.01287.marek.vasut@gmail.com> References: <200907211633.14388.marek.vasut@gmail.com> <20090721145323.GA8991@rakim.wolfsonmicro.main> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_RFeZKtlTfNRZjGk" Return-path: Received: from mail-bw0-f226.google.com (mail-bw0-f226.google.com [209.85.218.226]) by alsa0.perex.cz (Postfix) with ESMTP id E2EC3243CD for ; Tue, 21 Jul 2009 17:40:21 +0200 (CEST) Received: by bwz26 with SMTP id 26so1821410bwz.32 for ; Tue, 21 Jul 2009 08:40:21 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: Eric Miao , alsa-devel@alsa-project.org, Mark Brown , Russell King - ARM Linux , linux-arm-kernel@lists.arm.linux.org.uk List-Id: alsa-devel@alsa-project.org --Boundary-00=_RFeZKtlTfNRZjGk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Dne =C3=9At 21. =C4=8Dervence 2009 17:16:07 Takashi Iwai napsal(a): > At Tue, 21 Jul 2009 15:53:23 +0100, > > Mark Brown wrote: > > On Tue, Jul 21, 2009 at 04:50:26PM +0200, Takashi Iwai wrote: > > > Marek Vasut wrote: > > > > int ret; > > > > + pxa2xx_audio_ops_t *pdata =3D dev->dev.platform_data; > > > > > > Use the get function. > > > > There's no such function in mainline right now. However, apropos of > > something else I submitted a patch adding that to the driver core - it's > > been merged for 2.6.32 but won't be available in ALSA until after the > > next merge window. The function is dev_get_platdata(). > > Ah, right. This can be fixed later, then. > > > > Also, at the next time, add Russell or linux-arm to Cc so that he > > > knows at least that a file in arch/arm will be changed. > > > > Ideally split things into two separate patches. > > Agreed. > > > Takashi Ok, I split it in two, here's the one that adds necessary stuff to alsa. --Boundary-00=_RFeZKtlTfNRZjGk Content-Type: text/x-patch; charset="UTF-8"; name="0001-Allow-passing-platform_data-to-devices-attached-to-A.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Allow-passing-platform_data-to-devices-attached-to-A.patch" =46rom bb1d5481f2786a30133a8392c4e46170a1b8b615 Mon Sep 17 00:00:00 2001 =46rom: Marek Vasut Date: Tue, 21 Jul 2009 16:22:29 +0200 Subject: [PATCH 1/2] Allow passing platform_data to devices attached to AC9= 7 bus This patch allows passing platform_data to devices attached to AC97 bus (like touchscreens, battery measurement chips ...). Signed-off-by: Marek Vasut =2D-- include/sound/ac97_codec.h | 3 +++ include/sound/soc-dai.h | 1 + sound/pci/ac97/ac97_codec.c | 6 ++++++ sound/soc/soc-core.c | 5 ++++- 4 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 251fc1c..aeaa40c 100644 =2D-- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -642,4 +642,7 @@ int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runti= me *runtime); /* ad hoc AC97 device driver access */ extern struct bus_type ac97_bus_type; =20 +/* AC97 platform_data adding function */ +inline void snd_ac97_dev_add_pdata(struct snd_ac97 *ac97, void *data); + #endif /* __SOUND_AC97_CODEC_H */ diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 352d7ee..0d65a03 100644 =2D-- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -179,6 +179,7 @@ struct snd_soc_dai { int ac97_control; =20 struct device *dev; + void *ac97_pdata; /* platform_data for the ac97 codec */ =20 /* DAI callbacks */ int (*probe)(struct platform_device *pdev, diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 78288db..e6f23ee 100644 =2D-- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -1922,6 +1922,12 @@ static void ac97_device_release(struct device * dev) { } =20 +/* add platform_data to the ac97 device */ +inline void snd_ac97_dev_add_pdata(struct snd_ac97 *ac97, void *data) +{ + ac97->dev.platform_data =3D data; +} + /* register ac97 codec to bus */ static int snd_ac97_dev_register(struct snd_device *device) { diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1d70829..0b12fe5 100644 =2D-- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1381,8 +1381,11 @@ int snd_soc_init_card(struct snd_soc_device *socdev) continue; } } =2D if (card->dai_link[i].codec_dai->ac97_control) + if (card->dai_link[i].codec_dai->ac97_control) { ac97 =3D 1; + codec->ac97->dev.platform_data =3D + card->dai_link[i].cpu_dai->ac97_pdata; + } } snprintf(codec->card->shortname, sizeof(codec->card->shortname), "%s", card->name); =2D-=20 1.6.3.3 --Boundary-00=_RFeZKtlTfNRZjGk Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel --Boundary-00=_RFeZKtlTfNRZjGk--