From patchwork Tue Dec 1 15:37:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 335132 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp212598ilb; Tue, 1 Dec 2020 07:39:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfavmg3NckphFLniUNdKUBY6qBoT2TVZ/jJeo0TlqKeDUI+S1wIqPws76+rQ8mcUVn9Toy X-Received: by 2002:a05:6402:559:: with SMTP id i25mr3659524edx.128.1606837192542; Tue, 01 Dec 2020 07:39:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606837192; cv=none; d=google.com; s=arc-20160816; b=RwW4/SWlHtn3vmUzsGO4bXHj1+5hqlxY5AT1W5W5k5buYYECOXKiXsyF5GSCU11pGh okYQX7chQ1X6fdAJ2HeGlIRMNznGZJPV28ofws4h+nQS0BuD5yDav4PkLjrPagibU3G+ e30EFgbGHKMXl+yNrlmm51Plp1WJdd4ZsCLAgT0/8trFgYf8EgrjV3PMQJfskSpnmrHO PubPqp2jfgtOWeiei/EGSnUPe/o2z5x7Y+DKUePsX+Wu0D+E+jUprHlQyVhgPh3xSeyA qCWC/4SpiBd6P/q7PONornW00gat+31L6SO83liYgjSVfnoRpJgLC6I7JOlV1f6oEZJ1 uskg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7gChBksxn1qEPSD3R08ZEmaSNW2wV6LYIITXUj3191A=; b=xgA2/imeMXyl0odAhycmCEbHgxCScabWh0vm+zTKiYRki6WmfExzKRlnJ2UpCXeu0A fkwmkZ2AhMmaB5E+Pkwn5WSNW3UcToCXsPT4Mq/aLw0HOOdsldFtft/o1uowlCkBkCMs naf6X+ZqK7FQVjdNmjGZOumz0fWINrFF8ChPhYtLzmIp2W55WSD6gDJNtEBMRlrH9+Vj VVpl0rg1ZMDjZpeS3+yw6w32/KnxaxUkA2o9/f6dr3+NPz5vAE39htK9MHOB12W77mVZ oLNoppe6P1NttUyDVxBJGAPKxxrcyP4Tpe2f7G8c3ZYHY1a70nvAjZl5jsdp0DruXNJg uaCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OHq3343W; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l9si104532edi.199.2020.12.01.07.39.26; Tue, 01 Dec 2020 07:39:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OHq3343W; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388149AbgLAPh6 (ORCPT + 15 others); Tue, 1 Dec 2020 10:37:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387532AbgLAPh6 (ORCPT ); Tue, 1 Dec 2020 10:37:58 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B8FC0617A6 for ; Tue, 1 Dec 2020 07:37:17 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id w206so373268wma.0 for ; Tue, 01 Dec 2020 07:37:17 -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 :mime-version:content-transfer-encoding; bh=7gChBksxn1qEPSD3R08ZEmaSNW2wV6LYIITXUj3191A=; b=OHq3343W+aiwvjBes5ZnNTv3M3FuJ79KnBXcTqKWgT0cciUJ6pU+4mU6xulFiZjo78 VDnDZ/QiFFwV8GUqiE4se8aPBNP2v8jsPkhz4H07Z2M0h5+m05NrCPbd67wKB5HRZSsi 17A7NsnoCEZPlUj6YMLiows5Hyx2DIZWGQOqcwPpfCcovw1qE75wWOrHbZ+4ZyvlcYa+ MMXTWv1VRZd5RdKXeYX43Gc8+e1WfjbOlUHLzlJ2viPvVU6ov5mGVr8TcHRiwDoPW0jL GMlEj1DkbF7z1mDE229gxeZvk6yhdV/lnCF1SqqKPSRrOS5j58vWXWGwxuGvE/SYWaC/ PZ8g== 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=7gChBksxn1qEPSD3R08ZEmaSNW2wV6LYIITXUj3191A=; b=Zf0Q/yDmP+wEF+OzN4yjZBqngOl9E+HPB1OyLLOfGJQR9ta1z4Y+kKIFLNoG7LmQ1L fYQhRUKA+f9yBYSvA5w+bxQjXSDQAD2YPTQQ4f0HwtFURhHckdmPuRAhVlzM3LT2vi0J k4WZ+A5y43f9Jn+5lfASZBaS1wUX/Rp4Y4lO8N6tLr1tYix+xqYESOFDZf7Xn+sdn78J P3+TAs4HKir+kNaTPPlsdZ+hiarjAGdl6kWO6Ngh+olYZ7O+gYPbsiV/RkUiNnCTP61q XPW4LCtA1jJijYVsGWW3xYdkRq4YSDW+zkIvw3FQq1xP9zEKJz2IXMOwFRyu3g7O/p/r 30Ow== X-Gm-Message-State: AOAM532d4YUk4BPm8RY+lA3BQosyOHI8VLoSGzkm+uj7axmbZaAqWTYp gpumn0R5YZ9PJdYvWQlKtreoUUFvHaKBvEIo X-Received: by 2002:a05:600c:ce:: with SMTP id u14mr3310247wmm.150.1606837036532; Tue, 01 Dec 2020 07:37:16 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:15 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 1/6] arm64: dts: qcom: sm8250: add apr and its services Date: Tue, 1 Dec 2020 15:37:01 +0000 Message-Id: <20201201153706.13450-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add apr node and its associated services required for audio on RB5. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -- 2.21.0 diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 65acd1f381eb..3b4e98b13d36 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include @@ -2620,6 +2622,60 @@ label = "lpass"; qcom,remote-pid = <2>; + apr { + compatible = "qcom,apr-v2"; + qcom,glink-channels = "apr_audio_svc"; + qcom,apr-domain = ; + #address-cells = <1>; + #size-cells = <0>; + + apr-service@3 { + reg = ; + compatible = "qcom,q6core"; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + }; + + q6afe: apr-service@4 { + compatible = "qcom,q6afe"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6afedai: dais { + compatible = "qcom,q6afe-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + }; + + q6afecc: cc { + compatible = "qcom,q6afe-clocks"; + #clock-cells = <2>; + }; + }; + + q6asm: apr-service@7 { + compatible = "qcom,q6asm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6asmdai: dais { + compatible = "qcom,q6asm-dais"; + #address-cells = <1>; + #size-cells = <0>; + #sound-dai-cells = <1>; + iommus = <&apps_smmu 0x1801 0x0>; + }; + }; + + q6adm: apr-service@8 { + compatible = "qcom,q6adm"; + reg = ; + qcom,protection-domain = "avs/audio", "msm/adsp/audio_pd"; + q6routing: routing { + compatible = "qcom,q6adm-routing"; + #sound-dai-cells = <0>; + }; + }; + }; + fastrpc { compatible = "qcom,fastrpc"; qcom,glink-channels = "fastrpcglink-apps-dsp"; From patchwork Tue Dec 1 15:37:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 335180 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 3A94AC64E7B for ; Tue, 1 Dec 2020 15:38:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C7E8021D42 for ; Tue, 1 Dec 2020 15:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="hJ2xUF+i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391839AbgLAPio (ORCPT ); Tue, 1 Dec 2020 10:38:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390571AbgLAPio (ORCPT ); Tue, 1 Dec 2020 10:38:44 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8DA9C061A49 for ; Tue, 1 Dec 2020 07:37:25 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id 3so6075382wmg.4 for ; Tue, 01 Dec 2020 07:37:25 -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 :mime-version:content-transfer-encoding; bh=KIHgb8fdd+Pz02Bd0nEwBeV7zsJRfiJajUBhZJqVTbc=; b=hJ2xUF+iuAw0FHIflFts7a3mYNfAl/QwZOV2gFcw+ZUNMyeLrhFSmRtRQ5axv9lwOz KSYpS7NKx/7txNZYj/t1itXvprHH+dg4/3dzDKMFz4bEgALCsrPYN/KjEADn04z+sDOo wKDQFJZw8qz07eJbqQry3/449zialwZsnQJVqkg5B4mG3vK9acfHOaJB52K+6ehN1uER 0RkF2dNBSvjJmlQeVqTpCGbdmxOOMu/JyYVMPclnxF6KTdHLNkCEK98Uax+/qmfJgrFa q0IG2iYSkp6ZKKPApS8ZcyySMZFrZhGte45NpHwaZsBM7LOGyHPtve1NuPejLwkgpbLh Z22g== 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=KIHgb8fdd+Pz02Bd0nEwBeV7zsJRfiJajUBhZJqVTbc=; b=I2v567FwFHi5z+/bl8iAMIV/AMUil0jV7SgPkrNur7tbKaN0ZSdw0T/PSqDB0Zjhvy FA20H9sdNYUQ+ziZ1rLQElUPrjbNUrBxzp1M0JvhzmdFNH0v1p6coIscO/rag0JtRsaU k1VM4tAWMm1n/pzV+K7oflZTb76Oy2eKHIPsS0v0a4KBWOZ2Ns0t6xJ9pSaeU4TejfS4 yvwkyJlD7cz16aoAVtm+71DRGGWRPjd2Uz+z9XY/Piz3EFVv/BcUFZo6tlCKupCI9eJ0 Tt7lhY7BhJbCswUjk16z1BN5s9ZIPlc888uqj2IgPadkgn+B3khRjdvrhmk6/SYEkpdK fWmA== X-Gm-Message-State: AOAM530QgX0wCu4jcrug9urb79WObT6XTfavsdaUrRAO4in0q0pPMP0T 2gxkjcc+VbOM0FXuOKRFCf4SMA== X-Google-Smtp-Source: ABdhPJw7MCl9H8yU9lww2ZCsGtRpMhv+3Gv0zkH0pAiNK0tBttU7q1bJbHd3vj2J2A5jjcEIiQZ9QA== X-Received: by 2002:a1c:bc02:: with SMTP id m2mr3235175wmf.59.1606837037869; Tue, 01 Dec 2020 07:37:17 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:17 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 2/6] arm64: dts: qcom: sm8250: add audio clock controllers Date: Tue, 1 Dec 2020 15:37:02 +0000 Message-Id: <20201201153706.13450-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add audiocc and aoncc clock controller nodes required for audio on RB5. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 3b4e98b13d36..ec5b53b8f656 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -6,6 +6,8 @@ #include #include #include +#include +#include #include #include #include @@ -2585,6 +2587,26 @@ ; }; + audiocc: clock-controller@3300000 { + compatible = "qcom,sm8250-lpass-audiocc"; + reg = <0 0x03300000 0 0x30000>; + #clock-cells = <1>; + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio", "bus"; + }; + + aoncc: clock-controller@3380000 { + compatible = "qcom,sm8250-lpass-aoncc"; + reg = <0 0x03380000 0 0x40000>; + #clock-cells = <1>; + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio", "bus"; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Tue Dec 1 15:37:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 336064 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 D3B0BC83013 for ; Tue, 1 Dec 2020 15:38:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84E932224C for ; Tue, 1 Dec 2020 15:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="buTxQDpb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391865AbgLAPin (ORCPT ); Tue, 1 Dec 2020 10:38:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391839AbgLAPim (ORCPT ); Tue, 1 Dec 2020 10:38:42 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D74CFC061A4C for ; Tue, 1 Dec 2020 07:37:26 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id p8so3283625wrx.5 for ; Tue, 01 Dec 2020 07:37:26 -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 :mime-version:content-transfer-encoding; bh=kJcaGNZBGsHMeZykogFq86M34T6M8SXdsetUo9MhrkE=; b=buTxQDpbYVAsi1CaU0F23z++LRUjSLD33FuvRbhYdR3i5zYmUnuL5nRW1agjQ6EKcD FV2imeVMQz2CCh4BPAIJyrobyjdOiGbiEzVtrf8Auy3reP6rFVlLu76q+JXewvnNBCQ4 8Z9IeJjaXGh6ZOmri24r8yT8RG5CBO+JOzgu5bX22J3hxCriLFguxxEOQC3Xm6J0sqis zkU1oTSLAx7w549yg8aDuROCn1T0wRUhFznTq6UgN2+XY3vDPSSuxA/ceT7NsjtlnEhk 1gebS2dk/lWEi3o17WpGKfr4z47Ze8VSPNEi4ChPQDksKa82bTCC4VsfrWTz31JKKmKz QSXQ== 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=kJcaGNZBGsHMeZykogFq86M34T6M8SXdsetUo9MhrkE=; b=kKfYVl5GO9W3lZ4LBMibFj2Gui/VJPXjRoCBkynr98qeN+tYry695JUMl5nrvpB9eG xjD3UsCcdu6AJTeH5YL6gX/n3W4hFa+v3sIn6+SMCqY6qPSeRtoC6MVk4ZMlnX0LMM8c sYJQVFSNW3d+IuFkC0sHneDJPJDukoqW9Fucmw4pBTZq4YuHDNqS0ja/039w7Y0sfPEt 3c9L7FG08NQUt1j5oT4Hleq3+TE9GLntHpeazZ5GO3wFD2iMkPIq18G/7rDqjqW3yiCp 98P9XEh0uUvLXeIrNZ20lh+aoh+eLwEMvygvDHnJR6Xq6ruYP/XwxQTMtUKF1qUwfw3s LgvQ== X-Gm-Message-State: AOAM530mNqroWeakFlI1O99bDr5LlzRHw5MgYfc/EyBsHFrtUaL5OzPb +xm/ei2qCpSsjLkp3rp4igvqkQ== X-Google-Smtp-Source: ABdhPJwL3qO2Qg+JtU39QjHcpdu0TMK7Zwq+4vdamdcw+1XXroFiPIZTRVlXZuktewGec+2P5vvdlQ== X-Received: by 2002:a5d:530d:: with SMTP id e13mr4646676wrv.92.1606837045510; Tue, 01 Dec 2020 07:37:25 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:24 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 3/6] arm64: dts: qcom: sm8250: add lpass lpi pin controller node Date: Tue, 1 Dec 2020 15:37:03 +0000 Message-Id: <20201201153706.13450-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add LPASS LPI pinctrl node required for Audio functionality on RB5. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 95 ++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index ec5b53b8f656..4e1309b6571e 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2607,6 +2607,101 @@ clock-names = "core", "audio", "bus"; }; + lpass_tlmm: pinctrl@33c0000{ + compatible = "qcom,sm8250-lpass-lpi-pinctrl"; + reg = <0 0x33c0000 0x0 0x20000>, + <0 0x3550000 0x0 0x10000>; + gpio-controller; + #gpio-cells = <2>; + gpio-ranges = <&lpass_tlmm 0 0 14>; + + clocks = <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + clock-names = "core", "audio"; + + wsa_swr_clk_pin { + wsa_swr_clk_sleep: wsa_swr_clk_sleep { + mux { + pins = "gpio10"; + function = "wsa_swr_clk"; + drive-strength = <2>; + input-enable; + bias-pull-down; + }; + }; + + wsa_swr_clk_active: wsa_swr_clk_active { + mux { + pins = "gpio10"; + function = "wsa_swr_clk"; + drive-strength = <2>; + slew-rate = <1>; + bias-disable; + }; + }; + }; + + wsa_swr_data_pin { + wsa_swr_data_sleep: wsa_swr_data_sleep { + mux { + pins = "gpio11"; + function = "wsa_swr_data"; + drive-strength = <2>; + input-enable; + bias-pull-down; + }; + }; + + wsa_swr_data_active: wsa_swr_data_active { + mux { + pins = "gpio11"; + function = "wsa_swr_data"; + drive-strength = <2>; + slew-rate = <1>; + bias-bus-hold; + }; + }; + }; + + cdc_dmic01_data_active: dmic01_data_active { + mux { + pins = "gpio7"; + function = "dmic1_data"; + drive-strength = <8>; + input-enable; + }; + }; + + cdc_dmic01_data_sleep: dmic01_data_sleep { + mux { + pins = "gpio7"; + function = "dmic1_data"; + drive-strength = <2>; + pull-down; + input-enable; + }; + }; + + cdc_dmic01_clk_active: dmic01_clk_active { + mux { + pins = "gpio6"; + function = "dmic1_clk"; + drive-strength = <8>; + output-high; + }; + }; + + cdc_dmic01_clk_sleep: dmic01_clk_sleep { + mux { + pins = "gpio6"; + function = "dmic1_clk"; + drive-strength = <2>; + bias-disable; + output-low; + }; + }; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Tue Dec 1 15:37:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 336063 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 84707C71156 for ; Tue, 1 Dec 2020 15:38:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19FEB20857 for ; Tue, 1 Dec 2020 15:38:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rG06myb+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390571AbgLAPip (ORCPT ); Tue, 1 Dec 2020 10:38:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391853AbgLAPim (ORCPT ); Tue, 1 Dec 2020 10:38:42 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3214DC061A4F for ; Tue, 1 Dec 2020 07:37:28 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id k14so3301010wrn.1 for ; Tue, 01 Dec 2020 07:37:28 -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 :mime-version:content-transfer-encoding; bh=lRg3pwqDu/VoieERe7nqqzEqQSkTOmr6u0qBR4l6xpE=; b=rG06myb+y4BTb4pXflRO0w2jwQhacHqbLmRYJEZPdaXT9sHju16t0xk92wf4gjXyEv 43RL/jJZ0irQY5w+91x3FdIdviotfsb7Ms5BKGTnnctgb112Kt3FR/echxIA/00j3YrL zxqQpHWpSfQE1dxZ0zpg334ewXVMa8K5UaPBoXhl7hwjjLwHNQAU3NSUKFLMS3jkqBQO Kv+Oqy3pW882x7aeE9e8eTCG4G50u8UdZSZcF8Brb646zOCbQvAYzRBm9t6AKAy8/cZT 1k/MAGNy2F+VMIdgJ3LM1fiVvNV1jNPpvbWuBqp1gh0zGL3HWfiabEtC4m8lM0Mt7pMF jGnA== 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=lRg3pwqDu/VoieERe7nqqzEqQSkTOmr6u0qBR4l6xpE=; b=atlV6v7K96t1xp8kWoIuMNeQXpXyLbP2gzrJOEl8pi/ldb8socPvWvdTUIVBmsIWqt /71qROm6xturuV4eQlwUmItWIiJbZu5HPj4AocNg4V68X/DSR7VRe9J5xByI2wlQQkeA ANfY7CINMuukl9XK7SWC2Fe2ADoEYvGN3TVesx7LdPMn6FRV88cYkagYqPK66a4XKlK8 Y/4Oi5Ys4jsDbIL8O01Cdn+8hmHdtUrz5jjsK52eU/joXEvJNJpfCJ8O+qDclPySpX0i fgbUG4xzJmOQbckPyI4GfU/kfh/6yNMwp1YPSmtx1rgvRwrQMqS5me1FxSHSHY8PV3SP YrtQ== X-Gm-Message-State: AOAM530baZSUaaOBp3Pnm4LmMGhf+tTZ0a1fwoKu8RBJEGzZXX3NR4fB E4wQ4UnGobuYElSpfpQFLSGk+Q== X-Google-Smtp-Source: ABdhPJwsyc6hrB+A4gdRKX7OrQSq2G7QnmL9sfGctUTgOgxJB31FlrU1KXP4y+M4/YBiZc+9B/0j5g== X-Received: by 2002:a05:6000:187:: with SMTP id p7mr4531496wrx.240.1606837046877; Tue, 01 Dec 2020 07:37:26 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:26 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 4/6] arm64: dts: qcom: sm8250: add wsa and va codec macros Date: Tue, 1 Dec 2020 15:37:04 +0000 Message-Id: <20201201153706.13450-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for WSA and VA codec macros along with WSA soundwire controller required for getting audio on RB5. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 4e1309b6571e..19dd7460e586 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2702,6 +2702,62 @@ }; }; + wsamacro: codec@3240000 { + pinctrl-names = "default"; + pinctrl-0 = <&wsa_swr_clk_active &wsa_swr_data_active>; + + compatible = "qcom,sm8250-lpass-wsa-macro"; + reg = <0 0x3240000 0 0x1000>; + clocks = <&audiocc LPASS_CDC_WSA_MCLK>, + <&audiocc LPASS_CDC_WSA_NPL>, + <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&aoncc LPASS_CDC_VA_MCLK>, + <&vamacro>; + + clock-names = "mclk", "npl", "macro", "dcodec", "va", "fsgen"; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "mclk"; + #sound-dai-cells = <1>; + }; + + swr0: soundwire-controller@3250000 { + reg = <0 0x3250000 0 0x2000>; + compatible = "qcom,soundwire-v1.5.1"; + interrupts = ; + clocks = <&wsamacro>; + clock-names = "iface"; + + qcom,din-ports = <2>; + qcom,dout-ports = <6>; + + qcom,ports-sinterval-low = /bits/ 8 <0x07 0x1F 0x3F 0x07 0x1F 0x3F 0x0F 0x0F>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0C 0x06 0x12 0x0D 0x07 0x0A >; + qcom,ports-offset2 = /bits/ 8 <0xFF 0x00 0x1F 0xFF 0x00 0x1F 0x00 0x00>; + qcom,ports-block-pack-mode = /bits/ 8 <0x0 0x0 0x1 0x0 0x0 0x1 0x0 0x0>; + + #sound-dai-cells = <1>; + #address-cells = <2>; + #size-cells = <0>; + }; + + vamacro: codec@3370000 { + compatible = "qcom,sm8250-lpass-va-macro"; + reg = <0 0x3370000 0 0x1000>; + clocks = <&aoncc LPASS_CDC_VA_MCLK>, + <&q6afecc LPASS_HW_MACRO_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>, + <&q6afecc LPASS_HW_DCODEC_VOTE LPASS_CLK_ATTRIBUTE_COUPLE_NO>; + + clock-names = "mclk", "macro", "dcodec"; + + #clock-cells = <0>; + clock-frequency = <9600000>; + clock-output-names = "fsgen"; + #sound-dai-cells = <1>; + }; + adsp: remoteproc@17300000 { compatible = "qcom,sm8250-adsp-pas"; reg = <0 0x17300000 0 0x100>; From patchwork Tue Dec 1 15:37:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 335179 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 4E7BEC64E7B for ; Tue, 1 Dec 2020 15:39:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6EB020870 for ; Tue, 1 Dec 2020 15:39:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TbVdQfZd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391505AbgLAPjR (ORCPT ); Tue, 1 Dec 2020 10:39:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389705AbgLAPjR (ORCPT ); Tue, 1 Dec 2020 10:39:17 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A93C061A52 for ; Tue, 1 Dec 2020 07:37:29 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id i2so3284967wrs.4 for ; Tue, 01 Dec 2020 07:37:29 -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 :mime-version:content-transfer-encoding; bh=6vXiT5FpPdzP+F5sPQwMF6j9EVgTdZPYADmNV8Tr/zQ=; b=TbVdQfZdGXdVxc/qIYtd7/2RnLmbhk9iHaPbVGxFpQrpBDSS/iC/zhk0Mpty5j2yvd MMejl3MDG9f106+i9JnkxzHN38reC3FB6VXryJ2wlyRDzUO5GjqtVJoFLuXNu34ISPU0 ViPvsutDNP180YEf8K195Sb1Pjbz1nCCKGjKEvwru2GmOyhrOy03li0QpF2cVn6J8GwV orv5Gme+c3L862r4n05I0S/iTEwgG7tTdurW4841H4DihC3tch67vtZH/t1QQuuXmy8r jRM7Ac0fTReQi/OmH/sTr01B1qkhCwjQU9fDW3/nlIYyA74wSEQCej/TTYryuPdEGMPH AqDQ== 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=6vXiT5FpPdzP+F5sPQwMF6j9EVgTdZPYADmNV8Tr/zQ=; b=tTouiB0QLHSS/qMHt0HGsVnsLjI+/iWOCJ2Yo7VvbEP8uSV+omOKWZw+NvaR7uOY6E IfHfkt0wImbh/lJE+NckdMZCj9j4Rn7tnD5tDNz9D1iAHrP8xzVxysuDxW2FO1s0HfcX a8MSAa4pdPcZFWouhWfnM+1fjw4l38ZmhM8U1DG74oD0y2wXx2gpQ4KVohERd5yqXGWY Al7jEPFXh/C5CGfSALhSrLfaTLvK5hK6kiYOfeLx9rnDl+9O58EQtg5j65qgzlhWlZLf JrjxrWSfa1jR5N/2axLvgiFw/f73Qfhk54lN67FQij3fwqlEc+VEEZNUUBlrKjJhU4sq c/WQ== X-Gm-Message-State: AOAM531zJacraXKSXo6M1B0peW7WzAtvegXrijBjcOz0ZGba8XrWut38 JzLdD5mNpqaXpIX62LTWCblsTA== X-Google-Smtp-Source: ABdhPJwpSRyY1JngpXYaiQ/Pmaldz9WrCP/ULRroZLPPi+CRiFFopPSDfB0moPEm6/LpXN/QTbiTlA== X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr4445405wru.8.1606837048122; Tue, 01 Dec 2020 07:37:28 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:27 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 5/6] arm64: dts: qcom: sm8250: add mi2s pinconfs Date: Tue, 1 Dec 2020 15:37:05 +0000 Message-Id: <20201201153706.13450-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add primary and tertinary mi2s pinconfs required to get I2S audio. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/sm8250.dtsi | 98 ++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index 19dd7460e586..a87940e157be 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -1561,6 +1561,9 @@ }; }; + sound: sound { + }; + usb_1_hsphy: phy@88e3000 { compatible = "qcom,sm8250-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy"; @@ -1884,6 +1887,60 @@ gpio-ranges = <&tlmm 0 0 180>; wakeup-parent = <&pdc>; + pri_mi2s_sck_active: pri-mi2s-sck-active { + mux { + pins = "gpio138"; + function = "mi2s0_sck"; + }; + + config { + pins = "gpio138"; + drive-strength = <8>; + bias-disable; + output-high; + }; + }; + + pri_mi2s_ws_active: pri-mi2s-ws-active { + mux { + pins = "gpio141"; + function = "mi2s0_ws"; + }; + + config { + pins = "gpio141"; + drive-strength = <8>; + output-high; + }; + }; + + pri_mi2s_sd0_active: pri-mi2s-sd0-active { + mux { + pins = "gpio139"; + function = "mi2s0_data0"; + }; + + config { + pins = "gpio139"; + drive-strength = <8>; + bias-disable; + output-high; + }; + }; + + pri_mi2s_sd1_active: pri-mi2s-sd1-active { + mux { + pins = "gpio140"; + function = "mi2s0_data1"; + }; + + config { + pins = "gpio140"; + drive-strength = <8>; + output-high; + }; + }; + qup_i2c0_default: qup-i2c0-default { mux { pins = "gpio28", "gpio29"; @@ -2480,6 +2537,47 @@ function = "qup18"; }; }; + + tert_mi2s_sck_active: tert-mi2s-sck-active { + mux { + pins = "gpio133"; + function = "mi2s2_sck"; + }; + + config { + pins = "gpio133"; + drive-strength = <8>; + bias-disable; + output-high; + }; + }; + + tert_mi2s_sd0_active: tert-mi2s-sd0-active { + mux { + pins = "gpio134"; + function = "mi2s2_data0"; + }; + + config { + pins = "gpio134"; + drive-strength = <8>; + bias-disable; + output-high; + }; + }; + + tert_mi2s_ws_active: tert-mi2s-ws-active { + mux { + pins = "gpio135"; + function = "mi2s2_ws"; + }; + + config { + pins = "gpio135"; + drive-strength = <8>; + output-high; + }; + }; }; apps_smmu: iommu@15000000 { From patchwork Tue Dec 1 15:37:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 336062 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 1EAFFC64E7B for ; Tue, 1 Dec 2020 15:39:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B510020870 for ; Tue, 1 Dec 2020 15:39:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d3V33ds+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391926AbgLAPjZ (ORCPT ); Tue, 1 Dec 2020 10:39:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391784AbgLAPjZ (ORCPT ); Tue, 1 Dec 2020 10:39:25 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEAECC061A54 for ; Tue, 1 Dec 2020 07:37:30 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id u12so3318249wrt.0 for ; Tue, 01 Dec 2020 07:37:30 -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 :mime-version:content-transfer-encoding; bh=AnsMipShbEp5shIcSQnSsR/KPaRGHHYiZS/KJVFuEzU=; b=d3V33ds+V2uGSuK1Is8LyL+zdVqoj2udYUXfK4dLGmW2Bu0VXwd6Sj3QW7fRQkkU61 xeCDUXF7bmZbbXy6FJAepXvT+L7qt7YmfYXMlM6RoU36fxpIX412g1D75jtmKLAJzEUT a6R35abPN7caHzjaUW49Fh4bB72Zqlm12q1Axl82i31TjFrnel64kHCu1cv+Hy/Z0IKe KO++BNLnVTQJqWUoAdg8EuonQx8kXDLdLHMFaPaCXth25PGK1cSt7C983M0fgT2zTYNj EU4/OntdFvIGOPbnTDJDMuhAQlnwy4/HPaYJcKgaN9ROWfani0vDRlvsXdpjYa4CEOmL INMA== 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=AnsMipShbEp5shIcSQnSsR/KPaRGHHYiZS/KJVFuEzU=; b=c4eHI+IupG5W96iAfuSffNmj5SdbgRX5iOnp2KSr9rPgrAwfNWjZLyDj+fDWlevXu+ 5ies3uPiL477PJcCc98GDfeGsZjkLl3lazFNdMvSSP1SGB0b6amI8deEyIpVJFrIvVxy +5dynj5D0hDKMV8ltL/PxwQg8Cc8XZOCbIoW4fhXl68tfIh1S3uw8yt/Taqj0YyNh872 eUpf1kNIJWzpajTmqGHKNgCuhkmUlz0rUV9H3zgjRJsABb70t85fVv5ddBf6v4ia9Us+ fZRTe1oTdZzhe+sjTH1NK9+0RxX47qFaVdqTMHXJzorFu3d9ioNDrw+w1GSc4FFPXCpc pbpA== X-Gm-Message-State: AOAM530UjsWoLUHPAWWMf4Z5FBYR85JpPYS6VpaeI32frk/RK6LH8GuC mGOo5SdusVcehvHoLyVuIu6sDQ== X-Google-Smtp-Source: ABdhPJyt5IlNdbjrOGpmBV9L5vRASf03V/hmdFs2fwLA5QsQmAzOtR1xYDaA2k4qSSP6BP4ceEPuEg== X-Received: by 2002:a5d:6503:: with SMTP id x3mr4647417wru.151.1606837049436; Tue, 01 Dec 2020 07:37:29 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id y7sm302171wmb.37.2020.12.01.07.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:37:28 -0800 (PST) From: Srinivas Kandagatla To: bjorn.andersson@linaro.org Cc: linux-arm-msm@vger.kernel.org, agross@kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 6/6] arm64: dts: qcom: qrb5165-rb5: Add Audio support Date: Tue, 1 Dec 2020 15:37:06 +0000 Message-Id: <20201201153706.13450-7-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> References: <20201201153706.13450-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This patch add support for two WSA881X smart speakers attached via Soundwire and a DMIC0 on the main board. Signed-off-by: Srinivas Kandagatla --- arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 125 +++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index ce22d4fa383e..03229d5cb9d3 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -7,6 +7,8 @@ #include #include +#include +#include #include "sm8250.dtsi" #include "pm8150.dtsi" #include "pm8150b.dtsi" @@ -120,6 +122,11 @@ }; }; +&adsp { + status = "okay"; + firmware-name = "qcom/sm8250/adsp.mdt"; +}; + &apps_rsc { pm8009-rpmh-regulators { compatible = "qcom,pm8009-rpmh-regulators"; @@ -483,6 +490,35 @@ status = "okay"; }; +&q6afedai { + qi2s@16 { + reg = <16>; + qcom,sd-lines = <0 1 2 3>; + }; +}; + +/* TERT I2S Uses 1 I2S SD Lines for audio on LT9611 HDMI Bridge */ +&q6afedai { + qi2s@20 { + reg = <20>; + qcom,sd-lines = <0>; + }; +}; + +&q6asmdai { + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + }; +}; + &sdhc_2 { status = "okay"; pinctrl-names = "default"; @@ -497,6 +533,88 @@ no-emmc; }; +&swr0 { + + left_spkr: wsa8810-left{ + compatible = "sdw10217211000"; + reg = <0 3>; + powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrLeft"; + #sound-dai-cells = <0>; + }; + + + right_spkr: wsa8810-right{ + compatible = "sdw10217211000"; + reg = <0 4>; + powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; + #thermal-sensor-cells = <0>; + sound-name-prefix = "SpkrRight"; + #sound-dai-cells = <0>; + }; +}; + +&sound { + compatible = "qcom,qrb5165-rb5"; + pinctrl-0 = <&tert_mi2s_sck_active + &tert_mi2s_sd0_active + &tert_mi2s_ws_active>; + pinctrl-names = "default"; + model = "Qualcomm-RB5-WSA8815-Speakers-DMIC0"; + audio-routing = + "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "VA DMIC0", "vdd-micb", + "VA DMIC1", "vdd-micb", + "MM_DL1", "MultiMedia1 Playback", + "MultiMedia3 Capture", "MM_UL3"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + dma-dai-link { + link-name = "WSA Playback"; + cpu { + sound-dai = <&q6afedai WSA_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&wsamacro 0>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + cpu { + sound-dai = <&q6afedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&vamacro 0>; + }; + }; +}; + /* CAN */ &spi0 { status = "okay"; @@ -792,3 +910,10 @@ vdda-phy-supply = <&vreg_l9a_1p2>; vdda-pll-supply = <&vreg_l18a_0p92>; }; + +&vamacro { + pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>; + pinctrl-names = "default"; + vdd-micb-supply = <&vreg_s4a_1p8>; + qcom,dmic-sample-rate = <600000>; +};