From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Subject: [PATCH 1/4] Allow passing platform_data to devices attached to AC97 bus Date: Wed, 22 Jul 2009 13:01:03 +0200 Message-ID: <200907221301.04239.marek.vasut@gmail.com> References: <200907211633.14388.marek.vasut@gmail.com> <200907220013.12824.marek.vasut@gmail.com> <20090721223424.GA21147@oksana.dev.rtsoft.ru> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_wFvZKcPTrhVja/b" 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 1B0F710389F for ; Wed, 22 Jul 2009 13:01:23 +0200 (CEST) Received: by bwz26 with SMTP id 26so110676bwz.32 for ; Wed, 22 Jul 2009 04:01:22 -0700 (PDT) In-Reply-To: <20090721223424.GA21147@oksana.dev.rtsoft.ru> 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: avorontsov@ru.mvista.com Cc: alsa-devel@alsa-project.org, Russell King - ARM Linux , Takashi Iwai , Robert Jarzmik , Mark Brown , cbou@mail.ru, Eric Miao , dwmw2@infradead.org, linux-arm-kernel@lists.arm.linux.org.uk List-Id: alsa-devel@alsa-project.org --Boundary-00=_wFvZKcPTrhVja/b Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Ok, Im sending the set again. --Boundary-00=_wFvZKcPTrhVja/b 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 5ed7859b282c23c2f98167ef3f821625ee8907aa Mon Sep 17 00:00:00 2001 =46rom: Marek Vasut Date: Tue, 21 Jul 2009 16:22:29 +0200 Subject: [PATCH 1/4] 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 | 6 ++++++ include/sound/soc-dai.h | 1 + sound/soc/soc-core.c | 6 +++++- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 251fc1c..9b1c098 100644 =2D-- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -642,4 +642,10 @@ int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runt= ime *runtime); /* ad hoc AC97 device driver access */ extern struct bus_type ac97_bus_type; =20 +/* AC97 platform_data adding function */ +static inline void snd_ac97_dev_add_pdata(struct snd_ac97 *ac97, void *dat= a) +{ + ac97->dev.platform_data =3D 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/soc/soc-core.c b/sound/soc/soc-core.c index 1d70829..7cb0917 100644 =2D-- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -1381,8 +1382,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; + snd_ac97_dev_add_pdata(codec->ac97, + 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=_wFvZKcPTrhVja/b 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=_wFvZKcPTrhVja/b--