From patchwork Tue Mar 4 08:25:27 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 3760441
X-Patchwork-Delegate: broonie@sirena.org.uk
Return-Path:
X-Original-To: patchwork-alsa-devel@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork2.web.kernel.org (Postfix) with ESMTP id 3C912BF13A
for ;
Tue, 4 Mar 2014 09:34:39 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 5C09C2041D
for ;
Tue, 4 Mar 2014 09:34:38 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id 191262041F
for ;
Tue, 4 Mar 2014 09:34:37 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id 3A2C6265805; Tue, 4 Mar 2014 10:34:36 +0100 (CET)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY,
UNRESOLVED_TEMPLATE autolearn=no version=3.3.1
Received: from alsa0.perex.cz (localhost [IPv6:::1])
by alsa0.perex.cz (Postfix) with ESMTP id C886D265771;
Tue, 4 Mar 2014 10:32:53 +0100 (CET)
X-Original-To: alsa-devel@alsa-project.org
Delivered-To: alsa-devel@alsa-project.org
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id A26F1265765; Tue, 4 Mar 2014 10:32:51 +0100 (CET)
Received: from ch1outboundpool.messaging.microsoft.com
(ch1ehsobe002.messaging.microsoft.com [216.32.181.182])
by alsa0.perex.cz (Postfix) with ESMTP id 7C19D265774
for ;
Tue, 4 Mar 2014 10:32:07 +0100 (CET)
Received: from mail145-ch1-R.bigfish.com (10.43.68.225) by
CH1EHSOBE006.bigfish.com (10.43.70.56) with Microsoft SMTP Server id
14.1.225.22; Tue, 4 Mar 2014 09:32:06 +0000
Received: from mail145-ch1 (localhost [127.0.0.1]) by
mail145-ch1-R.bigfish.com (Postfix) with ESMTP id 4AABB4200D2;
Tue, 4 Mar 2014 09:32:06 +0000 (UTC)
X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null);
IPV:NLI;
H:mail.freescale.net; RD:none; EFVD:NLI
X-SpamScore: 1
X-BigFish:
VS1(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzdchd2iz1de098h8275bh1de097hz2dh2a8h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1155h)
Received: from mail145-ch1 (localhost.localdomain [127.0.0.1]) by mail145-ch1
(MessageSwitch) id 1393925524380901_25529;
Tue, 4 Mar 2014 09:32:04 +0000 (UTC)
Received: from CH1EHSMHS021.bigfish.com
(snatpool1.int.messaging.microsoft.com
[10.43.68.244]) by mail145-ch1.bigfish.com (Postfix) with ESMTP id
57812300059; Tue, 4 Mar 2014 09:32:04 +0000 (UTC)
Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS021.bigfish.com
(10.43.70.21) with Microsoft SMTP Server (TLS) id 14.16.227.3;
Tue, 4 Mar 2014 09:32:03 +0000
Received: from az84smr01.freescale.net (10.64.34.197) by
039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP
Server (TLS) id 14.3.158.2; Tue, 4 Mar 2014 09:32:02 +0000
Received: from rock.am.freescale.net (rock.ap.freescale.net [10.193.20.106])
by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id
s249VucE017720; Tue, 4 Mar 2014 02:31:59 -0700
From: Xiubo Li
To: , ,
Date: Tue, 4 Mar 2014 16:25:27 +0800
Message-ID: <1393921529-28985-2-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.0
In-Reply-To: <1393921529-28985-1-git-send-email-Li.Xiubo@freescale.com>
References: <1393921529-28985-1-git-send-email-Li.Xiubo@freescale.com>
MIME-Version: 1.0
X-OriginatorOrg: freescale.com
X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn%
X-FOPE-CONNECTOR:
Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn%
Cc: alsa-devel@alsa-project.org, Xiubo Li ,
linux-kernel@vger.kernel.org
Subject: [alsa-devel] [RFC][PATCH 1/3] ASoC: core: Move the default regmap
I/O setting to snd_soc_register_codec()
X-BeenThere: alsa-devel@alsa-project.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Alsa-devel mailing list for ALSA developers -
http://www.alsa-project.org"
List-Unsubscribe:
,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
X-Virus-Scanned: ClamAV using ClamSMTP
Add the default regmap I/O setting to snd_soc_register_codec() while
the CODEC is initialising, which will be called by CODEC driver device
probe(), and then we can make set_cache_io() go away entirely from each
CODEC ASoC probe.
Signed-off-by: Xiubo Li
---
include/sound/soc.h | 3 +++
sound/soc/soc-core.c | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4c4d7e1..94bc1c4 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -749,6 +749,9 @@ struct snd_soc_codec_driver {
int (*set_pll)(struct snd_soc_codec *codec, int pll_id, int source,
unsigned int freq_in, unsigned int freq_out);
+ /* codec regmap */
+ struct regmap *regmap;
+
/* codec IO */
unsigned int (*read)(struct snd_soc_codec *, unsigned int);
int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a14155b..0fb502f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4443,6 +4443,17 @@ int snd_soc_register_codec(struct device *dev,
codec->num_dai = num_dai;
mutex_init(&codec->mutex);
+ if (!codec->write && (codec_drv->regmap ||
+ dev_get_regmap(codec->dev, NULL))) {
+ /* Set the default I/O up try regmap */
+ ret = snd_soc_codec_set_cache_io(codec, codec_drv->regmap);
+ if (ret < 0 && ret != -ENOTSUPP) {
+ dev_err(codec->dev,
+ "Failed to set cache I/O: %d\n", ret);
+ goto fail_codec_name;
+ }
+ }
+
for (i = 0; i < num_dai; i++) {
fixup_codec_formats(&dai_drv[i].playback);
fixup_codec_formats(&dai_drv[i].capture);