From patchwork Thu Dec 14 17:34:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 121999 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp7105764qgn; Thu, 14 Dec 2017 09:36:58 -0800 (PST) X-Google-Smtp-Source: ACJfBov0vex1W9M9KLwTm4wNVQe6zO7GXNdSTv92aue+IlNnhFpvMcO21mfu+ix8n+IZilHS4/Wv X-Received: by 10.84.231.194 with SMTP id g2mr10157479pln.182.1513273017911; Thu, 14 Dec 2017 09:36:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513273017; cv=none; d=google.com; s=arc-20160816; b=Cj5TdNrxQq/QhgE5cXHd9Y4bz02rasJYeIZe2fe0PObg0cKudSFBEa+456AAR6Zd9V /LN2r+l4jOSjB1zr/oKwgMP3AOJLw2JL4ieR/mvGcWGY5mQjn/E5/MgbfeSLOYbJE5/4 M/OXi7stZJTImQBBAHJ3YvUpIaFlNr8wbiBEmLWES+Gy6qo1zW69t8L5KpNy7qFuN/fd +i+vF2QTBHxBr5jt++MeJ/UKCSiqPdmrFOSJnGJVnpu2YzI3YKtEBOxeg4sZmCKeqC4u j2vmpyOxcJe7G3yjHBVQydfQymdlV3V9uW2cfn221MK8i8iaUj/B/ofz8+gzyfL3wK6l JMLQ== 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=DEAHeCRLPL4Ci8J+ax/7zObpCQEYRK4YNjnmb59elyk=; b=gkCW5tQFARVx9aRGUPu7nMZNHTvkIhXsXbeESqrbuxIQVxrAAa9VCVnd4EiNNExVbF 8zhCLlPxKkFoAptdIkE2RQrlztDd2hVcBLdFcjWOO2jETwEsGhHZZdNifNU0VFM58K21 mR6ucD0x1yeHTcdE/DCLvdYSXgOiAu3ed9KpRgTJBzNY7leErdxQbG13cxVFZSyZ6ieG 5zoAjJdUWVkIgPPKAcTA/j1PfQDwiO6I0c8Fz/3ctpkWv0VSSQqrY2Fi/qAPHEKFbm0i KgfgG5txQ4iMnt9DaPIKzej8y34sc/pFQn5FK6otQHXK8/hijtaDvExbrzRkjbl/qinB uWHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=EHWjGLWx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 i9si3176403pgs.523.2017.12.14.09.36.57; Thu, 14 Dec 2017 09:36:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=EHWjGLWx; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1753924AbdLNRgz (ORCPT + 6 others); Thu, 14 Dec 2017 12:36:55 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:42961 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753910AbdLNRgw (ORCPT ); Thu, 14 Dec 2017 12:36:52 -0500 Received: by mail-wm0-f66.google.com with SMTP id b199so12959480wme.1 for ; Thu, 14 Dec 2017 09:36:51 -0800 (PST) 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=5P11H62b4xPELhart8WGy+syC64k2uY5O2WNEbio21c=; b=EHWjGLWxC5uWzk41AmS2WsltXjFy/9CxGKGBCSO0Z4Aa95f7DuyyGK7yBBBR1EXWYD fJSxUPUz7oigNz0oJsydiUM7QEhNtmQLVERG8avpt8LLVOFkR+BgVbq5A2j9KFwbaCTQ gLQhoyex15mIM/+zQ73zdU10Mm4fQu7X6ktpA= 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=5P11H62b4xPELhart8WGy+syC64k2uY5O2WNEbio21c=; b=W7RplGqLG2pYkw/njaBZpHfCYNqluLMg9V8EvDZn6EGNepwLlrlYpkZnzLvaYZGFWQ qyefBU/Dnn2odAwLHldN5m9G8w5vikgOluWTt36F2ZhE7pIuy54NyUyoYl76Wsv1Dnxf MaVH8Z2J32lvJqYbPTmVuoNVR+06bdQ9XQZLJWvpGEflsGypy48h5r8IkjeI6PGGf+hV nNvVTr/88pyd5UpJp2FR08eKhcvrSeeQV6DTE/SbZdLS3qHncVIPkAY0PnpmNH912b9E GVCMRo8tDzJjm2XIx47RNKS7boKoZAsC3ksdYO2n/j6CPzv3ywV6yFNv/EIx8wjt4heE Zm4Q== X-Gm-Message-State: AKGB3mJIeCl7qQevbaH7X1/Xw4w9tcvBHnfNHxPjgvygbWspFz+Onpi8 nISpS2hS7LKP8jGlxDNAJ6hotg== X-Received: by 10.28.19.199 with SMTP id 190mr2661709wmt.87.1513273010774; Thu, 14 Dec 2017 09:36:50 -0800 (PST) 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 r82sm1741757wme.31.2017.12.14.09.36.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Dec 2017 09:36:50 -0800 (PST) From: srinivas.kandagatla@linaro.org To: Andy Gross , Mark Brown , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org Cc: David Brown , Rob Herring , Mark Rutland , Liam Girdwood , Patrick Lai , Banajit Goswami , Jaroslav Kysela , Takashi Iwai , linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, sboyd@codeaurora.org, Srinivas Kandagatla Subject: [RESEND PATCH v2 14/15] ASoC: qcom: apq8096: Add db820c machine driver Date: Thu, 14 Dec 2017 17:34:01 +0000 Message-Id: <20171214173402.19074-15-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171214173402.19074-1-srinivas.kandagatla@linaro.org> References: <20171214173402.19074-1-srinivas.kandagatla@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Srinivas Kandagatla uThis patch adds support to DB820c machine driver. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/Kconfig | 9 +++- sound/soc/qcom/apq8096.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 sound/soc/qcom/apq8096.c -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" 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/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index ecd1e4ba834d..748ccc3edefa 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -72,7 +72,6 @@ config SND_SOC_QDSP6_ASM_DAI tristate default n - config SND_SOC_QDSP6 tristate "SoC ALSA audio driver for QDSP6" select SND_SOC_QDSP6_AFE @@ -87,3 +86,11 @@ config SND_SOC_QDSP6 This will enable sound soc platform specific audio drivers. This includes q6asm, q6adm, q6afe interfaces to DSP using apr. + +config SND_SOC_MSM8996 + tristate "SoC Machine driver for MSM8996 and APQ8096 boards" + select SND_SOC_QDSP6V2 + default n + help + To add support for SoC audio on MSM8996 and APQ8096 boards + diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c new file mode 100644 index 000000000000..5b2036317f71 --- /dev/null +++ b/sound/soc/qcom/apq8096.c @@ -0,0 +1,124 @@ +/* + * Copyright (c) 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 + +int msm8996_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + + return 0; +} +static struct snd_soc_dai_link msm8996_dai_links[] = { + /* FrontEnd DAI Links */ + { + .name = "MultiMedia1 Playback", + .stream_name = "MultiMedia1", + .cpu_dai_name = "MM_DL1", + .platform_name = "q6asm_dai", + .dynamic = 1, + .dpcm_playback = 1, + + .codec_dai_name = "snd-soc-dummy-dai", + .codec_name = "snd-soc-dummy", + }, + /* Backend DAI Links */ + { + .name = "HDMI Playback", + .stream_name = "q6afe_dai", + .cpu_dai_name = "HDMI", + .platform_name = "q6routing", + .no_pcm = 1, + .dpcm_playback = 1, + .be_hw_params_fixup = msm8996_be_hw_params_fixup, + .codec_dai_name = "i2s-hifi", + .codec_name = "hdmi-audio-codec.0.auto", + }, +}; + +static int apq8096_sbc_parse_of(struct snd_soc_card *card) +{ + struct device *dev = card->dev; + int ret; + + ret = snd_soc_of_parse_card_name(card, "qcom,model"); + if (ret) + dev_err(dev, "Error parsing card name: %d\n", ret); + + return ret; +} + +static int msm_snd_apq8096_probe(struct platform_device *pdev) +{ + int ret; + struct snd_soc_card *card; + + card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL); + if (!card) + return -ENOMEM; + + card->dev = &pdev->dev; + + ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); + if (ret) + return ret; + + card->dai_link = msm8996_dai_links; + card->num_links = ARRAY_SIZE(msm8996_dai_links); + + ret = apq8096_sbc_parse_of(card); + if (ret) { + dev_err(&pdev->dev, "Error parsing OF data\n"); + return ret; + } + + ret = devm_snd_soc_register_card(&pdev->dev, card); + if (ret) + dev_err(&pdev->dev, "sound card register failed (%d)!\n", ret); + else + dev_err(&pdev->dev, "sound card register Sucessfull\n"); + + return ret; +} + +static const struct of_device_id msm_snd_apq8096_dt_match[] = { + {.compatible = "qcom,apq8096-sndcard"}, + {} +}; + +static struct platform_driver msm_snd_apq8096_driver = { + .probe = msm_snd_apq8096_probe, + .driver = { + .name = "msm-snd-apq8096", + .owner = THIS_MODULE, + .of_match_table = msm_snd_apq8096_dt_match, + }, +}; +module_platform_driver(msm_snd_apq8096_driver); +MODULE_AUTHOR("Srinivas Kandagatla