From patchwork Mon Jul 23 15:54:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 142625 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6208635ljj; Mon, 23 Jul 2018 08:58:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdxi9GdCvfEL9Ij5zVRQ6BV6+qKOcQv52KXMlvkIlGmPh07YkvYy6ZkHicHTaON95ixosB X-Received: by 2002:a17:902:8e81:: with SMTP id bg1-v6mr13386914plb.129.1532361516647; Mon, 23 Jul 2018 08:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532361516; cv=none; d=google.com; s=arc-20160816; b=T9ahvxKsK+gveFktHWTvqxYGVka41TmNG4R8C4duYl+h94PfQN6E+t7swcbUOqKbg0 ad65IBtQoAVdEqBUpMOVnLvygHGEY5bQkvTT0WxN1Si3+twHQq9bsHFKgs+WR3HxRDHV qYI7Xj/RnDjkX3Awf4k4Mj0zP8YBeow4KV09gi7r9n8/8M/EuDNouAXy/eC+wtRKxow3 UkidZ8dwGP4lC94SjFAH10+rCsKk/P+VVik8W5IZaHU6OGmHMbewlmotA/qs1cFaEkgv sQa/GlLXjPWJji1n0xBQJ9BwkN/iOjDJ0OGKRryPVPXASSuGpc0t7jVoH3XVMRG5ArPM jiXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=aoEJ2XVT3uF75MOnrQF1a4afNWLnbIC2KbwDpWmLedk=; b=daQ2kSrS47T68SWOg/ngdbmPfYpH+ROGLO397QjzpzFSOkeezUFhr3kCQW+do7TkI1 6CdNixMLXy9mQ4ozgyO+smdfWDVh+uRqBRAAZslP0S66IxZXCMlVpvzJ2VkPd4cTRZwf Wb8kEHVbeGua2eZ+IkOjeKlnixAogN4SUxYW4MxPVkX7I9pbt+sK3/gI8j4x+uqRckCN plNRALFG8EpjJ0XAMv2Jo/mRN2CC8dv3uNx/7+EE8thSR/0erpmNDKY/7rbpZ09R6CBB Hk6peBOadl75xbvpu8/NimD8JRR976SWGcPeMCgHCgo0sGE3KRIvlZZgul3gaCGJOf0K vUCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hLPUgSvP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z4-v6si7895023pgp.580.2018.07.23.08.58.36; Mon, 23 Jul 2018 08:58:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hLPUgSvP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388889AbeGWRAZ (ORCPT + 31 others); Mon, 23 Jul 2018 13:00:25 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42991 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388819AbeGWRAY (ORCPT ); Mon, 23 Jul 2018 13:00:24 -0400 Received: by mail-wr1-f68.google.com with SMTP id e7-v6so1224173wrs.9 for ; Mon, 23 Jul 2018 08:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aoEJ2XVT3uF75MOnrQF1a4afNWLnbIC2KbwDpWmLedk=; b=hLPUgSvP3vpyK/thpvQIH+n1IRAbh0j0kAk/aYYEUDZf++P9N2qPe/oHjXTdt8Qdq5 P5Hv9RmETHLsLWEUlXH58KiikP1/rn+sGFZKB/f2hTrv1haI1VBq2tq+/dxGZsxDAngP BWeF7J+ltJq79O4znseXo9EJxm7nxtd1Gcays= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aoEJ2XVT3uF75MOnrQF1a4afNWLnbIC2KbwDpWmLedk=; b=E5O0D4iBXRO2Y483ufP5a3goMQe0n9l4c3mUQu9UQ50E8vvqsbE67h33dSgcITSOZ7 kLWOU2NCpNz3cPYMJ8lqRDEyVp25MkeHoWmMyMaZ9MN0HHwOpKIkBfIHf5QDeW9fJYqM Z9gh3K5hlnpx82esqs1VwXP7+KbrfdXc+TzqOdXEO1wvrL5Yp/kRLas+pdt0AHzpthbH QR6mQD+oa8p0om445Z1ZYOk3A+seOIvcOykYOG1Mjbyv9MEPz2CbCRB4BgV75Qlki7SV JjVZBpppBtZ9+5DLlgpkjKAiIo7GDMv4UuVjmaR8rss/afDGn0tFdPn9VikCi1DI9jKG pfvw== X-Gm-Message-State: AOUpUlF1uWM7kfRqQa11XSQUDexRKPPlPvkZwM+HSSwuKTUNUrkbrz61 uUNxpANwDh+ET9fvTpJubcHLdA== X-Received: by 2002:adf:ae01:: with SMTP id x1-v6mr9481597wrc.45.1532361510917; Mon, 23 Jul 2018 08:58:30 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id 14-v6sm206385wmt.1.2018.07.23.08.58.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jul 2018 08:58:30 -0700 (PDT) From: Srinivas Kandagatla To: lee.jones@linaro.org, robh+dt@kernel.org, broonie@kernel.org Cc: mark.rutland@arm.com, lgirdwood@gmail.com, tiwai@suse.com, bgoswami@codeaurora.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, vkoul@kernel.org, alsa-devel@alsa-project.org, Srinivas Kandagatla Subject: [PATCH 12/12] ASoC: apq8096: Add support to Analog audio via WCD9335 slim Date: Mon, 23 Jul 2018 16:54:10 +0100 Message-Id: <20180723155410.9494-13-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180723155410.9494-1-srinivas.kandagatla@linaro.org> References: <20180723155410.9494-1-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds support Analog audio via WCD9335 Codec connected via SLIMBus. Tested it on DB820c. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/apq8096.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) -- 2.16.2 diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c index a56156281c8d..3c0f5cb544d5 100644 --- a/sound/soc/qcom/apq8096.c +++ b/sound/soc/qcom/apq8096.c @@ -10,6 +10,72 @@ #include #include +#define SLIM_MAX_TX_PORTS 16 +#define SLIM_MAX_RX_PORTS 16 +#define WCD9335_DEFAULT_MCLK_RATE 9600000 + +static int msm_snd_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS]; + u32 rx_ch_cnt = 0, tx_ch_cnt = 0; + int ret = 0; + + ret = snd_soc_dai_get_channel_map(codec_dai, + &tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch); + if (ret != 0 && ret != -ENOTSUPP) { + pr_err("failed to get codec chan map, err:%d\n", ret); + goto end; + } else if (ret == -ENOTSUPP) { + return 0; + } + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + ret = snd_soc_dai_set_channel_map(cpu_dai, 0, NULL, + rx_ch_cnt, rx_ch); + else + ret = snd_soc_dai_set_channel_map(cpu_dai, tx_ch_cnt, tx_ch, + 0, NULL); + if (ret != 0 && ret != -ENOTSUPP) + pr_err("Failed to set cpu chan map, err:%d\n", ret); + +end: + return ret; +} + +static struct snd_soc_ops apq8096_ops = { + .hw_params = msm_snd_hw_params, +}; + +static int apq8096_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_dapm_context *dapm = &rtd->card->dapm; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + + /* + * Codec SLIMBUS configuration + * RX1, RX2, RX3, RX4, RX5, RX6, RX7, RX8, RX9, RX10, RX11, RX12, RX13 + * TX1, TX2, TX3, TX4, TX5, TX6, TX7, TX8, TX9, TX10, TX11, TX12, TX13 + * TX14, TX15, TX16 + */ + unsigned int rx_ch[SLIM_MAX_RX_PORTS] = {144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156}; + unsigned int tx_ch[SLIM_MAX_TX_PORTS] = {128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143}; + + snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch), + tx_ch, ARRAY_SIZE(rx_ch), rx_ch); + + snd_soc_dai_set_sysclk(codec_dai, 0, 9600000, + SNDRV_PCM_STREAM_PLAYBACK); + + return 0; +} + static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { @@ -100,6 +166,8 @@ static int apq8096_sbc_parse_of(struct snd_soc_card *card) link->no_pcm = 1; link->ignore_pmdown_time = 1; link->be_hw_params_fixup = apq8096_be_hw_params_fixup; + link->init = apq8096_init; + link->ops = &apq8096_ops; } else { link->platform_of_node = link->cpu_of_node; link->codec_dai_name = "snd-soc-dummy-dai";