From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Mark Brown <broonie@opensource.wolfsonmicro.com>, Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>, Grant Likely <grant.likely@secretlab.ca>, Rob Herring <rob.herring@calxeda.com> Cc: Tero Kristo <t-kristo@ti.com>, alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson <b-cousson@ti.com>, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/14] ASoC: twl4030: Support for DT booted kernel Date: Tue, 14 Aug 2012 17:22:42 +0300 [thread overview] Message-ID: <1344954162-7985-15-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com> When the kernel has been booted with DT blob the platform data is NULL for the driver. We need to construct the pdata based on the DT information for runtime use. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/codecs/twl4030.c | 57 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 8b13d50..f13c91a 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -26,6 +26,8 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/i2c/twl.h> #include <linux/slab.h> #include <linux/gpio.h> @@ -295,13 +297,59 @@ static inline void twl4030_reset_registers(struct snd_soc_codec *codec) } -static void twl4030_init_chip(struct snd_soc_codec *codec) +static void twl4030_setup_pdata_of(struct twl4030_codec_data *pdata, + struct device_node *node) +{ + int value; + + of_property_read_u32(node, "ti,digimic_delay", + &pdata->digimic_delay); + of_property_read_u32(node, "ti,ramp_delay_value", + &pdata->ramp_delay_value); + of_property_read_u32(node, "ti,offset_cncl_path", + &pdata->offset_cncl_path); + if (!of_property_read_u32(node, "ti,hs_extmute", &value)) + pdata->hs_extmute = value; + + pdata->hs_extmute_gpio = of_get_named_gpio(node, + "ti,hs_extmute_gpio", 0); + if (gpio_is_valid(pdata->hs_extmute_gpio)) + pdata->hs_extmute = 1; +} + +static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) { struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); + struct device_node *twl4030_codec_node = NULL; + +#ifdef CONFIG_OF + twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node, + "codec"); +#endif + + if (!pdata && twl4030_codec_node) { + pdata = devm_kzalloc(codec->dev, + sizeof(struct twl4030_codec_data), + GFP_KERNEL); + if (!pdata) { + dev_err(codec->dev, "Can not allocate memory\n"); + return NULL; + } + twl4030_setup_pdata_of(pdata, twl4030_codec_node); + } + + return pdata; +} + +static void twl4030_init_chip(struct snd_soc_codec *codec) +{ + struct twl4030_codec_data *pdata; struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); u8 reg, byte; int i = 0; + pdata = twl4030_get_pdata(codec); + if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio)) { int ret; @@ -2284,13 +2332,6 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { static int __devinit twl4030_codec_probe(struct platform_device *pdev) { - struct twl4030_codec_data *pdata = pdev->dev.platform_data; - - if (!pdata) { - dev_err(&pdev->dev, "platform_data is missing\n"); - return -EINVAL; - } - return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl4030, twl4030_dai, ARRAY_SIZE(twl4030_dai)); } -- 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 v2 14/14] ASoC: twl4030: Support for DT booted kernel Date: Tue, 14 Aug 2012 17:22:42 +0300 [thread overview] Message-ID: <1344954162-7985-15-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344954162-7985-1-git-send-email-peter.ujfalusi@ti.com> When the kernel has been booted with DT blob the platform data is NULL for the driver. We need to construct the pdata based on the DT information for runtime use. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/codecs/twl4030.c | 57 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 8b13d50..f13c91a 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -26,6 +26,8 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_gpio.h> #include <linux/i2c/twl.h> #include <linux/slab.h> #include <linux/gpio.h> @@ -295,13 +297,59 @@ static inline void twl4030_reset_registers(struct snd_soc_codec *codec) } -static void twl4030_init_chip(struct snd_soc_codec *codec) +static void twl4030_setup_pdata_of(struct twl4030_codec_data *pdata, + struct device_node *node) +{ + int value; + + of_property_read_u32(node, "ti,digimic_delay", + &pdata->digimic_delay); + of_property_read_u32(node, "ti,ramp_delay_value", + &pdata->ramp_delay_value); + of_property_read_u32(node, "ti,offset_cncl_path", + &pdata->offset_cncl_path); + if (!of_property_read_u32(node, "ti,hs_extmute", &value)) + pdata->hs_extmute = value; + + pdata->hs_extmute_gpio = of_get_named_gpio(node, + "ti,hs_extmute_gpio", 0); + if (gpio_is_valid(pdata->hs_extmute_gpio)) + pdata->hs_extmute = 1; +} + +static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) { struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); + struct device_node *twl4030_codec_node = NULL; + +#ifdef CONFIG_OF + twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node, + "codec"); +#endif + + if (!pdata && twl4030_codec_node) { + pdata = devm_kzalloc(codec->dev, + sizeof(struct twl4030_codec_data), + GFP_KERNEL); + if (!pdata) { + dev_err(codec->dev, "Can not allocate memory\n"); + return NULL; + } + twl4030_setup_pdata_of(pdata, twl4030_codec_node); + } + + return pdata; +} + +static void twl4030_init_chip(struct snd_soc_codec *codec) +{ + struct twl4030_codec_data *pdata; struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); u8 reg, byte; int i = 0; + pdata = twl4030_get_pdata(codec); + if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio)) { int ret; @@ -2284,13 +2332,6 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { static int __devinit twl4030_codec_probe(struct platform_device *pdev) { - struct twl4030_codec_data *pdata = pdev->dev.platform_data; - - if (!pdata) { - dev_err(&pdev->dev, "platform_data is missing\n"); - return -EINVAL; - } - return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl4030, twl4030_dai, ARRAY_SIZE(twl4030_dai)); } -- 1.7.8.6
next prev parent reply other threads:[~2012-08-14 14:23 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-14 14:22 [PATCH v2 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 01/14] MFD: twl4030-audio: Clean up MODULE_* and platform_driver part Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 02/14] MFD: twl4030-audio: Convert to use devm_kzalloc Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-28 9:50 ` Tero Kristo 2012-08-28 9:50 ` Tero Kristo 2012-08-28 9:50 ` Tero Kristo 2012-08-28 16:48 ` Mark Brown 2012-08-28 16:48 ` Mark Brown 2012-08-28 16:48 ` Mark Brown 2012-08-30 9:19 ` Peter Ujfalusi 2012-08-30 9:19 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 03/14] MFD: twl4030-audio: Rearange and clean-up the probe function Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 04/14] MFD: twl-core: Add API to query the HFCLK rate Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 05/14] MFD: twl4030-audio: Get audio MCLK via twl-core API instead of pdata Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 06/14] dt: Add empty of_find_node_by_name() function Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 07/14] MFD: twl4030-audio: Add DT support Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 08/14] Input: twl4030-vibra: Support for DT booted kernel Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 09/14] ASoC: twl4030: Move hs_extmute GPIO handling to driver Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 10/14] ARM: OMAP/ASoC: Zoom2: Let the codec to handle the hs_extmute GPIO Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 11/14] ASoC/MFD: twl4030: Remove set_hs_extmute callback from platform data Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 12/14] ASoC: twl4030: Convert to use devm_kzalloc Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` [PATCH v2 13/14] ASoC: twl4030: Add pointer to pdata within the private data Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi 2012-08-14 14:22 ` Peter Ujfalusi [this message] 2012-08-14 14:22 ` [PATCH v2 14/14] ASoC: twl4030: Support for DT booted kernel Peter Ujfalusi 2012-08-28 9:51 ` [PATCH v2 00/14] MFD/ASoC/Input: twl4030-audio submodule DT support Tero Kristo 2012-08-28 9:51 ` Tero Kristo 2012-08-28 9:51 ` Tero Kristo
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=1344954162-7985-15-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=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=lrg@ti.com \ --cc=rob.herring@calxeda.com \ --cc=t-kristo@ti.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.