From patchwork Wed Jun 22 06:47:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yassine Oudjana X-Patchwork-Id: 584688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAC51C43334 for ; Wed, 22 Jun 2022 06:50:04 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B64401F75; Wed, 22 Jun 2022 08:49:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B64401F75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1655880602; bh=OLDDQMcvApw3hT2LPAmgUVlZE9nf1uUKfS4zYn/T9Lk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=gMipoMIeGrWTbs8jxgXi0xgoFyzd60+/38Yl/NKxlDi+5LUJZNLcJSrdHRq3vl9ci F6j0ZEiEuMmDPiZSLAremUL+S+aD3VubJ20ekIjYzuRbjTs2Vjp6nh2biy9d/vBb/Z 0bi7AJ3ebVLXODZVfZJGGG3XObqi6TkpYh5tiTGk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 37CFAF80535; Wed, 22 Jun 2022 08:48:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EC52DF80535; Wed, 22 Jun 2022 08:48:44 +0200 (CEST) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C721DF800CB for ; Wed, 22 Jun 2022 08:48:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C721DF800CB Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VkjSZU+Z" Received: by mail-ej1-x634.google.com with SMTP id sb34so3041516ejc.11 for ; Tue, 21 Jun 2022 23:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u1eiPXpTeoJ4YK94xfC/4guXF7vZMwFhVUYu4kxiL+k=; b=VkjSZU+ZIalRBcg/aY9otvwjSGkG2louwosC9Z+WhTggAKAhLVvFnMb0KoB2qHcTjY B8flVc+KaVrqbbt153meF3pQFHuk6BnzUnvMPdFDzVnO97+3OcLPM5ird6+oXmE2SF4B MfIDi1MJj6n5DUGRPMiQGJGyU7QW15JmEI5jhld3HM/sRkORe/9MHUok7oxoePxGP5Y2 KkihqCGzT/yc2rhIQaaCT5IxizmniMdASV7EZSOXM6VeY+nhkrK5X+A7L13kmX+O/jVx caAxD8GeETvoeM26zApSyBXcrMAAyWDzn8vvnJYJwyM999MPX5m4/CP5p0BNsi6lP5Fl okDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u1eiPXpTeoJ4YK94xfC/4guXF7vZMwFhVUYu4kxiL+k=; b=CwogODx5bykvzgOpmBmn1EW90AxyqPK31ZFfTS30BDC/UXiT1GrPoRBLnOQJH1NSu8 AP8koL1yMChk8dG7rM1zLBP5AOL+4O0li5iVJSSgQpNk9H8VIcmTkDbVgbaoPX+aXUr5 V4au8b6hwecwIjYQzb1NqBIxzonOlnzAjfMD9cZ3W0kax01yX/5gBn2TkzxgqC6YLZEj vIgYwk6RV7uB5t0sHIj+Iz8vPwo9fRov81BZbPM7+oeSAUJVZ79RKFxa50IbPMFwyHLt xG1NgJTcITsVFKhEABD6Zfqm4QW2c+mPaMrkDQNLCjlyxMGLEcuo84arQ7UqNneeHD83 PkIg== X-Gm-Message-State: AJIora87vB87b/9v/Vlc3f5dZZgjtVZeid+PVR237awdE73mtO5h0Qp0 IY4KDMdQoV6Kgq7EIpwpJGs= X-Google-Smtp-Source: AGRyM1vA2jfPhbVXwp0p2yLq5X8upNLnqULE7yWgNJaNCX+6/OXo9Ji5EpptSNXb6UAFCZV2uzeHzg== X-Received: by 2002:a17:907:1c1a:b0:705:3158:ab07 with SMTP id nc26-20020a1709071c1a00b007053158ab07mr1660279ejc.767.1655880515522; Tue, 21 Jun 2022 23:48:35 -0700 (PDT) Received: from localhost.localdomain ([185.107.95.225]) by smtp.gmail.com with ESMTPSA id sd12-20020a1709076e0c00b00722e8c47cc9sm1197148ejc.181.2022.06.21.23.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:48:33 -0700 (PDT) From: Yassine Oudjana X-Google-Original-From: Yassine Oudjana To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 1/3] ASoC: dt-bindings: Add bindings for WCD9335 DAIs Date: Wed, 22 Jun 2022 10:47:56 +0400 Message-Id: <20220622064758.40543-2-y.oudjana@protonmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220622064758.40543-1-y.oudjana@protonmail.com> References: <20220622064758.40543-1-y.oudjana@protonmail.com> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Yassine Oudjana , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Yassine Oudjana , phone-devel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Yassine Oudjana Add bindings for the DAIs available in WCD9335 to avoid having to use unclear number indices in device trees. Signed-off-by: Yassine Oudjana --- MAINTAINERS | 1 + include/dt-bindings/sound/qcom,wcd9335.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 include/dt-bindings/sound/qcom,wcd9335.h diff --git a/MAINTAINERS b/MAINTAINERS index b774f21828f7..2bcc3cc129c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16366,6 +16366,7 @@ M: Srinivas Kandagatla M: Banajit Goswami L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported +F: include/dt-bindings/sound/qcom,wcd9335.h F: sound/soc/codecs/lpass-va-macro.c F: sound/soc/codecs/lpass-wsa-macro.* F: sound/soc/codecs/msm8916-wcd-analog.c diff --git a/include/dt-bindings/sound/qcom,wcd9335.h b/include/dt-bindings/sound/qcom,wcd9335.h new file mode 100644 index 000000000000..709d33ca748d --- /dev/null +++ b/include/dt-bindings/sound/qcom,wcd9335.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef __DT_QCOM_WCD9335_H +#define __DT_QCOM_WCD9335_H + +#define AIF1_PB 0 +#define AIF1_CAP 1 +#define AIF2_PB 2 +#define AIF2_CAP 3 +#define AIF3_PB 4 +#define AIF3_CAP 5 +#define AIF4_PB 6 +#define NUM_CODEC_DAIS 7 + +#endif From patchwork Wed Jun 22 06:47:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yassine Oudjana X-Patchwork-Id: 584687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E82F7C433EF for ; Wed, 22 Jun 2022 06:50:22 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3280B1F9C; Wed, 22 Jun 2022 08:49:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3280B1F9C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1655880621; bh=ew9/y6Zbzk8IV+ephSnSvN3ztkmlhonfvEZg1Pybg/M=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=i5D3ht+fBZ6N3ZdJDpurYANvxoefZ9bI3XyUyMsbrZozXeXh98Uf05x+2+4i5zRrZ kxS/b9i8nirVC/u91gHEt97RoPrhxxWsndE9/XHpKAnSZGS6n2oXrHvdWyr3yuAohO 16Q1zh4vaJbdA8G/JB3OZsGlov/Dm5acxDx+oNcg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C7375F8053D; Wed, 22 Jun 2022 08:48:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5AD9EF8053E; Wed, 22 Jun 2022 08:48:57 +0200 (CEST) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BABE2F80538 for ; Wed, 22 Jun 2022 08:48:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BABE2F80538 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EUth92aS" Received: by mail-ej1-x62a.google.com with SMTP id u15so4429419ejc.10 for ; Tue, 21 Jun 2022 23:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GBoEfewX7uE5qiTFF5ceaeSxviE76/D0VbXLBnCtMOk=; b=EUth92aS+ARXNsUtB82Fn+0F0yahSJwW0aRp3pWoXXG95IKw1RArK9Ig7q3Rce1Ehw IB9YD315FvrufeFHauaTVDmyU561dpJJXVoxeP+YEOqYEB0GnwGjYYtO1LZlK0o6QfsS BWFYFQiQlRYg0TliVlsC5C5feb19tNjrrKtR8kj8DM6+fCRVWi11MZKCMVbP+keN1pSk Y1EH0SW0kUa5wZx/+ZvoXeYEPP577kv00tMCUDJ/q/mSmcBZtgAtalgDCO97V29+FF0L wIqsPe04Qtlfs5uOqGtzgmol7qNeUSdazWS2kf76TziOEgPdeiTWHQ3efBkkbD6pe2Jo fq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GBoEfewX7uE5qiTFF5ceaeSxviE76/D0VbXLBnCtMOk=; b=wQFEu4IC3qiRIzUCoKeDX3MvUOCIgrBZjfv/T0XbsygyhRHHPWW8B2L/0I53Z9NDWA JTSWRSp+Q5uQl634P+hC1LzJgyTOQZ4dEQ/l/9meWDT+kHchZp5PY4HkzOX7IOsG2AiS rB3LHHHj1Qb0aAtbnS4wYgJ3pPI5dg0DnslBgahIZh5bJMGV45rB6LCPT9qFN/4QNleJ 2djRHB3mT7j7Ojo1wHQ8MpfZ2u6ab2z8XzNVDpNfa1RFEBDS2u/UpScbsIj2wkZVAXnf ujrIfJOar5JxIJZuU/GHLxA5V8Lkioa2l0Evar2PN7UoBA+kE7VuY5U/LxLhtnmEedUS wvGQ== X-Gm-Message-State: AJIora8ksEWXt1PqWJ6hJpLtwjvaNlyumW9I2LPGcQX4YbJeiQqpXObv qBOSvr/zYb3C+2eKCBKN1/c= X-Google-Smtp-Source: AGRyM1vWBsfxuaNlo0tjKP0/6jEDWmmlRypkx4HG/8dsYU+wsKOh1CtyzxerPhaniyY/3W5GIrXT8A== X-Received: by 2002:a17:906:6a27:b0:708:1282:cbe9 with SMTP id qw39-20020a1709066a2700b007081282cbe9mr1767404ejc.186.1655880528800; Tue, 21 Jun 2022 23:48:48 -0700 (PDT) Received: from localhost.localdomain ([185.107.95.225]) by smtp.gmail.com with ESMTPSA id sd12-20020a1709076e0c00b00722e8c47cc9sm1197148ejc.181.2022.06.21.23.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 23:48:47 -0700 (PDT) From: Yassine Oudjana X-Google-Original-From: Yassine Oudjana To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 3/3] arm64: dts: qcom: Use WCD9335 DT bindings Date: Wed, 22 Jun 2022 10:47:58 +0400 Message-Id: <20220622064758.40543-4-y.oudjana@protonmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220622064758.40543-1-y.oudjana@protonmail.com> References: <20220622064758.40543-1-y.oudjana@protonmail.com> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Yassine Oudjana , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Yassine Oudjana , phone-devel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Yassine Oudjana Replace DAI indices in codec nodes with definitions from the WCD9335 DT bindings for devices that use WCD9335. Signed-off-by: Yassine Oudjana --- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 5 +++-- arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 5 +++-- arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts index 49afbb1a066a..ff915cd8e5a6 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts @@ -13,6 +13,7 @@ #include #include #include +#include /* * GPIO name legend: proper name = the GPIO line is used as GPIO @@ -1009,7 +1010,7 @@ platform { }; codec { - sound-dai = <&wcd9335 6>; + sound-dai = <&wcd9335 AIF4_PB>; }; }; @@ -1024,7 +1025,7 @@ platform { }; codec { - sound-dai = <&wcd9335 1>; + sound-dai = <&wcd9335 AIF1_CAP>; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts index 22978d06f85b..261f2ea7def0 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts @@ -9,6 +9,7 @@ #include #include #include +#include / { model = "Xiaomi Mi 5"; @@ -193,7 +194,7 @@ platform { }; codec { - sound-dai = <&wcd9335 6>; + sound-dai = <&wcd9335 AIF4_PB>; }; }; @@ -208,7 +209,7 @@ platform { }; codec { - sound-dai = <&wcd9335 1>; + sound-dai = <&wcd9335 AIF1_CAP>; }; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts index 1e2dd6763ad1..c9f935cfb587 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts @@ -9,6 +9,7 @@ #include "pmi8996.dtsi" #include #include +#include / { model = "Xiaomi Mi Note 2"; @@ -171,7 +172,7 @@ platform { }; codec { - sound-dai = <&wcd9335 6>; + sound-dai = <&wcd9335 AIF4_PB>; }; }; @@ -186,7 +187,7 @@ platform { }; codec { - sound-dai = <&wcd9335 1>; + sound-dai = <&wcd9335 AIF1_CAP>; }; }; };