From patchwork Fri Aug 11 13:29:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 109873 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp919221qge; Fri, 11 Aug 2017 06:32:11 -0700 (PDT) X-Received: by 10.99.56.5 with SMTP id f5mr15102533pga.162.1502458330899; Fri, 11 Aug 2017 06:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502458330; cv=none; d=google.com; s=arc-20160816; b=fCysbRANu6AR6cdw4+ZkTl5aj/bvK/r0WL3hQuiNTYcw8OA9rn+DJpomey7IkOn9vs YimiXw4MKYZv3LU1ex+0jYf3q7olNWgzkTwPemw+3GawDRq6b8lVSTVCsdvvOjNc1A4/ B6oaf8ficyJ5HEffJkemFuT2Ahukuqi5Inv3yxsfbNMfEobPY5Tmfk8UZDxmqpmhnADz p6dtbMB6K1kcRYUutZu63uWuTBdcqsCSqxjyEHJCa3jiGSG5eDWoCBXuLm7yRAroWWdZ leYiZk/CgpU2XcVpTsmJiRU6u4zFYMie5/4f6KtqmbyFjW/LCxVYOSd+2vH++ayA8zoT vcvA== 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=74nXtId3wefc8o4sJAE1qSu06uA3mzIxiKa1a+/sZyI=; b=V64dJHMvEYST/iRa3Dcey4udPIWAu+FGo4FRGOLjTlsMHR1YWaLvscUHwTyc5K5+yc fN9qCo2RTG/jRyQ8+j2+k/YEBGQMmWzK+tTyztTh/KWAMF925CJxBcCev5zfxo2P8a/Z hZke3MMQv8XY+zKQVpwHTX+za84F5tS1ciIfwdquEM82X0z+gQMiOFAbAmHgC3Yq26ew 2OnELOF+Ibyu+1UZ8iQFJsRtX+3gLL2uWASWxPUdVRFD6S/RdKlQSjMRRLO9MiSp1EAO WMYE5UCEehUdVyE+wkYtzcpT0V9H+fwksFWdiDRZZQvuBr8hd0yK4Rta/489ep3ZGeJr Q97Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ersf5Zmm; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (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 r3si546625plb.958.2017.08.11.06.32.10; Fri, 11 Aug 2017 06:32:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ersf5Zmm; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753280AbdHKNaT (ORCPT + 9 others); Fri, 11 Aug 2017 09:30:19 -0400 Received: from mail-it0-f41.google.com ([209.85.214.41]:33681 "EHLO mail-it0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753247AbdHKNaR (ORCPT ); Fri, 11 Aug 2017 09:30:17 -0400 Received: by mail-it0-f41.google.com with SMTP id f16so1670939itb.0 for ; Fri, 11 Aug 2017 06:30:17 -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=MXvp/hsGKrK1F1kJeFJXW2oYwwDRmu6OI9JcBFLDkx4=; b=ersf5Zmm4ELUbcrD4QSAd842DM/n6x/D0JugY4ChdjhKLS4zkdXawr+HrjQfP11Wqm dUTWiZ0/PNoomS83KD/mp0UNF3wrPlgetUGKifB2Jh5CHenIdxN8FPEJE7PaDFWaEsxg fODEAxRTbrUtJCmKxzPspJoYZqnIMdC4abaCE= 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=MXvp/hsGKrK1F1kJeFJXW2oYwwDRmu6OI9JcBFLDkx4=; b=iEPSSssOrFGkV6hDrjdFD3QCmTlh1sFwygKTsfCfeCq6H1zworJw8sKdcZfk9KdLxv nelFdAu9hwv9zgjf8uWF1Ea1ohZjTEnxhbi1S+Vw0rXbuhT1sEdtboPLZPRCauMuLbS4 FNWKwQ5U44UwSUAUreP8lqx/yNiRDuZje0zs5viM/gzFj8ZCUcRnSaHxHDg6ShYCWl9p 5F8DAyqNqo6ZVRwm6n6vKVeu1aXINlC4S/0f/PYkYvyKFHckVqcJLIXaXrSTTA+UIptn BMb60zPEszbSGWT3nxiDEJQy78gZtJfkhEXbIHhmoXcvlpXPByD8fzgR25By4kNWUspp aCJA== X-Gm-Message-State: AIVw112juATK5EYzBs0KgP/nqetNPPnyq7D7iof3xJQ6G7lXkUUF3BxJ usrbUgci+Y6ejKBH X-Received: by 10.36.6.69 with SMTP id 66mr15374607itv.137.1502458216093; Fri, 11 Aug 2017 06:30:16 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id y72sm398422iod.40.2017.08.11.06.30.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Aug 2017 06:30:15 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Mark Brown , Banajit Goswami , alsa-devel@alsa-project.org Cc: Takashi Iwai , Patrick Lai , linux-kernel@vger.kernel.org, kwestfie@codeaurora.org, linux-arm-msm@vger.kernel.org, lkasam@qti.qualcomm.com, sboyd@codeaurora.org, Srinivas Kandagatla Subject: [RFC PATCH 6/9] ASoC: qcom: qdsp6v2: Add support to q6 HDMI dai driver Date: Fri, 11 Aug 2017 15:29:49 +0200 Message-Id: <20170811132952.32572-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> References: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla This patch adds support to HDMI backend dai driver. Signed-off-by: Srinivas Kandagatla --- .../devicetree/bindings/sound/qcom,q6hdmi.txt | 27 +++ sound/soc/qcom/Kconfig | 4 + sound/soc/qcom/qdsp6v2/Makefile | 1 + sound/soc/qcom/qdsp6v2/q6hdmi.c | 258 +++++++++++++++++++++ 4 files changed, 290 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6hdmi.txt create mode 100644 sound/soc/qcom/qdsp6v2/q6hdmi.c -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/sound/qcom,q6hdmi.txt b/Documentation/devicetree/bindings/sound/qcom,q6hdmi.txt new file mode 100644 index 0000000..a38f58a --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6hdmi.txt @@ -0,0 +1,27 @@ +Qualcomm Q6 HDMI DAI binding + +This bindings describe the Qualcomm Q6 HDMI dai. + +- compatible: + + Usage: required + Value type: + Definition: must be "qcom,q6hdmi-v" + example: "qcom,q6hdmi-v2" +- qcom,afe-port: + Usage: required + Value type: + Definition: handle to AFE port + +#sound-dai-cells: + Usage: required + Value type: + Definition: Must be equal to 0 + + += EXAMPLE + q6hdmi { + compatible = "qcom,q6hdmi-v2"; + qcom,afe-port = <&afe AFE_PORT_HDMI_RX>; + #sound-dai-cells = <0>; + }; diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 9a5b3f0..5035d37 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -60,6 +60,9 @@ config SND_SOC_QDSP6V2_ROUTING tristate default n +config SND_SOC_QDSP6V2_HDMI + tristate + default n config SND_SOC_QDSP6V2 tristate "SoC ALSA audio driver for QDSP6V2" @@ -67,6 +70,7 @@ config SND_SOC_QDSP6V2 select SND_SOC_QDSP6V2_ADM select SND_SOC_QDSP6V2_ASM select SND_SOC_QDSP6V2_ROUTING + select SND_SOC_QDSP6V2_HDMI help To add support for MSM QDSP6V2 Soc Audio. This will enable sound soc platform specific diff --git a/sound/soc/qcom/qdsp6v2/Makefile b/sound/soc/qcom/qdsp6v2/Makefile index 81d2341..4cab915 100644 --- a/sound/soc/qcom/qdsp6v2/Makefile +++ b/sound/soc/qcom/qdsp6v2/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_SND_SOC_QDSP6V2_AFE) += q6afe.o obj-$(CONFIG_SND_SOC_QDSP6V2_ADM) += q6adm.o obj-$(CONFIG_SND_SOC_QDSP6V2_ASM) += q6asm.o obj-$(CONFIG_SND_SOC_QDSP6V2_ROUTING) += q6routing.o +obj-$(CONFIG_SND_SOC_QDSP6V2_HDMI) += q6hdmi.o diff --git a/sound/soc/qcom/qdsp6v2/q6hdmi.c b/sound/soc/qcom/qdsp6v2/q6hdmi.c new file mode 100644 index 0000000..020a377 --- /dev/null +++ b/sound/soc/qcom/qdsp6v2/q6hdmi.c @@ -0,0 +1,258 @@ +/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "q6afe-v2.h" + +struct q6hdmi_dai_data { + struct q6afe_port *port; + struct q6afe_hdmi_cfg port_config; + bool is_port_started; +}; + +static int q6hdmi_format_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct q6hdmi_dai_data *dai_data = kcontrol->private_data; + int value = ucontrol->value.integer.value[0]; + + dai_data->port_config.datatype = value; + + return 0; +} + +static int q6hdmi_format_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + + struct q6hdmi_dai_data *dai_data = kcontrol->private_data; + + ucontrol->value.integer.value[0] = + dai_data->port_config.datatype; + + return 0; +} + +static const char * const hdmi_format[] = { + "LPCM", + "Compr" +}; + +static const struct soc_enum hdmi_config_enum[] = { + SOC_ENUM_SINGLE_EXT(2, hdmi_format), +}; + +static const struct snd_kcontrol_new hdmi_config_controls[] = { + SOC_ENUM_EXT("HDMI RX Format", hdmi_config_enum[0], + q6hdmi_format_get, + q6hdmi_format_put), +}; + +static int q6hdmi_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct q6hdmi_dai_data *dai_data = dev_get_drvdata(dai->dev); + int channels = params_channels(params); + + dai_data->port_config.sample_rate = params_rate(params); + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + dai_data->port_config.bit_width = 16; + break; + case SNDRV_PCM_FORMAT_S24_LE: + dai_data->port_config.bit_width = 24; + break; + } + + /*refer to HDMI spec CEA-861-E: Table 28 Audio InfoFrame Data Byte 4*/ + switch (channels) { + case 2: + dai_data->port_config.channel_allocation = 0; + break; + case 3: + dai_data->port_config.channel_allocation = 0x02; + break; + case 4: + dai_data->port_config.channel_allocation = 0x06; + break; + case 5: + dai_data->port_config.channel_allocation = 0x0A; + break; + case 6: + dai_data->port_config.channel_allocation = 0x0B; + break; + case 7: + dai_data->port_config.channel_allocation = 0x12; + break; + case 8: + dai_data->port_config.channel_allocation = 0x13; + break; + default: + dev_err(dai->dev, "invalid Channels = %u\n", channels); + return -EINVAL; + } + + return 0; +} + +static int q6hdmi_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct q6hdmi_dai_data *dai_data = dev_get_drvdata(dai->dev); + + dai_data->is_port_started = false; + + return 0; +} + +static void q6hdmi_shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct q6hdmi_dai_data *dai_data = dev_get_drvdata(dai->dev); + int rc; + + rc = q6afe_port_stop(dai_data->port); + if (rc < 0) + dev_err(dai->dev, "fail to close AFE port\n"); + + dai_data->is_port_started = false; + +} + +static int q6hdmi_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct q6hdmi_dai_data *dai_data = dev_get_drvdata(dai->dev); + int rc; + + + if (dai_data->is_port_started) { + /* stop the port and restart with new port config */ + rc = q6afe_port_stop(dai_data->port); /* can block */ + if (rc < 0) { + dev_err(dai->dev, "fail to close AFE port\n"); + return rc; + } + } + + rc = q6afe_hdmi_port_start(dai_data->port, &dai_data->port_config); + if (rc < 0) { + dev_err(dai->dev, "fail to open AFE port %x\n", dai->id); + return rc; + } + + dai_data->is_port_started = true; + + return 0; +} + +static const struct snd_soc_dapm_route hdmi_dapm_routes[] = { + {"HDMI Playback", NULL, "HDMI"}, +}; + +static struct snd_soc_dai_ops q6hdmi_ops = { + .prepare = q6hdmi_prepare, + .hw_params = q6hdmi_hw_params, + .shutdown = q6hdmi_shutdown, + .startup = q6hdmi_startup, +}; + +static struct snd_soc_dai_driver q6hdmi_hdmi_rx_dai = { + .playback = { + .stream_name = "HDMI Playback", + .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | + SNDRV_PCM_RATE_192000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, + .channels_min = 2, + .channels_max = 8, + .rate_max = 192000, + .rate_min = 48000, + }, + .ops = &q6hdmi_ops, + .name = "HDMI", +}; + +static const struct snd_soc_dapm_widget hdmi_dapm_widgets[] = { + SND_SOC_DAPM_AIF_OUT("HDMI", "HDMI Playback", 0, 0, 0, 0), + SND_SOC_DAPM_OUTPUT("HDMI-RX"), +}; + +static const struct snd_soc_component_driver msm_dai_hdmi_q6_component = { + .name = "msm-dai-q6-hdmi", + .dapm_widgets = hdmi_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(hdmi_dapm_widgets), + .controls = hdmi_config_controls, + .num_controls = ARRAY_SIZE(hdmi_config_controls), + .dapm_routes = hdmi_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(hdmi_dapm_routes), +}; + +static int q6hdmi_dev_probe(struct platform_device *pdev) +{ + struct q6hdmi_dai_data *dai_data; + int rc = 0; + struct q6afe_port *port; + + dai_data = devm_kzalloc(&pdev->dev, sizeof(*dai_data), GFP_KERNEL); + if (!dai_data) + rc = -ENOMEM; + + port = q6afe_port_get(&pdev->dev, "qcom,afe-port"); + if (IS_ERR(port)) { + dev_err(&pdev->dev, "Unable to get afe port\n"); + return -EPROBE_DEFER; + } + dai_data->port = port; + q6hdmi_hdmi_rx_dai.id = q6afe_get_port_index(port); + dev_set_drvdata(&pdev->dev, dai_data); + + return snd_soc_register_component(&pdev->dev, + &msm_dai_hdmi_q6_component, + &q6hdmi_hdmi_rx_dai, 1); +} + +static int q6hdmi_dev_remove(struct platform_device *pdev) +{ + struct q6hdmi_dai_data *dai_data = dev_get_drvdata(&pdev->dev); + + q6afe_port_put(dai_data->port); + snd_soc_unregister_component(&pdev->dev); + + return 0; +} + +static const struct of_device_id q6hdmi_dt_match[] = { + {.compatible = "qcom,q6hdmi-v2"}, + {} +}; +MODULE_DEVICE_TABLE(of, q6hdmi_dt_match); + +static struct platform_driver q6hdmi_driver = { + .probe = q6hdmi_dev_probe, + .remove = q6hdmi_dev_remove, + .driver = { + .name = "q6-hdmi", + .owner = THIS_MODULE, + .of_match_table = q6hdmi_dt_match, + }, +}; + +module_platform_driver(q6hdmi_driver); From patchwork Fri Aug 11 13:29:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 109874 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp919245qge; Fri, 11 Aug 2017 06:32:11 -0700 (PDT) X-Received: by 10.84.211.136 with SMTP id c8mr18191094pli.273.1502458331844; Fri, 11 Aug 2017 06:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502458331; cv=none; d=google.com; s=arc-20160816; b=Y9hc8UcFT4uCk9vOnOUtOtMYWc+0DXTzLsmPe81so39hyarpWQiFwiaheG1yR9+cHk MBrsgSqBkxN9ly+L4acX8k45d/1DORxMMgh4RVaFLdo6kz7gMeX5eQRJENOmcJTQPeX3 e55OqeB8mqO3cX1xGSHtiAVhqEDLSdrn+e5o7RogQtCprjk3gzDZ725p0PVcalu/3+s7 KWKmZKwvuB3dQFCZyFDofxvzbjJyiYxXuvyvo1xp/LmzL4sG8phTgBDe+HNLkkgu/aGU xESG07S5KF5c3/qQ7AVu1saBtdL3gjqLZHol9dDq3OhNBq0sUma1JiTT22Imk4EM2kuO GE3A== 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=vfgXTYuorNsmr/JmzrLxCO6EE3CXEEH7DmXJ0hPbZ6k=; b=m2Vz8oeVKMyi9K/h49FI2/xgEUN6B/t7GRyQ8omMfPL+SxGJtBrFYCtJM9LkDX5iSv DBYL6oceHQpQDO6vr++6rEPctTQBf+UCEwP40/UzE6dMGEvRC59efO65PinmuI2aZchc U3Yzgk8hM0xbt469RB1BmtC8ul2456svrbjomcHlMx4VUblzzuItJiB0Q49H8fBV06pD Jh0ZwuPH1lCAwCL1MnMl4oM7u5vCAEBVJENLYx33GVYaCnCR0oKO2bqVjvKauzbby/zY OUJYES8rPycv2zuD9tO3cq+NYUm7PApkA3LX7jjB0dHNzZlcmUj+lSyOqM4rUKnjRXZW P+VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UaWEvk+e; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (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 r3si546625plb.958.2017.08.11.06.32.11; Fri, 11 Aug 2017 06:32:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UaWEvk+e; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752985AbdHKNcK (ORCPT + 9 others); Fri, 11 Aug 2017 09:32:10 -0400 Received: from mail-it0-f47.google.com ([209.85.214.47]:35904 "EHLO mail-it0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753270AbdHKNaT (ORCPT ); Fri, 11 Aug 2017 09:30:19 -0400 Received: by mail-it0-f47.google.com with SMTP id 77so27768429itj.1 for ; Fri, 11 Aug 2017 06:30:19 -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=6LTNjxK0zHmov/rMw7oDNphxLgkY7E5kUOrdSIRaNxM=; b=UaWEvk+eS6LwSoQtxz7zb3oxMHwrGpfcrJGooe32l/W4OQAorE/Hq8k7nWj3bM3yAt WNOAJRwcXp6BT4jb4rO0I1lKv+spC46W5CCvQMs29tcww53/nefhy9+uxP4x26R464Ki zgRVn1BsQykRDzygE+lt9rnvMVzjCAlL8g6lA= 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=6LTNjxK0zHmov/rMw7oDNphxLgkY7E5kUOrdSIRaNxM=; b=qndVXALl0dyYBnyd2Qzk10vv57owwmaY7NLgBGjRPUPyswqsqu6oSjIj5YY6LaPSqd q1FF6GJ16uO8rw8qEa45VHirzUsuTIeVLYdPpE0G/vw+cJa/FHyn/rD3rWN5cy6sp0qr PoJc3EvYWqZ+MJICLa3H0R/QGQb6sGUYDBZ5EoNcg5uRAep4WwM/BafFQlLZuLWtCl5d H41BC8qAEA1Xblnx6LmAAXTl7B8lxxMoamq/LGZ1wAUj0tu0Aref4ZkJC9akgAfHjggv mA4keNMo5qWpnNi/ek03Hk7rIjJagjC2GZ/wqg9zsv3OCYHM6K76wYYSP5UDtOC1DSwf nsNw== X-Gm-Message-State: AHYfb5iGVgHd+7p66Z/21tJfUPhd4JAUvSKZ5h2l/AFIZIgIKxPaYjyq 7fQmw4a4JYepZuG7 X-Received: by 10.36.4.136 with SMTP id 130mr13168197itb.37.1502458218372; Fri, 11 Aug 2017 06:30:18 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id y72sm398422iod.40.2017.08.11.06.30.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Aug 2017 06:30:17 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: Mark Brown , Banajit Goswami , alsa-devel@alsa-project.org Cc: Takashi Iwai , Patrick Lai , linux-kernel@vger.kernel.org, kwestfie@codeaurora.org, linux-arm-msm@vger.kernel.org, lkasam@qti.qualcomm.com, sboyd@codeaurora.org, Srinivas Kandagatla Subject: [RFC PATCH 7/9] ASoC: qcom: qdsp6v2: Add support to q6 pcm driver Date: Fri, 11 Aug 2017 15:29:50 +0200 Message-Id: <20170811132952.32572-8-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> References: <20170811132952.32572-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla This patch adds support to q6 pcm driver which configures Q6ASM streams to pass pcm data. Currently the driver only exposes 2 playback streams for hdmi playback support, it can be easily extended to add all 8 streams. Signed-off-by: Srinivas Kandagatla --- .../devicetree/bindings/sound/qcom,q6pcm.txt | 21 + sound/soc/qcom/Kconfig | 6 + sound/soc/qcom/qdsp6v2/Makefile | 1 + sound/soc/qcom/qdsp6v2/q6pcm.c | 558 +++++++++++++++++++++ 4 files changed, 586 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6pcm.txt create mode 100644 sound/soc/qcom/qdsp6v2/q6pcm.c -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/sound/qcom,q6pcm.txt b/Documentation/devicetree/bindings/sound/qcom,q6pcm.txt new file mode 100644 index 0000000..3560757 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/qcom,q6pcm.txt @@ -0,0 +1,21 @@ +Qualcomm Q6ADM (Q6 Audio Device Manager) binding + +This bindings describe the Qualcomm Q6 ADM module on QDSP, +which is used by audio drivers. + +- compatible: + + Usage: required + Value type: + Definition: must be "qcom,q6pcm-v2" + +#sound-dai-cells: + Usage: required + Value type: + Definition: Must be equal to 1 + += EXAMPLE + pcm: pcm0 { + compatible = "qcom,q6pcm-v2"; + #sound-dai-cells = <1>; + }; diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 5035d37..a2aa480 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -64,6 +64,11 @@ config SND_SOC_QDSP6V2_HDMI tristate default n +config SND_SOC_QDSP6V2_PCM + tristate + default n + + config SND_SOC_QDSP6V2 tristate "SoC ALSA audio driver for QDSP6V2" select SND_SOC_QDSP6V2_AFE @@ -71,6 +76,7 @@ config SND_SOC_QDSP6V2 select SND_SOC_QDSP6V2_ASM select SND_SOC_QDSP6V2_ROUTING select SND_SOC_QDSP6V2_HDMI + select SND_SOC_QDSP6V2_PCM help To add support for MSM QDSP6V2 Soc Audio. This will enable sound soc platform specific diff --git a/sound/soc/qcom/qdsp6v2/Makefile b/sound/soc/qcom/qdsp6v2/Makefile index 4cab915..76e0794 100644 --- a/sound/soc/qcom/qdsp6v2/Makefile +++ b/sound/soc/qcom/qdsp6v2/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_SND_SOC_QDSP6V2_ADM) += q6adm.o obj-$(CONFIG_SND_SOC_QDSP6V2_ASM) += q6asm.o obj-$(CONFIG_SND_SOC_QDSP6V2_ROUTING) += q6routing.o obj-$(CONFIG_SND_SOC_QDSP6V2_HDMI) += q6hdmi.o +obj-$(CONFIG_SND_SOC_QDSP6V2_PCM) += q6pcm.o diff --git a/sound/soc/qcom/qdsp6v2/q6pcm.c b/sound/soc/qcom/qdsp6v2/q6pcm.c new file mode 100644 index 0000000..cfd9a7b --- /dev/null +++ b/sound/soc/qcom/qdsp6v2/q6pcm.c @@ -0,0 +1,558 @@ +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "q6asm-v2.h" +#include "q6routing-v2.h" +#include "common.h" + +#define PLAYBACK_MIN_NUM_PERIODS 2 +#define PLAYBACK_MAX_NUM_PERIODS 8 +#define PLAYBACK_MAX_PERIOD_SIZE 61440 +#define PLAYBACK_MIN_PERIOD_SIZE 128 + +enum stream_state { + IDLE = 0, + STOPPED, + RUNNING, +}; + +struct q6pcm_rtd { + struct snd_pcm_substream *substream; + void *data; + dma_addr_t phys; + unsigned int pcm_size; + unsigned int pcm_count; + unsigned int pcm_irq_pos; /* IRQ position */ + unsigned int periods; + uint16_t bits_per_sample; + uint16_t source; /* Encoding source bit mask */ + + struct audio_client *audio_client; + uint16_t session_id; + + enum stream_state state; + bool set_channel_map; + char channel_map[8]; +}; + +struct q6pcm_data { + struct q6asm *q6asm; + u64 sid; +}; + +static struct snd_pcm_hardware q6pcm_hardware_playback = { + .info = (SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE), + .rates = SNDRV_PCM_RATE_8000_192000, + .rate_min = 8000, + .rate_max = 192000, + .channels_min = 1, + .channels_max = 8, + .buffer_bytes_max = PLAYBACK_MAX_NUM_PERIODS * + PLAYBACK_MAX_PERIOD_SIZE, + .period_bytes_min = PLAYBACK_MIN_PERIOD_SIZE, + .period_bytes_max = PLAYBACK_MAX_PERIOD_SIZE, + .periods_min = PLAYBACK_MIN_NUM_PERIODS, + .periods_max = PLAYBACK_MAX_NUM_PERIODS, + .fifo_size = 0, +}; + +/* Conventional and unconventional sample rate supported */ +static unsigned int supported_sample_rates[] = { + 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, + 88200, 96000, 176400, 192000 +}; + +static struct snd_pcm_hw_constraint_list constraints_sample_rates = { + .count = ARRAY_SIZE(supported_sample_rates), + .list = supported_sample_rates, + .mask = 0, +}; + +static void event_handler(uint32_t opcode, uint32_t token, + uint32_t *payload, void *priv) +{ + struct q6pcm_rtd *prtd = priv; + struct snd_pcm_substream *substream = prtd->substream; + + switch (opcode) { + case ASM_CLIENT_EVENT_CMD_RUN_DONE: + q6asm_write_nolock(prtd->audio_client, + prtd->pcm_count, 0, 0, NO_TIMESTAMP); + break; + case ASM_CLIENT_EVENT_CMD_EOS_DONE: + prtd->state = STOPPED; + break; + case ASM_CLIENT_EVENT_DATA_WRITE_DONE: { + prtd->pcm_irq_pos += prtd->pcm_count; + snd_pcm_period_elapsed(substream); + if (prtd->state == RUNNING) + q6asm_write_nolock(prtd->audio_client, + prtd->pcm_count, 0, 0, NO_TIMESTAMP); + + break; + } + default: + pr_err("Not Supported Event opcode[0x%x]\n", opcode); + break; + } +} + +static int q6pcm_prepare(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; + struct q6pcm_rtd *prtd = runtime->private_data; + struct q6pcm_data *pdata; + int ret; + + pdata = dev_get_drvdata(soc_prtd->platform->dev); + if (!pdata) { + pr_err("%s: platform data not populated\n", __func__); + return -EINVAL; + } + if (!prtd || !prtd->audio_client) { + pr_err("%s: private data null or audio client freed\n", + __func__); + return -EINVAL; + } + + prtd->pcm_count = snd_pcm_lib_period_bytes(substream); + prtd->pcm_irq_pos = 0; + /* rate and channels are sent to audio driver */ + if (prtd->state) { + /* clear the previous setup if any */ + q6asm_cmd(prtd->audio_client, CMD_CLOSE); + q6asm_unmap_memory_regions(substream->stream, + prtd->audio_client); + routing_dereg_phy_stream(soc_prtd->dai_link->id, + SNDRV_PCM_STREAM_PLAYBACK); + } + + ret = q6asm_map_memory_regions(substream->stream, prtd->audio_client, + prtd->data, prtd->phys, + (prtd->pcm_size / prtd->periods), + prtd->periods); + + if (ret < 0) { + pr_err("Audio Start: Buffer Allocation failed rc = %d\n", + ret); + return -ENOMEM; + } + + prtd->audio_client->perf_mode = LEGACY_PCM_MODE; + + ret = q6asm_open_write(prtd->audio_client, FORMAT_LINEAR_PCM, + prtd->bits_per_sample); + if (ret < 0) { + pr_err("%s: q6asm_open_write failed\n", __func__); + q6asm_audio_client_free(prtd->audio_client); + prtd->audio_client = NULL; + return -ENOMEM; + } + + prtd->session_id = prtd->audio_client->session; + ret = routing_reg_phy_stream(soc_prtd->dai_link->id, + prtd->audio_client->perf_mode, + prtd->session_id, substream->stream); + if (ret) { + pr_err("%s: stream reg failed ret:%d\n", __func__, ret); + return ret; + } + + ret = q6asm_media_format_block_multi_ch_pcm( + prtd->audio_client, runtime->rate, + runtime->channels, !prtd->set_channel_map, + prtd->channel_map, prtd->bits_per_sample); + if (ret < 0) + pr_info("%s: CMD Format block failed\n", __func__); + + prtd->state = RUNNING; + + return 0; +} + +static int q6pcm_trigger(struct snd_pcm_substream *substream, int cmd) +{ + int ret = 0; + struct snd_pcm_runtime *runtime = substream->runtime; + struct q6pcm_rtd *prtd = runtime->private_data; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + ret = q6asm_run_nowait(prtd->audio_client, 0, 0, 0); + break; + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = q6asm_run_nowait(prtd->audio_client, 0, 0, 0); + break; + case SNDRV_PCM_TRIGGER_STOP: + ret = q6asm_cmd_nowait(prtd->audio_client, CMD_EOS); + break; + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ret = q6asm_cmd_nowait(prtd->audio_client, CMD_PAUSE); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static int q6pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; + struct q6pcm_rtd *prtd; + struct q6pcm_data *pdata; + struct device *dev = soc_prtd->platform->dev; + int ret = 0; + + pdata = dev_get_drvdata(dev); + if (!pdata) { + pr_err("Platform data not found ..\n"); + return -EINVAL; + } + + prtd = kzalloc(sizeof(struct q6pcm_rtd), GFP_KERNEL); + if (prtd == NULL) + return -ENOMEM; + + prtd->substream = substream; + prtd->audio_client = q6asm_audio_client_alloc(pdata->q6asm, dev, + (app_cb)event_handler, prtd); + if (!prtd->audio_client) { + pr_info("%s: Could not allocate memory\n", __func__); + kfree(prtd); + return -ENOMEM; + } + + prtd->audio_client->dev = dev; + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + runtime->hw = q6pcm_hardware_playback; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_sample_rates); + if (ret < 0) + pr_info("snd_pcm_hw_constraint_list failed\n"); + /* Ensure that buffer size is a multiple of period size */ + ret = snd_pcm_hw_constraint_integer(runtime, + SNDRV_PCM_HW_PARAM_PERIODS); + if (ret < 0) + pr_info("snd_pcm_hw_constraint_integer failed\n"); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + ret = snd_pcm_hw_constraint_minmax(runtime, + SNDRV_PCM_HW_PARAM_BUFFER_BYTES, + PLAYBACK_MIN_NUM_PERIODS * PLAYBACK_MIN_PERIOD_SIZE, + PLAYBACK_MAX_NUM_PERIODS * PLAYBACK_MAX_PERIOD_SIZE); + if (ret < 0) { + pr_err("constraint for buffer bytes min max ret = %d\n", + ret); + } + } + + ret = snd_pcm_hw_constraint_step(runtime, 0, + SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32); + if (ret < 0) { + pr_err("constraint for period bytes step ret = %d\n", + ret); + } + ret = snd_pcm_hw_constraint_step(runtime, 0, + SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32); + if (ret < 0) { + pr_err("constraint for buffer bytes step ret = %d\n", + ret); + } + + prtd->set_channel_map = false; + runtime->private_data = prtd; + + snd_soc_set_runtime_hwparams(substream, &q6pcm_hardware_playback); + + runtime->dma_bytes = q6pcm_hardware_playback.buffer_bytes_max; + + + prtd->data = substream->dma_buffer.area; + + if (pdata->sid < 0) + prtd->phys = substream->dma_buffer.addr; + else + prtd->phys = substream->dma_buffer.addr | (pdata->sid << 32); + + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + + return 0; +} + +static int q6pcm_close(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; + struct q6pcm_rtd *prtd = runtime->private_data; + + if (prtd->audio_client) { + q6asm_cmd(prtd->audio_client, CMD_CLOSE); + q6asm_unmap_memory_regions(substream->stream, + prtd->audio_client); + q6asm_audio_client_free(prtd->audio_client); + } + routing_dereg_phy_stream(soc_prtd->dai_link->id, + SNDRV_PCM_STREAM_PLAYBACK); + kfree(prtd); + return 0; +} + +static snd_pcm_uframes_t q6pcm_pointer(struct snd_pcm_substream *substream) +{ + + struct snd_pcm_runtime *runtime = substream->runtime; + struct q6pcm_rtd *prtd = runtime->private_data; + + if (prtd->pcm_irq_pos >= prtd->pcm_size) + prtd->pcm_irq_pos = 0; + + return bytes_to_frames(runtime, (prtd->pcm_irq_pos)); +} + +static int q6pcm_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *soc_prtd = substream->private_data; + + return dma_mmap_coherent(soc_prtd->platform->dev, vma, + runtime->dma_area, runtime->dma_addr, + runtime->dma_bytes); +} + +static int q6pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct q6pcm_rtd *prtd = runtime->private_data; + + prtd->pcm_size = params_buffer_bytes(params); + prtd->periods = params_periods(params); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + prtd->bits_per_sample = 16; + break; + case SNDRV_PCM_FORMAT_S24_LE: + prtd->bits_per_sample = 24; + break; + } + + return 0; +} + +static struct snd_pcm_ops q6pcm_ops = { + .open = q6pcm_open, + .hw_params = q6pcm_hw_params, + .close = q6pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .prepare = q6pcm_prepare, + .trigger = q6pcm_trigger, + .pointer = q6pcm_pointer, + .mmap = q6pcm_mmap, +}; +static int msm_asoc_pcm_new(struct snd_soc_pcm_runtime *rtd) +{ + struct device *dev = rtd->platform->dev; + struct snd_pcm *pcm = rtd->pcm; + struct snd_pcm_substream *substream; + int size, ret = 0; + + substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; + size = q6pcm_hardware_playback.buffer_bytes_max; + ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, dev, size, + &substream->dma_buffer); + if (ret) { + dev_err(dev, "Cannot allocate buffer(s)\n"); + return ret; + } + + return 0; +} + +static void msm_asoc_pcm_free(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + int i; + + for (i = 0; i < ARRAY_SIZE(pcm->streams); i++) { + substream = pcm->streams[i].substream; + if (substream) { + snd_dma_free_pages(&substream->dma_buffer); + substream->dma_buffer.area = NULL; + substream->dma_buffer.addr = 0; + } + } +} + +static struct snd_soc_platform_driver msm_soc_platform = { + .ops = &q6pcm_ops, + .pcm_new = msm_asoc_pcm_new, + .pcm_free = msm_asoc_pcm_free, + +}; + +static const struct snd_soc_dapm_route afe_pcm_routes[] = { + {"MM_DL1", NULL, "MultiMedia1 Playback" }, + {"MM_DL2", NULL, "MultiMedia2 Playback" }, + +}; + +static int fe_dai_probe(struct snd_soc_dai *dai) +{ + struct snd_soc_dapm_context *dapm; + + dapm = snd_soc_component_get_dapm(dai->component); + snd_soc_dapm_add_routes(dapm, afe_pcm_routes, + ARRAY_SIZE(afe_pcm_routes)); + + return 0; +} + +static const struct snd_soc_component_driver msm_fe_dai_component = { + .name = "msm-dai-fe", +}; + +static struct snd_soc_dai_driver msm_fe_dais[] = { + { + .playback = { + .stream_name = "MultiMedia1 Playback", + .rates = (SNDRV_PCM_RATE_8000_192000| + SNDRV_PCM_RATE_KNOT), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE), + .channels_min = 1, + .channels_max = 8, + .rate_min = 8000, + .rate_max = 192000, + }, + .name = "MM_DL1", + .probe = fe_dai_probe, + .id = MSM_FRONTEND_DAI_MULTIMEDIA1, + }, + { + .playback = { + .stream_name = "MultiMedia2 Playback", + .rates = (SNDRV_PCM_RATE_8000_192000| + SNDRV_PCM_RATE_KNOT), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE), + .channels_min = 1, + .channels_max = 8, + .rate_min = 8000, + .rate_max = 192000, + }, + .name = "MM_DL2", + .probe = fe_dai_probe, + .id = MSM_FRONTEND_DAI_MULTIMEDIA2, + }, +}; + +static int q6pcm_probe(struct platform_device *pdev) +{ + struct q6pcm_data *pdata; + struct device *dev = &pdev->dev; + struct device_node *node = dev->of_node; + struct of_phandle_args args; + int rc; + + pdata = devm_kzalloc(dev, sizeof(struct q6pcm_data), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + pdata->q6asm = q6asm_get(dev); + if (IS_ERR(pdata->q6asm)) + return -EPROBE_DEFER; + + + rc = of_parse_phandle_with_fixed_args(node, "iommus", 1, 0, &args); + if (rc < 0) + pdata->sid = -1; + else + pdata->sid = args.args[0]; + + /* only 32bit addressable */ + dma_set_mask(dev, DMA_BIT_MASK(32)); + dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + dev_set_drvdata(dev, pdata); + + rc = snd_soc_register_platform(dev, &msm_soc_platform); + if (rc) { + dev_err(&pdev->dev, "err_dai_platform\n"); + return rc; + } + + rc = snd_soc_register_component(dev, &msm_fe_dai_component, + msm_fe_dais, ARRAY_SIZE(msm_fe_dais)); + if (rc) + dev_err(dev, "err_dai_component\n"); + + return rc; + +} + +static int q6pcm_remove(struct platform_device *pdev) +{ + snd_soc_unregister_platform(&pdev->dev); + + return 0; +} + +static const struct of_device_id q6pcm_dt_match[] = { + {.compatible = "qcom,q6pcm-v2"}, + {} +}; +MODULE_DEVICE_TABLE(of, q6pcm_dt_match); + +static struct platform_driver q6pcm_driver = { + .driver = { + .name = "msm-pcm-dsp", + .owner = THIS_MODULE, + .of_match_table = q6pcm_dt_match, + }, + .probe = q6pcm_probe, + .remove = q6pcm_remove, +}; + +module_platform_driver(q6pcm_driver); + +MODULE_DESCRIPTION("PCM module platform driver"); +MODULE_LICENSE("GPL v2");