From patchwork Mon Mar 15 20:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 400636 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85EB1C433E9 for ; Mon, 15 Mar 2021 20:40:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F6B364F51 for ; Mon, 15 Mar 2021 20:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233075AbhCOUj5 (ORCPT ); Mon, 15 Mar 2021 16:39:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232653AbhCOUji (ORCPT ); Mon, 15 Mar 2021 16:39:38 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD131C061762 for ; Mon, 15 Mar 2021 13:39:38 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id 205so4190180pgh.9 for ; Mon, 15 Mar 2021 13:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZtuGwStEOfXvAgfVL0zHoimqZC57wamAhyfZnTL94Fc=; b=PE6NXZMcKTGVLi5ke8/puqqxCZVv50qW0kFzPJ1iH6iTfX4TXLq5DpJD+D9+tbfYT+ GJ3eFb/0VXeZX38s5Z0EmGGA+7owM7663eyRGGBTZ7uKBbrFHgjX1+WgbHlEs86sA9Vj lRtBpe2Uf5LIXdwILbfzYOLyjtxAAWqnSkbL4= 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:mime-version :content-transfer-encoding; bh=ZtuGwStEOfXvAgfVL0zHoimqZC57wamAhyfZnTL94Fc=; b=W+pgESTH0+9iD7o00Ie6ycX4pYYY6bs6PTc9tZEtjd7Tgg5O0XCFdvtmWK5bNeHiXp UevQNNh/XR8SQAKSFpd8lguheVTy3UNPnkhCIzDk/dRydYPQ8u+Ddtv1LxDG9QFfL8+i tioNfj2bT6UNyAZZQykPL1craighhO4GKCF0okssGWuzKIhGQAx9khcG4mXFwdbH6t3u 2npCqWSOWGvgId6m42JRedNX18nyo2J41CunA87zgWIoE70fd60W6qqgzshjnT6JgcKk jVW4cFJ2mwCA327i6EzSNoQzcgV58SwCpSbJCKxdZhSB66ExWwfHfxsz+DuNiHgYYUUh ZBDQ== X-Gm-Message-State: AOAM530qgvuEW0zi9fAbhsjunaiA3KbtKNPj9iTvk2ZUl0rL5yE2CgS/ h03Uyq0GhqseOq9E/Z9Owf0Eeg== X-Google-Smtp-Source: ABdhPJw/eSfGAWemEM9omD6B7IpcXhOOIZi9CtYkk6oEd1PXAInWviC8YHwGdm9aj6tjL3botHBZaQ== X-Received: by 2002:a63:4848:: with SMTP id x8mr728983pgk.447.1615840778175; Mon, 15 Mar 2021 13:39:38 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:14ce:2d12:6a1f:f42]) by smtp.gmail.com with ESMTPSA id bb24sm510619pjb.5.2021.03.15.13.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 13:39:37 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson Cc: Douglas Anderson , Srinivasa Rao Mandadapu , Ajit Pandey , Judy Hsiao , Cheng-Yi Chiang , Stephen Boyd , Matthias Kaehlcke , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] arm64: dts: qcom: Add "dmic_clk_en" for sc7180-trogdor-coachz Date: Mon, 15 Mar 2021 13:39:30 -0700 Message-Id: <20210315133924.v2.1.I601a051cad7cfd0923e55b69ef7e5748910a6096@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This was present downstream. Add upstream too. NOTE: upstream I managed to get some sort of halfway state and got one pinctrl entry in the coachz-r1 device tree. Remove that as part of this since it's now in the dtsi. Cc: Srinivasa Rao Mandadapu Cc: Ajit Pandey Cc: Judy Hsiao Cc: Cheng-Yi Chiang Cc: Stephen Boyd Cc: Matthias Kaehlcke Signed-off-by: Douglas Anderson Reviewed-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd --- This applies atop the patch ("arm64: dts: qcom: Add sound node for sc7180-trogdor-coachz") [1]. NOTE: downstream this property was present in each of the board revisions. There's actually no longer any reason for this and I'll shortly post a downstream patch to fix this. [1] https://lore.kernel.org/r/20210313054654.11693-3-srivasam@codeaurora.org/ Changes in v2: - Remove the pinctrl from the -r1 .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 13 ------------- .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts index 86619f6c1134..1b1dbdb2a82f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -138,17 +138,4 @@ &tlmm { "AP_TS_PEN_I2C_SCL", "DP_HOT_PLUG_DET", "EC_IN_RW_ODL"; - - dmic_clk_en: dmic_clk_en { - pinmux { - pins = "gpio83"; - function = "gpio"; - }; - - pinconf { - pins = "gpio83"; - drive-strength = <8>; - bias-pull-up; - }; - }; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index e2ffe71c2d52..4c6e433c8226 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -93,6 +93,9 @@ &sound { compatible = "google,sc7180-coachz"; model = "sc7180-adau7002-max98357a"; audio-routing = "PDM_DAT", "DMIC"; + + pinctrl-names = "default"; + pinctrl-0 = <&dmic_clk_en>; }; &sound_multimedia0_codec { @@ -247,4 +250,17 @@ &tlmm { "AP_TS_PEN_I2C_SCL", "DP_HOT_PLUG_DET", "EC_IN_RW_ODL"; + + dmic_clk_en: dmic_clk_en { + pinmux { + pins = "gpio83"; + function = "gpio"; + }; + + pinconf { + pins = "gpio83"; + drive-strength = <8>; + bias-pull-up; + }; + }; }; From patchwork Mon Mar 15 20:39:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 401909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5347AC433E0 for ; Mon, 15 Mar 2021 20:40:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E1CB64F26 for ; Mon, 15 Mar 2021 20:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231810AbhCOUj6 (ORCPT ); Mon, 15 Mar 2021 16:39:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232692AbhCOUjk (ORCPT ); Mon, 15 Mar 2021 16:39:40 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61026C06174A for ; Mon, 15 Mar 2021 13:39:40 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id kr3-20020a17090b4903b02900c096fc01deso215037pjb.4 for ; Mon, 15 Mar 2021 13:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dO0IpY4eNf90HXjdWjmKTVkYdLkZaDxwV02yAEYmvs0=; b=EHBh/IIvcyAmVR2clNnd1OoJKlhkoZh/7PoomhbR0cM8OiqY+L1gYfrYT6zIgWHUWb x+QejVdG6nDz+PbeNjYg0MtMIms+/ysrG1CQdX4xqSR/TdKFWkpd2TQBWI2FryUmCT6G 62YYgFf/E+4O3r5M+kIPyEDeojwRw5xNoyD6E= 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:mime-version:content-transfer-encoding; bh=dO0IpY4eNf90HXjdWjmKTVkYdLkZaDxwV02yAEYmvs0=; b=I7LkSmATt6m6AZ/kVsBtm/vTOccfAwUwBa1PPxNJGl7bC6/hwz8Pb5ICzSc2SpBntM Ad7J10YgedJFeAj39RO9sY5Trp8W48rGZNVUqotN8RqeoCmksX77TDMDeko1mv3Hk4vu Pj2yB8QQF+IIQRo8rmlvmNSKugQFopRlAUVL81nwBj8HRWmV/gSWZxVYc/4bfenlSVdM yEWHdHwjAr2bJr14+8hw8qvOwW6FDkUftjybGQxAGtUCl2Zeq3K+A/88pfq3xCySZOZ4 AX2QRHlPCadiovklNjMepHNd1CVyubCCl20H9uDMjsQap3e3UbvHpcqBUDeZepAHvKIt pd+g== X-Gm-Message-State: AOAM5334YYdxnW3KB5BAJF/qSoMDh5L0WsP/OXfMnsHsoHus0BmG/n07 gnjFKDIN2v2gkkojmT45jLgavw== X-Google-Smtp-Source: ABdhPJxMRTNLkPsulbJ8SSe7uQCh5WZJ6jghJu9UWXiC6Pw8T5ormTtJMtnn1YQj+58FQfI78d5vEg== X-Received: by 2002:a17:903:3053:b029:e6:5cde:bef with SMTP id u19-20020a1709033053b02900e65cde0befmr13068425pla.81.1615840780021; Mon, 15 Mar 2021 13:39:40 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:14ce:2d12:6a1f:f42]) by smtp.gmail.com with ESMTPSA id bb24sm510619pjb.5.2021.03.15.13.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 13:39:39 -0700 (PDT) From: Douglas Anderson To: Bjorn Andersson Cc: Douglas Anderson , Srinivasa Rao Mandadapu , Ajit Pandey , Judy Hsiao , Cheng-Yi Chiang , Stephen Boyd , Matthias Kaehlcke , Andy Gross , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] arm64: dts: qcom: Add "dmic_clk_en" + sound model for sc7180-trogdor-pompom Date: Mon, 15 Mar 2021 13:39:31 -0700 Message-Id: <20210315133924.v2.2.If218189eff613a6c48ba12d75fad992377d8f181@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210315133924.v2.1.I601a051cad7cfd0923e55b69ef7e5748910a6096@changeid> References: <20210315133924.v2.1.I601a051cad7cfd0923e55b69ef7e5748910a6096@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Match what's downstream for this board. Cc: Srinivasa Rao Mandadapu Cc: Ajit Pandey Cc: Judy Hsiao Cc: Cheng-Yi Chiang Cc: Stephen Boyd Cc: Matthias Kaehlcke Signed-off-by: Douglas Anderson Reviewed-by: Stephen Boyd --- This applies atop the patch (arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for I2S driver") [1]. [1] https://lore.kernel.org/r/20210313054654.11693-2-srivasam@codeaurora.org/ (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index d253a08f6fc8..622b5f1b88a2 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -139,6 +139,13 @@ &sdhc_2 { status = "okay"; }; +&sound { + model = "sc7180-rt5682-max98357a-2mic"; + pinctrl-names = "default"; + pinctrl-0 = <&dmic_sel>; + dmic-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>; +}; + &usb_c1 { status = "disabled"; };