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 11/11] ASoC: twl4030: Support for DT booted kernel Date: Wed, 8 Aug 2012 12:41:27 +0300 [thread overview] Message-ID: <1344418887-5262-12-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-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 | 67 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index bf0240d..68495a2 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -26,6 +26,7 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <linux/i2c/twl.h> #include <linux/slab.h> #include <linux/gpio.h> @@ -295,13 +296,70 @@ 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; + else + pdata->hs_extmute = 0; + + if (pdata->hs_extmute) { + int ret = of_property_read_u32(node, "ti,hs_extmute_gpio", + &pdata->hs_extmute_gpio); + if (!ret) { + if (!of_property_read_u32(node, + "ti,hs_extmute_disable_level", + &value)) { + pdata->hs_extmute_disable_level = value; + } + } else { + pdata->hs_extmute_gpio = -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, level; @@ -2288,13 +2346,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 11/11] ASoC: twl4030: Support for DT booted kernel Date: Wed, 8 Aug 2012 12:41:27 +0300 [thread overview] Message-ID: <1344418887-5262-12-git-send-email-peter.ujfalusi@ti.com> (raw) In-Reply-To: <1344418887-5262-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 | 67 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index bf0240d..68495a2 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -26,6 +26,7 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <linux/i2c/twl.h> #include <linux/slab.h> #include <linux/gpio.h> @@ -295,13 +296,70 @@ 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; + else + pdata->hs_extmute = 0; + + if (pdata->hs_extmute) { + int ret = of_property_read_u32(node, "ti,hs_extmute_gpio", + &pdata->hs_extmute_gpio); + if (!ret) { + if (!of_property_read_u32(node, + "ti,hs_extmute_disable_level", + &value)) { + pdata->hs_extmute_disable_level = value; + } + } else { + pdata->hs_extmute_gpio = -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, level; @@ -2288,13 +2346,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-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 ` [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 ` Peter Ujfalusi [this message] 2012-08-08 9:41 ` [PATCH 11/11] ASoC: twl4030: Support for DT booted kernel 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-12-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.