From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Samuel Ortiz <sameo@linux.intel.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>, Dmitry Torokhov <dtor@mail.ru> Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson <b-cousson@ti.com> Subject: [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Date: Wed, 8 Aug 2012 12:41:26 +0300 [thread overview] Message-ID: <1344418887-5262-11-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> Access the pdata via a pointer within the twl4030_priv structure. In preparation for DeviceTree support. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/codecs/twl4030.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 6a00c01..bf0240d 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -153,8 +153,7 @@ struct twl4030_priv { u8 predrivel_enabled, predriver_enabled; u8 carkitl_enabled, carkitr_enabled; - /* Delay needed after enabling the digimic interface */ - unsigned int digimic_delay; + struct twl4030_codec_data *pdata; }; /* @@ -350,7 +349,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) if (!pdata) return; - twl4030->digimic_delay = pdata->digimic_delay; + twl4030->pdata = pdata; reg = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET); reg &= ~TWL4030_RAMP_DELAY; @@ -751,9 +750,9 @@ static int aif_event(struct snd_soc_dapm_widget *w, static void headset_ramp(struct snd_soc_codec *codec, int ramp) { - struct twl4030_codec_data *pdata = codec->dev->platform_data; unsigned char hs_gain, hs_pop; struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Base values for ramp delay calculation: 2^19 - 2^26 */ unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864}; @@ -868,9 +867,10 @@ static int digimic_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec); + struct twl4030_codec_data *pdata = twl4030->pdata; - if (twl4030->digimic_delay) - twl4030_wait_ms(twl4030->digimic_delay); + if (pdata && pdata->digimic_delay) + twl4030_wait_ms(pdata->digimic_delay); return 0; } @@ -2252,8 +2252,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) static int twl4030_soc_remove(struct snd_soc_codec *codec) { - struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Reset registers to their chip default before leaving */ twl4030_reset_registers(codec); -- 1.7.8.6
WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Date: Wed, 8 Aug 2012 12:41:26 +0300 [thread overview] Message-ID: <1344418887-5262-11-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> Access the pdata via a pointer within the twl4030_priv structure. In preparation for DeviceTree support. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/codecs/twl4030.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 6a00c01..bf0240d 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -153,8 +153,7 @@ struct twl4030_priv { u8 predrivel_enabled, predriver_enabled; u8 carkitl_enabled, carkitr_enabled; - /* Delay needed after enabling the digimic interface */ - unsigned int digimic_delay; + struct twl4030_codec_data *pdata; }; /* @@ -350,7 +349,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) if (!pdata) return; - twl4030->digimic_delay = pdata->digimic_delay; + twl4030->pdata = pdata; reg = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET); reg &= ~TWL4030_RAMP_DELAY; @@ -751,9 +750,9 @@ static int aif_event(struct snd_soc_dapm_widget *w, static void headset_ramp(struct snd_soc_codec *codec, int ramp) { - struct twl4030_codec_data *pdata = codec->dev->platform_data; unsigned char hs_gain, hs_pop; struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Base values for ramp delay calculation: 2^19 - 2^26 */ unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304, 8388608, 16777216, 33554432, 67108864}; @@ -868,9 +867,10 @@ static int digimic_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec); + struct twl4030_codec_data *pdata = twl4030->pdata; - if (twl4030->digimic_delay) - twl4030_wait_ms(twl4030->digimic_delay); + if (pdata && pdata->digimic_delay) + twl4030_wait_ms(pdata->digimic_delay); return 0; } @@ -2252,8 +2252,8 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) static int twl4030_soc_remove(struct snd_soc_codec *codec) { - struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + struct twl4030_codec_data *pdata = twl4030->pdata; /* Reset registers to their chip default before leaving */ twl4030_reset_registers(codec); -- 1.7.8.6
next prev parent reply other threads:[~2012-08-08 9:42 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-08 9:41 [PATCH 00/11] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 01/11] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 02/11] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 03/11] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 04/11] MFD: twl4030-audio: Add DT support Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 11:50 ` Benoit Cousson 2012-08-08 11:50 ` Benoit Cousson 2012-08-08 11:50 ` Benoit Cousson 2012-08-08 12:43 ` Peter Ujfalusi 2012-08-08 12:43 ` Peter Ujfalusi 2012-08-08 12:43 ` Peter Ujfalusi 2012-08-08 12:52 ` Mark Brown 2012-08-08 12:52 ` Mark Brown 2012-08-08 14:35 ` Peter Ujfalusi 2012-08-08 14:35 ` Peter Ujfalusi 2012-08-08 14:35 ` Peter Ujfalusi 2012-08-08 14:39 ` Mark Brown 2012-08-08 14:39 ` Mark Brown 2012-08-08 14:39 ` Mark Brown 2012-08-08 15:41 ` Benoit Cousson 2012-08-08 15:41 ` Benoit Cousson 2012-08-08 15:41 ` Benoit Cousson 2012-08-08 13:13 ` Mark Brown 2012-08-08 13:13 ` Mark Brown 2012-08-08 13:43 ` Peter Ujfalusi 2012-08-08 13:43 ` Peter Ujfalusi 2012-08-08 13:43 ` Peter Ujfalusi 2012-08-08 13:52 ` Mark Brown 2012-08-08 13:52 ` Mark Brown 2012-08-08 13:52 ` Mark Brown 2012-08-08 14:16 ` Peter Ujfalusi 2012-08-08 14:16 ` Peter Ujfalusi 2012-08-08 14:16 ` Peter Ujfalusi 2012-08-08 14:18 ` Mark Brown 2012-08-08 14:18 ` Mark Brown 2012-08-08 14:18 ` Mark Brown 2012-08-08 14:31 ` Peter Ujfalusi 2012-08-08 14:31 ` Peter Ujfalusi 2012-08-08 14:49 ` Mark Brown 2012-08-08 14:49 ` Mark Brown 2012-08-08 14:49 ` Mark Brown 2012-08-09 10:18 ` Peter Ujfalusi 2012-08-09 10:18 ` Peter Ujfalusi 2012-08-09 10:18 ` Peter Ujfalusi 2012-08-09 10:36 ` Mark Brown 2012-08-09 10:36 ` Mark Brown 2012-08-09 10:36 ` Mark Brown 2012-08-09 13:53 ` Peter Ujfalusi 2012-08-09 13:53 ` Peter Ujfalusi 2012-08-09 13:53 ` Peter Ujfalusi 2012-08-12 18:50 ` Mark Brown 2012-08-12 18:50 ` Mark Brown 2012-08-12 18:50 ` Mark Brown 2012-08-08 9:41 ` [PATCH 05/11] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 06/11] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 07/11] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-10 6:28 ` Tony Lindgren 2012-08-10 6:28 ` Tony Lindgren 2012-08-08 9:41 ` [PATCH 08/11] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 09/11] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi [this message] 2012-08-08 9:41 ` [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi 2012-08-08 9:41 ` [PATCH 11/11] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi 2012-08-08 9:41 ` Peter Ujfalusi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1344418887-5262-11-git-send-email-peter.ujfalusi@ti.com \ --to=peter.ujfalusi@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=b-cousson@ti.com \ --cc=broonie@opensource.wolfsonmicro.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=dtor@mail.ru \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=sameo@linux.intel.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.