From patchwork Wed Aug 8 09:41:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1293981 Return-Path: X-Original-To: patchwork-linux-omap@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 EF81BDF223 for ; Wed, 8 Aug 2012 09:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964920Ab2HHJoj (ORCPT ); Wed, 8 Aug 2012 05:44:39 -0400 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]:33784 "EHLO na3sys009aog129.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030235Ab2HHJlt (ORCPT ); Wed, 8 Aug 2012 05:41:49 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUCI0XYTVEOiNKq7y5BGEwNn9rjIXmzRx@postini.com; Wed, 08 Aug 2012 02:41:49 PDT Received: by obqv19 with SMTP id v19so2107693obq.16 for ; Wed, 08 Aug 2012 02:41:48 -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=lQod+OOvMY8UNg5zPPEfP4L8SyUkB6ld5vgikkbcDuM=; b=oVqbsiHWzv+oEt9164xuVtEBtDqharI/yDm6O8xRlpDgl6IlZJz+DFm3xpqro8Wu5f TlyK3eEA5FxrfrA486OlzGZ0PnaK39KnY8cI7meVU48id1diiyepX14P7HEtrKJuLpUw XqweP9Aw4Q3TTeQZAoVU+b44hDf63NGonbpjpedHNkXXEPXhqIdNstFx2DUytyO+0yda A35BdDQDHwi55EJ2T6Fv2dBLbBU+eWUo57spbNxot8emTYpyt0x//+2e7O2d6ugmkYxy CpRIU0gMxfl0RX8PZBXo3yME3gQKxTyPqeT2yJh9nmk9uX1Le6qQFl3o2m8hWIsWSFS0 g/7w== Received: by 10.182.222.39 with SMTP id qj7mr29444813obc.16.1344418908736; Wed, 08 Aug 2012 02:41:48 -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.41.45 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 02:41:48 -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 03/11] MFD: twl4030-audio: Rearange and clean-up the probe function Date: Wed, 8 Aug 2012 12:41:19 +0300 Message-Id: <1344418887-5262-4-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: ALoCoQnfQTOUnYfS38eIxLxjLoJ/BCwBCg582PCb/N/xsVROxjemOyZ0js94WwTn42igWEDkdxKY Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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 --- 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);