From patchwork Wed Jul 4 09:49:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 141053 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp600584ljj; Wed, 4 Jul 2018 02:52:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpftwCDZ15wxb4YpOaUYR30lozzHXV6pY2G77y2mEV6fIea/IXMte5JdGgHs1nrbuN8Ebkfb X-Received: by 2002:adf:b3d4:: with SMTP id x20-v6mr1091034wrd.272.1530697928966; Wed, 04 Jul 2018 02:52:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530697928; cv=none; d=google.com; s=arc-20160816; b=ahkZ0AIEkYezW03hRQa+Ty/jzfDAtm1cJgCq2klV/OzozAnHsRQn9/6HTjTpfxYiPO K8S2hCh5pioxeSPkqcCNg84S+4kq2Qimb3WIsCd+8usNkaFHFxm4YGeOnnVVNvSCKjfh LONpTfmK6Sfv95CPEiJ1hkLAyrZrY1J9Zr7cHCI6cWtB7vYMJOXvDFK1Qf8CaSAYdzXE pBNQD1oBCAMO9CWK5BtjTs47I3b3TBPEdyRx2zmXMZQ4JUZNY/YxVqocjWpWjtTTmpDx tpr7N1h2qadevPzHUvAf7F6Uz8GoD1QczDdLCOwHuS88/aPNMlsNOMI3zE6PdrilZRrw cLeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=S3fWgsT/PNO/MB9CLy4y5t2SQQTMXAJTqni+/gQ+RGE=; b=tHUWBV4sKzqOqlCXyLyGlesNnjKonxT5nyJXpmJgtPVRywfM7dYLG8WojAnoo0+wvl 41zc1FfTVPVdAElhzmullEdd6PBeZ1AHlLYQ4hsHGeEAJq2Hc2hjHyg0JZ9vlDabG2Gc 4DW7VMkgSZIS08ZoBhgfDduUH2riX1b3Q9F9T02MLny2suYAGjQkx6yAqUDFxh42b0Uz o5uviROaxVeMde/QGy+rtmUiXP7PA7c/EI7FEzsMLVoeuxzemP6iHtrq4l5YLPI7NRzo 8irjmpq1HwhxTDkj5LxVaB1cPlFkj0Pk6pBQ3uVqkfk8LMNv16UPpeNg8xLBHUXrzU9k YIJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Duz1tjnj; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id m207-v6si2467565wma.171.2018.07.04.02.52.08; Wed, 04 Jul 2018 02:52:08 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Duz1tjnj; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4191726773A; Wed, 4 Jul 2018 11:52:00 +0200 (CEST) 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 6E5E9267731; Wed, 4 Jul 2018 11:51:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: ** X-Spam-Status: No, score=2.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS, UPPERCASE_50_75 autolearn=disabled version=3.4.0 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by alsa0.perex.cz (Postfix) with ESMTP id C792226772D for ; Wed, 4 Jul 2018 11:51:54 +0200 (CEST) Received: by mail-wm0-f44.google.com with SMTP id w16-v6so5118504wmc.2 for ; Wed, 04 Jul 2018 02:51:54 -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=2hHRQMSfbTJdMwinfMPKwYGBAvEGeRcl/rJ/8+GBz4g=; b=Duz1tjnjtRXMuPwmhRlFOQivg21BsxguiHAoiRMcn82x+R1ZxXfJOOyYUUlE0RC2pV EznQcR+ZSX0/mmP8TBhXvAB6qsGFIuPLybcqeuND7AW6EmyXnqnyD6J+jXI5JuckKasM 014GAWIJzBeEx5gQiFhGg087pb1WJBDtEYQCQ= 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=2hHRQMSfbTJdMwinfMPKwYGBAvEGeRcl/rJ/8+GBz4g=; b=Tclt2aiZmK78JEhhQGv2JvNP5Q+SC0KVevRrF8ny9ZWKqSLfhTYd0UPuHHaQTopBx5 MymAtE80H8w/2nmcbi2YvazhxcH8Uon2yHXgtg5Hh8p4hF52YVhER69xGVV96n3PiDDf RJh105Holxt6qY2s4maCMKxoW4EFkwc2ZvL5yxlHJO7drfSAAYwu1/XvlrpE5cC0auCH e8pikQJNvqJ+2MdTqg0dPvhrV6f4FasBgJ514ah0Imqx+xM0xu8NKNw+EWXfj7ryrckL nT6JItGsXlSpkOnwZSsYoeT8e59z3nR33cdQ65pEnGh/ojMiB7r79IQqF1Bp/q7qH93t PZCQ== X-Gm-Message-State: APt69E2q4jO1oB8hDCKdAGVVCKuWhg6uT8O0ozB+1RETLshDdrg9czOq YqAaAkISd9KeEwuScDMuDcwerQ== X-Received: by 2002:a1c:6f44:: with SMTP id k65-v6mr1069186wmc.19.1530697914193; Wed, 04 Jul 2018 02:51:54 -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 125-v6sm6370089wmw.9.2018.07.04.02.51.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 02:51:53 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, alsa-devel@alsa-project.org Date: Wed, 4 Jul 2018 10:49:39 +0100 Message-Id: <20180704094944.16440-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> References: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> Cc: bgoswami@codeaurora.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, Srinivas Kandagatla , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 1/6] ASoC: qdsp6: q6afe: Add missing slimbus capture ports 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org Existing code already has support for SLIMbus TX and RX, only thing that was missing from TX side was mapping between virtual to actual DSP port ids. This patch adds those mappings. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6afe.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 621b67b34db9..90e2d8e658bf 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -514,6 +514,20 @@ static struct afe_port_map port_maps[AFE_PORT_MAX] = { SLIMBUS_5_RX, 1, 1}, [SLIMBUS_6_RX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_RX, SLIMBUS_6_RX, 1, 1}, + [SLIMBUS_0_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_TX, + SLIMBUS_0_TX, 0, 1}, + [SLIMBUS_1_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_1_TX, + SLIMBUS_1_TX, 0, 1}, + [SLIMBUS_2_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_TX, + SLIMBUS_2_TX, 0, 1}, + [SLIMBUS_3_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX, + SLIMBUS_3_TX, 0, 1}, + [SLIMBUS_4_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX, + SLIMBUS_4_TX, 0, 1}, + [SLIMBUS_5_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX, + SLIMBUS_5_TX, 0, 1}, + [SLIMBUS_6_TX] = { AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_TX, + SLIMBUS_6_TX, 0, 1}, [PRIMARY_MI2S_RX] = { AFE_PORT_ID_PRIMARY_MI2S_RX, PRIMARY_MI2S_RX, 1, 1}, [PRIMARY_MI2S_TX] = { AFE_PORT_ID_PRIMARY_MI2S_TX, @@ -1372,6 +1386,13 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id) case AFE_PORT_ID_MULTICHAN_HDMI_RX: cfg_type = AFE_PARAM_ID_HDMI_CONFIG; break; + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_1_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX: + case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_TX: case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_RX: case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_1_RX: case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_RX: From patchwork Wed Jul 4 09:49:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 141055 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp600790ljj; Wed, 4 Jul 2018 02:52:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcvcDoMz9bzrJ8OUTz5SyKl/LaDHcHKdor2scgklfbHtgP3ywOLcnAEgMSbJaQqDCYkWiQv X-Received: by 2002:a1c:9042:: with SMTP id s63-v6mr1071683wmd.91.1530697947157; Wed, 04 Jul 2018 02:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530697947; cv=none; d=google.com; s=arc-20160816; b=JAkTfSgu7OkubzzTa5Rng/n+1O6byljGl2l+CA65SYjoJPFahnHwIKnWsb5QmAORTe FQZ570sxdKFB0ipIsNWDR0Vv1TWR3gF9IME0PhIJ3+NSMkgWGFTR9sHE5US05RwcFmq0 lUCvD1sNbI73hPwW7GunBJ+zuk0PIbc9I3JYMxilEiYEnOw6qG5FZzoleZ8B5iMOZJ9P lfnAM5plF/Mt9AmRgeyih8MZspsuygPldNewr8QVobCsf2SCAz7GIUTmeN2iugbkoKdM mqMW3eFPbEKYsD7C7Xp+95ooR+NZeWJJ+ns2nQNAY4qth7goUqXtLnVvIeb62KpMUm24 4gRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=2gtWwRnPLRrMIuvJRT1uYnGzXZ9/urb7fRXyW7kze3s=; b=AbSbdIeMy34rRwmbz2M/hCxOH0uarD49FKDsx+EFvrzlBAVRsabU7uHdQeBYH91mF0 3oe5dqAw48ID7AmKcxnQ9xq/NBCKMJovuQRh4EYNmKSfARDRaEtqdut0SrRfx56aJ7YL 4M+kC8QeMN/a1ONkH6u49bcojjPvcZWk3H7IPJbqMFuzuXirkeUYZwwfn1PGcQDKo7AM c/iI9nPQQ2lNRG68EZoJs70bNvkoI1VvTc9/11qfeCDbkyPj1Dp5IQiEwjyYLZEaxSMd SpgPdr7voWXkuWcRt5DUwBK4EP7tmiNe8z5c8/pdhNsKt5OS8qa2Gg/4DxKkOzeoKML5 NqPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GSExf8Po; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id i61-v6si2553971wri.92.2018.07.04.02.52.26; Wed, 04 Jul 2018 02:52:27 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GSExf8Po; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 01D5A267766; Wed, 4 Jul 2018 11:52:06 +0200 (CEST) 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 7834D2676FB; Wed, 4 Jul 2018 11:51:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by alsa0.perex.cz (Postfix) with ESMTP id CB5DB2676FB for ; Wed, 4 Jul 2018 11:51:56 +0200 (CEST) Received: by mail-wm0-f52.google.com with SMTP id w16-v6so5118615wmc.2 for ; Wed, 04 Jul 2018 02:51:56 -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=Q8SZ5AGv+OGHVpwVTp0NwXvz0pcK6+whzIzyJVlZ900=; b=GSExf8PoGC3OhjxuWxIT8cLIZKicGYueuSqXbKp47NAOGoHeiRPovSPB+m3cOjJwRm 2x+FwqyKW9shyuTcXrizquH/A4Oyt7cLZqM7rdAX6osCOA/UJ45vR/kZeqokI4DUA07/ eukC7BagOjl+7+qiJrk53XTiuTuAGD3UUnMkc= 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=Q8SZ5AGv+OGHVpwVTp0NwXvz0pcK6+whzIzyJVlZ900=; b=jVZqxpIGJAgmcq/wvfdhv/4csxMrnE317HhB3cwo+ZGywaZSg/j00lRn+edbSxEqyT 08oBilf/jwRz17+dire7aixQ5BUtnPF77OePILLtQ4j5nqnM7ZCSjwTFfT4KSE/do8Cl J7LGjLZmqgEcT5DzRmeJKh9xsQawXGcMuYufa6c1WMbG9QyP5U6ICKf+wsfmIpee5dTF d86DroPuzuZCXlsRYLAuVO+Z9mZnRLp1bwdMcyAeWQjUdTsBkPqPrSAiePvexZ/zSKRb 0yUC10OvkKpwCW310t3o/OqaWp9jakFYwAdeVkRV6r6cVuK3T75T++HS59AdgT4Bqdd7 NOwg== X-Gm-Message-State: APt69E049oXK/NU6c788Bgi1nTCC/0am8Xx5tnjK+cVBusDe6xMwg51X 7IdKkdgiYUfjUmtT1l/Tw6VQ6w== X-Received: by 2002:a1c:f014:: with SMTP id a20-v6mr1064767wmb.97.1530697916181; Wed, 04 Jul 2018 02:51:56 -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 125-v6sm6370089wmw.9.2018.07.04.02.51.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 02:51:55 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, alsa-devel@alsa-project.org Date: Wed, 4 Jul 2018 10:49:41 +0100 Message-Id: <20180704094944.16440-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> References: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> Cc: bgoswami@codeaurora.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, Srinivas Kandagatla , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 3/6] ASoC: qdsp6: q6routing: add slim rx routings 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org This patch add routings mixer controls for slim rx ports. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6routing.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index c80fdbc2442e..35269b492761 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -68,6 +68,13 @@ { mix_name, "SEC_MI2S_TX", "SEC_MI2S_TX" }, \ { mix_name, "QUAT_MI2S_TX", "QUAT_MI2S_TX" }, \ { mix_name, "TERT_MI2S_TX", "TERT_MI2S_TX" }, \ + { mix_name, "SLIMBUS_0_TX", "SLIMBUS_0_TX" }, \ + { mix_name, "SLIMBUS_1_TX", "SLIMBUS_1_TX" }, \ + { mix_name, "SLIMBUS_2_TX", "SLIMBUS_2_TX" }, \ + { mix_name, "SLIMBUS_3_TX", "SLIMBUS_3_TX" }, \ + { mix_name, "SLIMBUS_4_TX", "SLIMBUS_4_TX" }, \ + { mix_name, "SLIMBUS_5_TX", "SLIMBUS_5_TX" }, \ + { mix_name, "SLIMBUS_6_TX", "SLIMBUS_6_TX" }, \ { mix_name, "PRIMARY_TDM_TX_0", "PRIMARY_TDM_TX_0"}, \ { mix_name, "PRIMARY_TDM_TX_1", "PRIMARY_TDM_TX_1"}, \ { mix_name, "PRIMARY_TDM_TX_2", "PRIMARY_TDM_TX_2"}, \ @@ -122,6 +129,27 @@ SOC_SINGLE_EXT("QUAT_MI2S_TX", QUATERNARY_MI2S_TX, \ id, 1, 0, msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_0_TX", SLIMBUS_0_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_1_TX", SLIMBUS_1_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_2_TX", SLIMBUS_2_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_3_TX", SLIMBUS_3_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_4_TX", SLIMBUS_4_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_5_TX", SLIMBUS_5_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("SLIMBUS_6_TX", SLIMBUS_6_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ SOC_SINGLE_EXT("PRIMARY_TDM_TX_0", PRIMARY_TDM_TX_0, \ id, 1, 0, msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \ From patchwork Wed Jul 4 09:49:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 141056 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp600875ljj; Wed, 4 Jul 2018 02:52:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd0vWiTonNbpiFiCypz53psHuvQSw4xlB8Un5lL6m/bhEWNyooK5Xn4bKJLe6dBZDKWNdp0 X-Received: by 2002:a1c:99c5:: with SMTP id b188-v6mr1052489wme.15.1530697953793; Wed, 04 Jul 2018 02:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530697953; cv=none; d=google.com; s=arc-20160816; b=CuHhbES+weYcxiPTDURKilYrHUQbLMRhisURpQmPwm2eF5xwSKXJS3DDFc4kT0B7xF EHdLnz5YOPjVE4pNLhbZAcuRP+RuxgoRQwqhYKzs5sEozHspMHnk6nDa9euYFIjKTMza wgltvPazIgNC76WbwDSI/ynxOeycQl7Z+Qvb46tqILXE+CKyZCJpdYP2uaKvuOoM8Hcl 9SCKAmKrgYD9dU9QOraOQE2D+tgh0hLEIUQPLbnjhJ/dTmkKbOZN2JXLHqyhLAphwto9 Ih/7zlxDfgnuxIpc9tPgZ9AkoARTjKWAnIzMh9xYYglftzpjz01h+igKfHWS6nTT0Uv7 9/zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=S2M0YD6IKlZtKCFiXhXadHWSpZG5cLMqg2eoZJlDT78=; b=bRUgSGaKmMorOvUYaolRRx0UqJNIqUbEMXK5YhIQv/+RPNTjbMb+oqXw5C0xDcRgFU 6bOSQejQCGKJab5gbiLuJGpUAzQIovAqoBReIcgfVuZe3M1rJNj0Go1Z/aLIwgx6NX++ jrX52sYarzxAhOkJsAEPydhsYuuyCeQceSuWL0Zv0PP3Sb33YnClTHN+IXYG9ZnnS2pZ gXUZUdJ+kR1WeyH5wLekjJ1FCQ3COwSRla9HBRxaaLq6fh6zsAgMphk8kC/ByuGc7UkZ PCysPLD7Id1+CHMD38cRi4ipakAvGgzdStK73J0jOpXU/wgL+FkBmdZmFGZidgpLZ0Q5 mZAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="NG/Uhmb1"; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id b123-v6si2470048wmb.53.2018.07.04.02.52.33; Wed, 04 Jul 2018 02:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="NG/Uhmb1"; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5910B267783; Wed, 4 Jul 2018 11:52:07 +0200 (CEST) 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 2EFE926773A; Wed, 4 Jul 2018 11:51:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=disabled version=3.4.0 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by alsa0.perex.cz (Postfix) with ESMTP id 945D126772D for ; Wed, 4 Jul 2018 11:51:57 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id j33-v6so4678950wrj.5 for ; Wed, 04 Jul 2018 02:51:57 -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=95o/HT/SaGPK83p31aRyZLuV5q5VAPiiNUedqU0bxEA=; b=NG/Uhmb1VwXf9oil929a35cQ3yRSRxfD61nRbD/Afpe2Ufsvbio5CbiDt36J+sM7PX OmqGt8bvtyBMK/eneniYAQSRaePofypPsAtg0jDCAnAQWHr78yOl7iGVoD56+63BryCr T8e8n342sCHco2cL/8dLHspCj5Vs4E9GY3tSg= 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=95o/HT/SaGPK83p31aRyZLuV5q5VAPiiNUedqU0bxEA=; b=da7E7WWeu5ZH0Hz0jfzY9r2gGDuq/gAn2fSnB/HbEYSiuRMX9ZUj+hDQfg9XoTi8u/ FsHHaYvuSO0/JNWSD+moPjwshaUgqcIsmVd80gpO3Of226Q+SjGw44dZgpn9tUJsYKke A4zie/gG8RBDj+ayDNoKftq6GIrj/jHLacC6d5AKor0yJeU8/yt9MTxEf5LLapZwe2K7 kgoYy4sO+wtTqWNN1kUNVG5l6a3ZuUGsXZy1DMoAR48pUdXmCtFDiQFT3a/UYMm+uoEH XvpQnlAbC7vrKyYdyy22y/CnTwaFOZHKUED49+nThc44eo5SUUBgxEhPggb8Y1enVyNN RULA== X-Gm-Message-State: APt69E1UAPKUruPZxR/UMqcuSGwt+tP42/6TsbWLuskCi6SOAdDYjiCX 2ECn/F0yUd6ij2VxTjiwtpmfIg== X-Received: by 2002:adf:a0f3:: with SMTP id n48-v6mr1114940wrn.23.1530697917108; Wed, 04 Jul 2018 02:51:57 -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 125-v6sm6370089wmw.9.2018.07.04.02.51.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 02:51:56 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, alsa-devel@alsa-project.org Date: Wed, 4 Jul 2018 10:49:42 +0100 Message-Id: <20180704094944.16440-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> References: <20180704094944.16440-1-srinivas.kandagatla@linaro.org> Cc: bgoswami@codeaurora.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, Srinivas Kandagatla , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 4/6] ASoC: qdsp6: q6afe-dai: Do not overwrite slim dai num_channels 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org num_channels for slim dais are aready set int set_channel_map, do not overwrite them in hw_params. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6afe-dai.c | 1 - 1 file changed, 1 deletion(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index 8dd3683eb367..074582afda85 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -81,7 +81,6 @@ static int q6slim_hw_params(struct snd_pcm_substream *substream, struct q6afe_dai_data *dai_data = dev_get_drvdata(dai->dev); struct q6afe_slim_cfg *slim = &dai_data->port_config[dai->id].slim; - slim->num_channels = params_channels(params); slim->sample_rate = params_rate(params); switch (params_format(params)) {