From patchwork Tue Feb 13 16:58:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10217031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFB2760329 for ; Tue, 13 Feb 2018 17:14:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDFCD286EC for ; Tue, 13 Feb 2018 17:14:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D273B28EA0; Tue, 13 Feb 2018 17:14:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 46BA5286EC for ; Tue, 13 Feb 2018 17:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=IDJnFZIKvqMzd+ieVjjEmFD0Fik8zwjMC6mocDMvj70=; b=uk+eEU51mzwOmHeotiOr+W0L83 lbMZAG50kmCt9S4/xnnr6Tuh/TpweV5rrYT7Q64dGXWg5CVoUp/gdRqHc2U0y4H65XMWIOeR/Bcfl IZuA5XyLOhckjIWBR0NBqWe/Qf//ITeak/KZl/cwmqgyzTlxRvOAKvGbR0RZGGSg7HXatzUEIM5QN tdTBTlYLesnpANme9g58UIYWkKcHtmEqWgrN0CWgpBsXwSauICqdmcmpr7xbKyTI+Sz4A30pXeylf +p7X1sEnGYmGOutk3Vl+KxaIJePFgy/pRdiOmJuK7IH6nwhA2OtJwKI55hnQZO9I8ig7jS7Im6HOZ Qsm14AuA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eleA3-0007sE-2Y; Tue, 13 Feb 2018 17:14:31 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eldxl-0003rY-JO for linux-arm-kernel@lists.infradead.org; Tue, 13 Feb 2018 17:02:39 +0000 Received: by mail-wm0-x242.google.com with SMTP id b21so17276169wme.4 for ; Tue, 13 Feb 2018 09:01:48 -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=4gSyMnZu0jAokTqfgezSMJZSoMNWyk9PtERXGo4ALSY=; b=BYy+aPguNwQl15SwsGsTzTsHZbTIqxH/9b6plpAXipn6cR1hBTPE+UuNN4PSxZ05bw xW67ac2uTwluyKlvGgYbhtFso3n36NYbcJp+c595YAVmd6bdM2dsnYtI86GgT0nIX+Ap MFEzuWbRJ7Jid47J+YHY/CdKAml9q13h35Pdg= 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=4gSyMnZu0jAokTqfgezSMJZSoMNWyk9PtERXGo4ALSY=; b=CtQJaN+RVwbIOjaX2GU3tfbOM+tOR6KftWWtampdjkpDAIQ0R2kyYXKKeeDCNh1oxB /oOG/30AmnpL5S7CQvcFtrNrZRz+aANIMJrBTVmz0IK6LMhJ4a42U5r+41aEGwq0Y+dk i3YUSveK0+Z6mmcevOyUKEs2npOBJZvAXClpORF9XDiifQGtkO3jSXxJDdBeIe2SHKcw OSick+bgArUbEA0jKkFVNbDsyCpWx6OzLplxA66Rtjcll691ZjdEYaEYVK8WuYoVbz4z jGFvE5GbGY8tANKs8lr39/aapG1bZZbqx56QIucHdcpKnjeCRyCA87zxjuGsC5qbHpL3 6b2Q== X-Gm-Message-State: APf1xPAiJUiAf5DQMXjJ8nA7x2TNFcB96/IGnkNRARRuT1GtLKYhiEfF OLb5cYHUI+wVnn5RR7NhD8d+aw== X-Google-Smtp-Source: AH8x2272KzC2bs6hxH9HsveGqUDGWKaXsdm+st6mtIrN8A38RadTkyGvkJC42p7oXnGNWg1mRchl1A== X-Received: by 10.28.110.3 with SMTP id j3mr2024042wmc.97.1518541306929; Tue, 13 Feb 2018 09:01:46 -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 y145sm7432723wmd.43.2018.02.13.09.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Feb 2018 09:01:46 -0800 (PST) From: srinivas.kandagatla@linaro.org To: andy.gross@linaro.org, broonie@kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 24/25] ASoC: qcom: apq8096: Add db820c machine driver Date: Tue, 13 Feb 2018 16:58:36 +0000 Message-Id: <20180213165837.1620-25-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213165837.1620-1-srinivas.kandagatla@linaro.org> References: <20180213165837.1620-1-srinivas.kandagatla@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180213_090150_260716_773B14E3 X-CRM114-Status: GOOD ( 15.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, bgoswami@codeaurora.org, rohkumar@qti.qualcomm.com, linux-kernel@vger.kernel.org, plai@codeaurora.org, tiwai@suse.com, lgirdwood@gmail.com, perex@perex.cz, david.brown@linaro.org, robh+dt@kernel.org, Srinivas Kandagatla , spatakok@qti.qualcomm.com, linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Srinivas Kandagatla This patch adds support to DB820c machine driver. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/Kconfig | 8 +++ sound/soc/qcom/apq8096.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 sound/soc/qcom/apq8096.c diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index 8c2d65e0a28e..fa4b575c086c 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -77,3 +77,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" + depends on QCOM_APR + 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..b12d2398557a --- /dev/null +++ b/sound/soc/qcom/apq8096.c @@ -0,0 +1,173 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018, Linaro Limited + */ + +#include +#include +#include +#include +#include +#include + +static 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 int apq8096_sbc_parse_of(struct snd_soc_card *card) +{ + struct device *dev = card->dev; + struct snd_soc_dai_link *link; + struct device_node *np, *codec, *platform, *cpu, *node = dev->of_node; + int ret, num_links; + bool is_fe; + + + ret = snd_soc_of_parse_card_name(card, "qcom,model"); + if (ret) + dev_err(dev, "Error parsing card name: %d\n", ret); + + if (of_property_read_bool(dev->of_node, "qcom,audio-routing")) + ret = snd_soc_of_parse_audio_routing(card, + "qcom,audio-routing"); + + /* Populate links */ + num_links = of_get_child_count(node); + + dev_info(dev, "Found %d child audio dai links..\n", num_links); + /* Allocate the private data and the DAI link array */ + card->dai_link = devm_kzalloc(dev, sizeof(*link) * num_links, + GFP_KERNEL); + if (!card->dai_link) + return -ENOMEM; + + card->num_links = num_links; + + link = card->dai_link; + + for_each_child_of_node(node, np) { + is_fe = false; + if (of_property_read_bool(np, "is-fe")) + is_fe = true; + + if (is_fe) { + /* BE is dummy */ + link->codec_of_node = NULL; + link->codec_dai_name = "snd-soc-dummy-dai"; + link->codec_name = "snd-soc-dummy"; + + /* FE settings */ + link->dynamic = 1; + link->dpcm_playback = 1; + + } else { + link->no_pcm = 1; + link->dpcm_playback = 1; + link->ignore_suspend = 1; + link->ignore_pmdown_time = 1; + link->be_hw_params_fixup = msm8996_be_hw_params_fixup; + } + + cpu = of_get_child_by_name(np, "cpu"); + platform = of_get_child_by_name(np, "platform"); + codec = of_get_child_by_name(np, "codec"); + + if (!cpu) { + dev_err(dev, "Can't find cpu DT node\n"); + return -EINVAL; + } + + link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0); + if (!link->cpu_of_node) { + dev_err(card->dev, "error getting cpu phandle\n"); + return -EINVAL; + } + + link->platform_of_node = of_parse_phandle(platform, + "sound-dai", 0); + if (!link->platform_of_node) { + dev_err(card->dev, "error getting platform phandle\n"); + return -EINVAL; + } + + ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); + if (ret) { + dev_err(card->dev, "error getting cpu dai name\n"); + return ret; + } + + if (codec) { + ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); + + if (ret < 0) { + dev_err(card->dev, "error getting codec dai name\n"); + return ret; + } + } + + ret = of_property_read_string(np, "link-name", &link->name); + if (ret) { + dev_err(card->dev, "error getting codec dai_link name\n"); + return ret; + } + + link->stream_name = link->name; + link++; + } + + return ret; +} + +static int msm_snd_apq8096_probe(struct apr_device *adev) +{ + int ret; + struct snd_soc_card *card; + + card = devm_kzalloc(&adev->dev, sizeof(*card), GFP_KERNEL); + if (!card) + return -ENOMEM; + + card->dev = &adev->dev; + + ret = apq8096_sbc_parse_of(card); + if (ret) { + dev_err(&adev->dev, "Error parsing OF data\n"); + return ret; + } + + ret = devm_snd_soc_register_card(&adev->dev, card); + if (ret) + dev_err(&adev->dev, "sound card register failed (%d)!\n", ret); + else + dev_err(&adev->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 apr_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_apr_driver(msm_snd_apq8096_driver); +MODULE_AUTHOR("Srinivas Kandagatla