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 03/11] MFD: twl4030-audio: Rearange and clean-up the probe function Date: Wed, 8 Aug 2012 12:41:19 +0300 [thread overview] Message-ID: <1344418887-5262-4-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> To facilitate the device tree support the probe function need to be rearanged. Small cleanup in the APLL frequency selection part as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- drivers/mfd/twl4030-audio.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index efa2d42..ca2d669 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -169,35 +169,30 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) return -EINVAL; } + audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio), + GFP_KERNEL); + if (!audio) + return -ENOMEM; + + mutex_init(&audio->mutex); + audio->audio_mclk = pdata->audio_mclk; + /* Configure APLL_INFREQ and disable APLL if enabled */ - val = 0; - switch (pdata->audio_mclk) { + switch (audio->audio_mclk) { case 19200000: - val |= TWL4030_APLL_INFREQ_19200KHZ; + val = TWL4030_APLL_INFREQ_19200KHZ; break; case 26000000: - val |= TWL4030_APLL_INFREQ_26000KHZ; + val = TWL4030_APLL_INFREQ_26000KHZ; break; case 38400000: - val |= TWL4030_APLL_INFREQ_38400KHZ; + val = TWL4030_APLL_INFREQ_38400KHZ; break; default: dev_err(&pdev->dev, "Invalid audio_mclk\n"); return -EINVAL; } - twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, - val, TWL4030_REG_APLL_CTL); - - audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio), - GFP_KERNEL); - if (!audio) - return -ENOMEM; - - platform_set_drvdata(pdev, audio); - - twl4030_audio_dev = pdev; - mutex_init(&audio->mutex); - audio->audio_mclk = pdata->audio_mclk; + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, val, TWL4030_REG_APLL_CTL); /* Codec power */ audio->resource[TWL4030_AUDIO_RES_POWER].reg = TWL4030_REG_CODEC_MODE; @@ -222,6 +217,9 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) childs++; } + platform_set_drvdata(pdev, audio); + twl4030_audio_dev = pdev; + if (childs) ret = mfd_add_devices(&pdev->dev, pdev->id, audio->cells, childs, NULL, 0); -- 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 03/11] MFD: twl4030-audio: Rearange and clean-up the probe function Date: Wed, 8 Aug 2012 12:41:19 +0300 [thread overview] Message-ID: <1344418887-5262-4-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> To facilitate the device tree support the probe function need to be rearanged. Small cleanup in the APLL frequency selection part as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- drivers/mfd/twl4030-audio.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index efa2d42..ca2d669 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -169,35 +169,30 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) return -EINVAL; } + audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio), + GFP_KERNEL); + if (!audio) + return -ENOMEM; + + mutex_init(&audio->mutex); + audio->audio_mclk = pdata->audio_mclk; + /* Configure APLL_INFREQ and disable APLL if enabled */ - val = 0; - switch (pdata->audio_mclk) { + switch (audio->audio_mclk) { case 19200000: - val |= TWL4030_APLL_INFREQ_19200KHZ; + val = TWL4030_APLL_INFREQ_19200KHZ; break; case 26000000: - val |= TWL4030_APLL_INFREQ_26000KHZ; + val = TWL4030_APLL_INFREQ_26000KHZ; break; case 38400000: - val |= TWL4030_APLL_INFREQ_38400KHZ; + val = TWL4030_APLL_INFREQ_38400KHZ; break; default: dev_err(&pdev->dev, "Invalid audio_mclk\n"); return -EINVAL; } - twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, - val, TWL4030_REG_APLL_CTL); - - audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio), - GFP_KERNEL); - if (!audio) - return -ENOMEM; - - platform_set_drvdata(pdev, audio); - - twl4030_audio_dev = pdev; - mutex_init(&audio->mutex); - audio->audio_mclk = pdata->audio_mclk; + twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, val, TWL4030_REG_APLL_CTL); /* Codec power */ audio->resource[TWL4030_AUDIO_RES_POWER].reg = TWL4030_REG_CODEC_MODE; @@ -222,6 +217,9 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) childs++; } + platform_set_drvdata(pdev, audio); + twl4030_audio_dev = pdev; + if (childs) ret = mfd_add_devices(&pdev->dev, pdev->id, audio->cells, childs, NULL, 0); -- 1.7.8.6
next prev parent reply other threads:[~2012-08-08 9:41 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 ` Peter Ujfalusi [this message] 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 ` [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 ` [PATCH 10/11] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi 2012-08-08 9:41 ` 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-4-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.