From patchwork Fri Sep 30 15:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12995673 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3F892C433FE for ; Fri, 30 Sep 2022 15:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Jd4v+cGVHie+5F1/pVqaJiPAk50hMtSljsjswJQMAz8=; b=0c+/WqfY4Eq4Ei hCj5baDPEPF03ShfO0gkHzREcftxVeNYlBIalExSCYoHPDvsXpQwD+4ciZinI78hh7P1mdPA0xT4r u4WyTapO5Yet6cJ4WaAw+qG7NC1JeVq8YWDnAAYz/w+1GBF95XpHZvwfQdjP5eXiR6LNsgQxwhQMP +BFDtifQLYnZe3TkWbsj4i0ID/u9klCXRcLhiCQ+STfWv5/aAc9Lm82VBor80rCdtppocg0ltjggf dPVGM3u5UZ3dnhQJGT7TgsXK3rzch6WwRnu8jbrHm30xvKPfJCsqGgte+BI9shzXbIVNhRqZpm2PA AUiqrndCu87j3+QTq56Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI4h-00AGZh-Ad; Fri, 30 Sep 2022 15:37:15 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI4T-00AGTB-0h for linux-arm-kernel@lists.infradead.org; Fri, 30 Sep 2022 15:37:02 +0000 Received: by mail-pf1-x42f.google.com with SMTP id w2so4593688pfb.0 for ; Fri, 30 Sep 2022 08:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=ZxqNeg9qYIg+s4/UlajiiC5HVdIkGrA2Kg81oKMQ+/o=; b=ksNJeksNLwIY/rpd0fWUf+Te+/bxcrN2bGCTzVlMyb9TRGW7RUmlnW1iEfp/ckw4+8 QvHwtMC8jkc3hPnu2xaan5dRgwCXJ+tk4Ea75d+59X7D1J1SSPh0WeZCP3OJkcPoFmSW gX/Srdo/WYMBb7jFFe0ZJI+sTRQU390yexSqw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ZxqNeg9qYIg+s4/UlajiiC5HVdIkGrA2Kg81oKMQ+/o=; b=yv1JNEdAzQOQ4AxPU6XCwlWKeuyc36pWB/yqGD87b6/IVyllq8BX4iR4GjetcXOmvY qJWGi4Vg+kS40woPI117ILTEocUr17aBMotqugfpswA0tk7ExLNchHmhOMgBhg7EIai7 hWQeEidhi/QTGB9mGhycDSvK859WPzsBvJs2dKOJOY9A5/9x0jfNs0uv/IbxK5tzN7Wh XGuphsJF/fplmiE5hs+vGeTEFyUINnp7uNqxdT0Sswb/1UqbR/evTMiqdWLBee+MvC+Y mdrNJJHU42UV11WNpO31/TQpOFd32PLXVoAjI2LvBcz42rqiHT4ACu5Ae32V/AgqH3b6 u1kw== X-Gm-Message-State: ACrzQf0YJnOI7kDsj/aqT7nven6rw1SwAnVylUozGCSNjIudqVrhWhuF DpNHS3aA0k67q3XCyADeArbRlA== X-Google-Smtp-Source: AMsMyM5eTepICctmAmSn5g9cc4mggiq9B3ai+b4KcYpc4PM9p2a6gM05xb08V4IprjyxdJqwyiyhJw== X-Received: by 2002:a63:24d:0:b0:439:3804:d0ff with SMTP id 74-20020a63024d000000b004393804d0ffmr8091351pgc.414.1664552216064; Fri, 30 Sep 2022 08:36:56 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id s13-20020a170902ea0d00b0016d72804664sm2025155plg.205.2022.09.30.08.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:36:55 -0700 (PDT) From: Judy Hsiao To: andersson@kernel.org Cc: Andy Gross , Rob Herring , Srini Kandagatla , dianders@chromium.org, mka@chromium.org, cychiang@google.com, judyhsiao@google.com, swboyd@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v5 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Date: Fri, 30 Sep 2022 15:36:41 +0000 Message-Id: <20220930153643.2018907-2-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20220930153643.2018907-1-judyhsiao@chromium.org> References: <20220930153643.2018907-1-judyhsiao@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220930_083701_066160_753CE859 X-CRM114-Status: UNSURE ( 9.42 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 1. Add drive strength property for mi2s1 on sc7280 based platforms. 2. Disable the pull-up for mi2s1 lines. Signed-off-by: Judy Hsiao Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi index c11e37160f34..83a42a77121c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -639,6 +639,36 @@ &dp_hot_plug_det { bias-disable; }; +&mi2s1_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength = <6>; + bias-disable; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength = <2>; From patchwork Fri Sep 30 15:36:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12995674 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 5D624C433F5 for ; Fri, 30 Sep 2022 15:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cXaIR95Kd2VaUhBFaqDGEqVEGPSd4h5KPXsbxp+qc3k=; b=oejLeHTLQVe4Tu j6PL2AXuDhFbKjTe3B6ZYBT6IB1vB8tb3EOsETQ+r35A+FVG2swYwfkY9gYfPksS6A/kummZCh4Ce JeiaA5/H6NiLf/BSb8ggNx/SDBYGoKSUk7znOLYRol4aM/grRqxKwccnhsAXLBvNm8zhqRBXszw9a XgFioUAon04hSRUzmJ/K5ln7wOHWo1J4f8BllK8+/TzNXkGsguSia95soSSuVkhjjjjHwALYZ1jqB eIzSA06UpppKhCN2kp3/eJh9QoG8AOJjh3U7qIM+9u9T6a0tem8CFj8J3OP5AnhzKj6IyICmtrYNM zLdg/8nA9wdSOADbADmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI4r-00AGdR-My; Fri, 30 Sep 2022 15:37:25 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI4Z-00AGWs-Qi for linux-arm-kernel@lists.infradead.org; Fri, 30 Sep 2022 15:37:09 +0000 Received: by mail-pf1-x436.google.com with SMTP id c198so4550159pfc.13 for ; Fri, 30 Sep 2022 08:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=JHh+MG4OU/+wjbCiWOKQq0gX7ZmA4UN476SmJdYV9kg=; b=AqEWNyRRJ8zAZyVB4WTwuL54Ue4AJ6qC7q3VmMAchIzDuHLFWsLbGkSZHdWg3rDd93 l6as77BhPDwxCUV4z7DCjpos+l9s3SCKsh6Jve6sxkPFeCUMI10xExTk7+osJ6JowVot 6p1LeHdvXv86KbXHkTgMmA4OHbi0hE5jlF1F8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=JHh+MG4OU/+wjbCiWOKQq0gX7ZmA4UN476SmJdYV9kg=; b=f9fYyt3jA+VuGEcLAUZHFkI7y5N0mPJV3Wo9oIdI9O35K5LkHKrYGaK8mee2yhhqmR 6FdyD0kdq1AhC/Od3HDgUGksAV+w+Z6z/bsqbbLHbQO+TNE+0jhjri+wKBWqBLneZOqu TJmtYhs4GZZvGEJc2SL2cAaUXhVp+s2EzlrkDBRPr4SOrMrj3P5ZF8xbD9TnEKB9OEmc EWY1pzmfQ1LHzQr07F+LqSzzibCXN7K3tmXtaC684m7ityhPK7QHNwNoSSfMxw8eO3wv LAlFpqJDC7aoYWUWNzgi3ZXjnUiXd9sAzSvr3Y5lxNY/5FoPfFx8AuAcfDlUZRFlwSdU Sn9Q== X-Gm-Message-State: ACrzQf1SMul2WAki7f276qfEJS/IZ+3AHOHNCrOfwDX4oNZtc6mx73rC DjXCIXbdxgWJyv5dVug3UIwxVw== X-Google-Smtp-Source: AMsMyM7yty99NK9WhS4hbzjggq6Oxx/bwl4htrPKe8na+7T785E7yRYHOofm3EoBOZkSg+ZQ4IEuMA== X-Received: by 2002:a63:ed07:0:b0:442:87:3a38 with SMTP id d7-20020a63ed07000000b0044200873a38mr2980570pgi.216.1664552225256; Fri, 30 Sep 2022 08:37:05 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id s13-20020a170902ea0d00b0016d72804664sm2025155plg.205.2022.09.30.08.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:37:04 -0700 (PDT) From: Judy Hsiao To: andersson@kernel.org Cc: Andy Gross , Rob Herring , Srini Kandagatla , dianders@chromium.org, mka@chromium.org, cychiang@google.com, judyhsiao@google.com, swboyd@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v5 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Date: Fri, 30 Sep 2022 15:36:42 +0000 Message-Id: <20220930153643.2018907-3-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20220930153643.2018907-1-judyhsiao@chromium.org> References: <20220930153643.2018907-1-judyhsiao@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220930_083707_875213_ED0A90EA X-CRM114-Status: GOOD ( 14.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Audio dtsi for sc7280 boards that using rt5682 headset codec: 1. Add dt nodes for sound card which use I2S playback and record through rt5682s and I2S playback through max98357a. 2. Enable lpass cpu node and add pin control and dai-links. Signed-off-by: Judy Hsiao Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- .../qcom/sc7280-herobrine-audio-rt5682.dtsi | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi new file mode 100644 index 000000000000..2dbdeeb29ece --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * + * This file defines the common audio settings for the child boards + * using rt5682 codec. + * + * Copyright 2022 Google LLC. + */ + +/ { + /* BOARD-SPECIFIC TOP LEVEL NODES */ + sound: sound { + compatible = "google,sc7280-herobrine"; + model = "sc7280-rt5682-max98360a-1mic"; + + status = "okay"; + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + link-name = "MAX98360"; + reg = <0>; + + cpu { + sound-dai = <&lpass_cpu MI2S_SECONDARY>; + }; + + codec { + sound-dai = <&max98360a>; + }; + }; + + dai-link@1 { + link-name = "ALC5682"; + reg = <1>; + + cpu { + sound-dai = <&lpass_cpu MI2S_PRIMARY>; + }; + + codec { + sound-dai = <&alc5682 0 /* aif1 */>; + }; + }; + }; +}; + +hp_i2c: &i2c2 { + status = "okay"; + clock-frequency = <400000>; + + alc5682: codec@1a { + compatible = "realtek,rt5682s"; + reg = <0x1a>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_irq>; + + #sound-dai-cells = <1>; + + interrupt-parent = <&tlmm>; + interrupts = <101 IRQ_TYPE_EDGE_BOTH>; + + AVDD-supply = <&pp1800_alc5682>; + MICVDD-supply = <&pp3300_codec>; + + realtek,dmic1-data-pin = <1>; + realtek,dmic1-clk-pin = <2>; + realtek,jd-src = <1>; + realtek,dmic-clk-rate-hz = <2048000>; + }; +}; + +&lpass_cpu { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&mi2s0_data0>, <&mi2s0_data1>, <&mi2s0_mclk>, <&mi2s0_sclk>, <&mi2s0_ws>, + <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = ; + qcom,playback-sd-lines = <1>; + qcom,capture-sd-lines = <0>; + }; + + dai-link@1 { + reg = ; + qcom,playback-sd-lines = <0>; + }; +}; + +&mi2s0_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_data1 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_mclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s0_ws { + drive-strength = <6>; + bias-disable; +}; From patchwork Fri Sep 30 15:36:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12995675 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 86977C433FE for ; Fri, 30 Sep 2022 15:38:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Jo8lTF2+JLHoJi5HbzFkWXT43Wjm9o30j3ae+0cNzj8=; b=Upm9J4dFgi9zMh N5mWeLUVEDD7vqgBnrS2o+fQvoOLFemKf6gV2wNsEPEBdj0WcCuM5Z2j+Edd9G4T7XiODGTtV5Ayn zNWHxDTJzP7TLToXX9M/yrzFhpE/+JNBMxgshy6NeuN61VGgV8uw9e9ZETksPmHUcilDe30ho2AQ7 7IZ949UwivN6hqZVIJqOQRpCjmA8Gua8PpsulYS9z0UGHXLhNXUf9akke9xtqQbQojHC3+boy4Fzq fRm77YuDdCJbsCt29EJjvduMpwg0orQBTmUGfS2ymOSIWsUDI/PlgQ1wX7ROk+kpknNeFESDjTeQp XHSvcPqut/8U/RoJJ44Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI55-00AGiw-GW; Fri, 30 Sep 2022 15:37:39 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oeI4g-00AGYd-9r for linux-arm-kernel@lists.infradead.org; Fri, 30 Sep 2022 15:37:15 +0000 Received: by mail-pg1-x535.google.com with SMTP id u69so4497828pgd.2 for ; Fri, 30 Sep 2022 08:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=LPYKbguZc/KYKDAy5XVdCd4nJdkVt/SEkrsrImBpX8M=; b=Zd63G6ZoUfHEDbwl6sw1tUXxxGRU0nsMethkFkh2p6u11xvZK5YcA30HkTDpWSdI1j AzlRC8NZcnJzHUtN99ukkaiwGXLlbc8TJRM+cHxlAa6pqU+sPGwNWI4jO58hmUXdLrVI 1C2vzo6IJReqnM8mMd+EBoGgesWJ9toi5HNhM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=LPYKbguZc/KYKDAy5XVdCd4nJdkVt/SEkrsrImBpX8M=; b=nLCYaR2H7Efld7ERSXUILG+CK5haXgQqTXhS2uGKJx1JqaAtM6REJGHtOLHz5bTko3 eJUfp70lsJQ7yE1eQ8mMLFdJqzwBC2xHzFEK3TR9lYurLKz4Hlj/0fpQDUKR8hKdZBM/ ROaRywCJaEMEqoPqNjcGPlz9Bk9y4SQTQVhIpcdHh6Gd/N+krGtsuxddzWlX9wMtP8KF +7EEdB+TO2IANofatgJguIJ/VyGRR+6uF1omC+fVTBHokgMmpwAFxUvoz3RDfiEuUrQO p5JkTdssZWQWiwYHZTIVfZwzxo2LqyRBdu5Y63GbsGqhckXnvmLB28NMfW+J9fEHDFuE V0Sw== X-Gm-Message-State: ACrzQf31el0Bc05eZhdlOhbBbac5kyo3TaUEZ/XgB/LgluIjkROI3mUk los3hEsoWlis+Nm8eX0BD5ApbA== X-Google-Smtp-Source: AMsMyM6xqal4/XOJLMBHQ9YrEG3UfneC0sz6YuMsdGK7ZXSUAgOfMfhQ9Ij8VoFNM1z75MU8PkTV+Q== X-Received: by 2002:a63:5a63:0:b0:42f:e143:80d4 with SMTP id k35-20020a635a63000000b0042fe14380d4mr8215769pgm.456.1664552231662; Fri, 30 Sep 2022 08:37:11 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id s13-20020a170902ea0d00b0016d72804664sm2025155plg.205.2022.09.30.08.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:37:11 -0700 (PDT) From: Judy Hsiao To: andersson@kernel.org Cc: Andy Gross , Rob Herring , Srini Kandagatla , dianders@chromium.org, mka@chromium.org, cychiang@google.com, judyhsiao@google.com, swboyd@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v5 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 and villager-r0 Date: Fri, 30 Sep 2022 15:36:43 +0000 Message-Id: <20220930153643.2018907-4-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20220930153643.2018907-1-judyhsiao@chromium.org> References: <20220930153643.2018907-1-judyhsiao@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220930_083714_350448_18759C92 X-CRM114-Status: GOOD ( 10.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 and villager-r0 as they use rt5682 codec. Signed-off-by: Judy Hsiao Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts index c1a671968725..c569d7a5edb7 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -9,6 +9,7 @@ #include "sc7280-herobrine.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" / { model = "Google Herobrine (rev1+)"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts index 73e24cc55a09..31a57ae5af57 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts @@ -9,6 +9,7 @@ #include "sc7280-herobrine-villager.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" / { model = "Google Villager (rev0)";