From patchwork Wed Aug 8 09:41:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293771 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AABEDDFFEB for ; Wed, 8 Aug 2012 09:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030323Ab2HHJmU (ORCPT ); Wed, 8 Aug 2012 05:42:20 -0400 Received: from na3sys009aog120.obsmtp.com ([74.125.149.140]:47191 "EHLO na3sys009aog120.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030321Ab2HHJmR (ORCPT ); Wed, 8 Aug 2012 05:42:17 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]) (using TLSv1) by na3sys009aob120.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0eHklKOlEWtGeEREd5oiESuLc8Qm8@postini.com; Wed, 08 Aug 2012 02:42:17 PDT Received: by obbwd20 with SMTP id wd20so1210851obb.23 for ; Wed, 08 Aug 2012 02:42:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=A4ffM17vSKImswbgF2EZ446qIcxEadLZOIqT2sQxGRM=; b=f7rLjsPmpi1RTXeypMu7A4YBl6C4z6XpCyxrUkAS1mhmgB1v5yFJ+S15mhPD0y7ZKa nqch4YjIOBAAp2b03eifCsasn+Wm/IfEtYw2coJ3GI+E5v1d0jpd0dDvwWcyzKVTLiMt ZsdjlRCCQ4ZNSApAz4NEvibEFTkoW2xjfqcj2XjE37Km05nl4vJWeOpGtJ933WVUg4wm WHA3z+dJosMA+NthfKs05WnStr39JBbB+6oLYAmL7p95tPTqIgA+9WdZSiXXQIP8RPUH yLefCwf7i84nlTnZjIgtURTfXZbMIO9Fiz0Lb2jtkaL+C0t2AamBsMxJdyBiCLEkVHKe Aznw== Received: by 10.60.172.101 with SMTP id bb5mr28944822oec.44.1344418936289; Wed, 08 Aug 2012 02:42:16 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id c6sm22141308obn.13.2012.08.08.02.42.12 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:42:15 -0700 (PDT) From: Peter Ujfalusi To: Samuel Ortiz , Mark Brown , Liam Girdwood , Tony Lindgren , Dmitry Torokhov 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 Subject: [PATCH 11/11] ASoC: twl4030: Support for DT booted kernel Date: Wed, 8 Aug 2012 12:41:27 +0300 Message-Id: <1344418887-5262-12-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> References: <1344418887-5262-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQkMGI4UGN1XxZDTGnQ9+FJHbsibe+ZbghKDluxGaPR0oaczL/SpMAzFxfU3qtnF3VqfK3dg Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 --- 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 #include #include +#include #include #include #include @@ -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)); }