From patchwork Mon May 26 11:46:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 892638 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFCE91DEFE1 for ; Mon, 26 May 2025 11:46:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260005; cv=none; b=XPPGGZoCjVrrJQPvafovNFf3spnrZgLvjrh87/Pk36bV0Dtw6vIcUwq/fPIKjOafRN7L3PHiHu1KXdGgg6gaO6RyvlZJePsXYNKOLbap5pddzTfpDI4h3JQKomozl6OsX/dAFoo/4XXgYu0GmtBT+pZY85gFLE/YvPbhtJBmPQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260005; c=relaxed/simple; bh=jjd4GeBbAtuwlRPuLLleMWt4peQC4Vu7ly9/mKRLATo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z0L4i8VgJt7DtPYpQoiC9ouhhmeTP2ALNpbelKI6YvQ3hkZaAOqiC1KEoxappJcP94EwMgS5LT8bwxxyF6x3XQC9bGy0j6IlbqyAaxal3BzRsFjhUa/P4QL3jxECQjzyAOk8IrbzfKziNhxY1vwbUX7j87dlrK4Z1M/md8Ii8Pg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=aySdbvSw; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aySdbvSw" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3a4cbc36ce3so52406f8f.1 for ; Mon, 26 May 2025 04:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748260000; x=1748864800; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=I1OmNo2Qm8ZDm0Bz1e9gms44TxcRGKOxtlMto4OxWLw=; b=aySdbvSwSywhsP24JK0MpeKbHAfQNa6imkZLeUVlNGX3Mj6/z41LHRFbDyqXPwNOdE JDzEgLfFXjzUK0+aPjvrSsY9oMLw3gQ1LcaTWp7lVV3Oh1IkQKatO38nTvXfbrY6Tzmd geqg4p2fGBG3PBfAmPV04UBJgv4C943Ekcuaki47b/q+DHCcWCj7/WkKQrSMcJVRpu8R yvOss+NCOA7WuXPIiyqeJDUkXUFEUw4S2ocS66rd/n3LSlURym3GP3IeC1k9a32TUOhx NfwqeX0qF3BZtP4ycecdbBIWUDSTEB9l2UBrfKl2LEc7qByTbrro0b7B8MtJur9nJlVE 1lyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748260000; x=1748864800; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I1OmNo2Qm8ZDm0Bz1e9gms44TxcRGKOxtlMto4OxWLw=; b=qByjPuzBwMDolEp+LOajWzaGxfIqqxyDAlqKdQlYRW0Uq4+rGlQoGgNsAzQzGtinaS zF+YgZLF7aFVS4v236uvnrf9r0S/loWO1/e3+AphKFdwfXWpOAshmWU3jqqkpKop7Q6Q i2NDjzMK+y8BvsTA7laLcwu2fVK+ZQ7AbeTau41rPsWqz64WdSsbJ2rzV6fmz/MWcdKp brLqOoG1SwNoI6Yl7iWMswJuLMngY0Zyn4yG57Ag36ZEZ3zAPRoUdcgnrXK/cSxecexE YS93EL94ybsbJrFJXg0B4Gc+b18lsOHGBS0qQ2tOUc40VER9p8SwhanIjkNz4+feDuKq Bsbg== X-Gm-Message-State: AOJu0Yw4gyxJAn0yGboYwmmdOU2ejOZZtvSn/nyDEqeQycYEr7mdsJW1 WfG3JNZdaQiAhPlWcRfke+P5FXhh82ij3AacP7DAcf0UHF/wx90XN4lY1nac8RQsKxvOXChWKsU T2XT9 X-Gm-Gg: ASbGncu6JMMCwgF5hH87E42ZSByBuoh02s9IuMZfiEM9sSg7GDbWTGAeufRo0EnNckE XL6AZffcb2rZK5rOdlIL+2qT7E0AezQJvzarawWvjZR5RrP3OZ8qJIlJZdMcQrWfiz2IfcMIerg RD1xzTqWatWpHO8Dia13ZxnTd2DHjKmjCFasyW+9cFOnf714hP218Y5FrM7qcOLuYEY2e53RuwO I4b+FaBdzaPiHdcDska0VmQVWQPytXPpGtFzQBO0WeFYfyzVqzPT6lld/dSZL33txOw9t45/tOc 0oJScW+Ce+cC3K2kUNdLCRjsGAmQEGThzxJZ31Ro3sKGuT9BxCS7p2MjK9MBGXkD4DdSEB4= X-Google-Smtp-Source: AGHT+IH0HEEI5Y3c9wERynZXMmGvEnsD4iAVhZwQNb4LD/V/a6G6+ztZI5SPNKq1HgnPFLDXB5nrPg== X-Received: by 2002:a05:6000:240d:b0:3a4:d6ed:8e28 with SMTP id ffacd0b85a97d-3a4d6eda6b3mr1253598f8f.8.1748259999906; Mon, 26 May 2025 04:46:39 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4cc52ab88sm7592310f8f.11.2025.05.26.04.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 04:46:39 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 26 May 2025 13:46:32 +0200 Subject: [PATCH v3 1/3] arm64: dts: qcom: sm8750: Add Soundwire nodes Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250526-sm8750-audio-part-2-v3-1-74429c686bb1@linaro.org> References: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> In-Reply-To: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7310; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=jjd4GeBbAtuwlRPuLLleMWt4peQC4Vu7ly9/mKRLATo=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoNFSawL3MsJn5R4OszQcefmLWhjODYNPKTRj3f QjiTsd2uJOJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaDRUmgAKCRDBN2bmhouD 1+rgEACac7dFXAfLbbCo3fGIcNoE3TiKSJl6ozgEUbLTnQu0VtLboNPa6NklpHay0T2MpfDKppw 36q3q0VCHGJQlh//Vw/+cLfEWylrO7C2S+lFThTccQmPDm7TZSCE2RN275Y3QTb87HLZMBQ+pPn N2wi8Y5DP0I4onMI2DypQukfz2JqKMEga1+YSPW+WukPTrbZSNheeSYJIMWj9t9C/fzTeubp/h5 M7NIOpmGB2BJ1nmpaHccVpB0YjxXcY2DnbpQ7wotDKTBKTQ7KdaWHYsi/kI0jvtgB/bLw1tQ1Ax xCu+dQTpL2cN/tm0WvplC6Ulgoi1A8vaPSuqCFXjRM6SNf5WKX5TPUZfpa+w5vpviB4NBSb40Xm BN+y2peTrxMzhKfGrsACtyPvIaNJ9moR6hHM5OU5Y6Xo1CsVRu9raoooFT04+j/P+0pH11PN4nJ vrym8gZ3nc+calCSqJX6RvaXCYdJNXqjss6/ptzBZhwXIltKHaxG5kHV8U0jdden9tSjQbJaoPE V/wlmELVqV+KeVRGuyz3mMjIRM2ucR4vpFiT9Z++bRAp166SuLNig+Dk+zJgHVoZ0CD5PdgMgnS 4cnUuxCNCQTohtlakfeK3INSwRzeZJ/hgcvJaPBzh5s+TF33i9W3M5GhNB/wQkWLr5X32A/q3aU 4PFeoPe9Ui/yFdA== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Add Soundwire controllers on SM8750, fully compatible with earlier SM8650 generation. Reviewed-by: Konrad Dybcio Signed-off-by: Krzysztof Kozlowski --- Bindings / new compatible: https://lore.kernel.org/r/20250519080453.29858-2-krzysztof.kozlowski@linaro.org/T/#u --- arch/arm64/boot/dts/qcom/sm8750.dtsi | 122 +++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8750.dtsi b/arch/arm64/boot/dts/qcom/sm8750.dtsi index 149d2ed17641a085d510f3a8eab5a96304787f0c..68ea48854c61b3aed6e089afaebe9edba7a1475f 100644 --- a/arch/arm64/boot/dts/qcom/sm8750.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8750.dtsi @@ -2257,6 +2257,36 @@ lpass_wsa2macro: codec@6aa0000 { #sound-dai-cells = <1>; }; + swr3: soundwire@6ab0000 { + compatible = "qcom,soundwire-v2.1.0", "qcom,soundwire-v2.0.0"; + reg = <0x0 0x06ab0000 0x0 0x10000>; + interrupts = ; + clocks = <&lpass_wsa2macro>; + clock-names = "iface"; + label = "WSA2"; + + pinctrl-0 = <&wsa2_swr_active>; + pinctrl-names = "default"; + + qcom,din-ports = <4>; + qcom,dout-ports = <9>; + + qcom,ports-sinterval = /bits/ 16 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x18f 0x18f 0x18f 0x0f 0x0f 0xff 0x31f>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x03 0x05 0x02 0x04 0x15 0x00 0x00 0x00 0x06 0x0d 0xff 0x00>; + qcom,ports-offset2 = /bits/ 8 <0xff 0x07 0x1f 0xff 0x07 0x1f 0xff 0xff 0xff 0xff 0xff 0xff 0xff>; + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0e 0x0e 0xff 0xff 0xff 0x0f>; + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0e 0x0e 0xff 0xff 0xff 0x0f>; + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0f 0x0f 0x00 0xff 0xff 0x18>; + qcom,ports-block-pack-mode = /bits/ 8 <0x00 0x01 0x01 0x00 0x01 0x01 0x00 0x01 0x01 0x01 0x01 0x00 0x00>; + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x00 0x00 0xff 0xff 0xff 0xff>; + qcom,ports-lane-control = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x00 0x00 0xff 0xff 0xff 0xff>; + + #address-cells = <2>; + #size-cells = <0>; + #sound-dai-cells = <1>; + status = "disabled"; + }; + lpass_rxmacro: codec@6ac0000 { compatible = "qcom,sm8750-lpass-rx-macro", "qcom,sm8550-lpass-rx-macro"; reg = <0x0 0x06ac0000 0x0 0x1000>; @@ -2274,6 +2304,36 @@ lpass_rxmacro: codec@6ac0000 { #sound-dai-cells = <1>; }; + swr1: soundwire@6ad0000 { + compatible = "qcom,soundwire-v2.1.0", "qcom,soundwire-v2.0.0"; + reg = <0x0 0x06ad0000 0x0 0x10000>; + interrupts = ; + clocks = <&lpass_rxmacro>; + clock-names = "iface"; + label = "RX"; + + pinctrl-0 = <&rx_swr_active>; + pinctrl-names = "default"; + + qcom,din-ports = <1>; + qcom,dout-ports = <11>; + + qcom,ports-sinterval = /bits/ 16 <0x03 0x3f 0x1f 0x07 0x00 0x18f 0xff 0xff 0x31 0xff 0xff 0xff>; + qcom,ports-offset1 = /bits/ 8 <0x00 0x00 0x0b 0x01 0x00 0x00 0xff 0xff 0x00 0xff 0xff 0xff>; + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x0b 0x00 0x00 0x00 0xff 0xff 0x00 0xff 0xff 0xff>; + qcom,ports-hstart = /bits/ 8 <0xff 0x03 0xff 0xff 0xff 0x08 0xff 0xff 0x00 0xff 0xff 0xff>; + qcom,ports-hstop = /bits/ 8 <0xff 0x06 0xff 0xff 0xff 0x08 0xff 0xff 0x0f 0xff 0xff 0xff>; + qcom,ports-word-length = /bits/ 8 <0x01 0x07 0x04 0xff 0xff 0x0f 0xff 0xff 0x18 0xff 0xff 0xff>; + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0x00 0x01 0xff 0xff 0x00 0xff 0xff 0x01 0xff 0xff 0xff>; + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0x00 0x00 0xff 0xff 0x00 0xff 0xff 0xff>; + qcom,ports-lane-control = /bits/ 8 <0x01 0x00 0x00 0x00 0x00 0x00 0xff 0xff 0x01 0xff 0xff 0xff>; + + #address-cells = <2>; + #size-cells = <0>; + #sound-dai-cells = <1>; + status = "disabled"; + }; + lpass_txmacro: codec@6ae0000 { compatible = "qcom,sm8750-lpass-tx-macro", "qcom,sm8550-lpass-tx-macro"; reg = <0x0 0x06ae0000 0x0 0x1000>; @@ -2308,6 +2368,36 @@ lpass_wsamacro: codec@6b00000 { #sound-dai-cells = <1>; }; + swr0: soundwire@6b10000 { + compatible = "qcom,soundwire-v2.1.0", "qcom,soundwire-v2.0.0"; + reg = <0x0 0x06b10000 0x0 0x10000>; + interrupts = ; + clocks = <&lpass_wsamacro>; + clock-names = "iface"; + label = "WSA"; + + pinctrl-0 = <&wsa_swr_active>; + pinctrl-names = "default"; + + qcom,din-ports = <4>; + qcom,dout-ports = <9>; + + qcom,ports-sinterval = /bits/ 16 <0x07 0x1f 0x3f 0x07 0x1f 0x3f 0x18f 0x18f 0x18f 0x0f 0x0f 0xff 0x31f>; + qcom,ports-offset1 = /bits/ 8 <0x01 0x03 0x05 0x02 0x04 0x15 0x00 0x00 0x00 0x06 0x0d 0xff 0x00>; + qcom,ports-offset2 = /bits/ 8 <0xff 0x07 0x1f 0xff 0x07 0x1f 0xff 0xff 0xff 0xff 0xff 0xff 0xff>; + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0e 0x0e 0xff 0xff 0xff 0x0f>; + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0e 0x0e 0xff 0xff 0xff 0x0f>; + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0x08 0x0f 0x0f 0x00 0xff 0xff 0x18>; + qcom,ports-block-pack-mode = /bits/ 8 <0x00 0x01 0x01 0x00 0x01 0x01 0x00 0x01 0x01 0x01 0x01 0x00 0x00>; + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x00 0x00 0xff 0xff 0xff 0xff>; + qcom,ports-lane-control = /bits/ 8 <0xff 0xff 0xff 0xff 0xff 0xff 0xff 0x00 0x00 0xff 0xff 0xff 0xff>; + + #address-cells = <2>; + #size-cells = <0>; + #sound-dai-cells = <1>; + status = "disabled"; + }; + lpass_ag_noc: interconnect@7e40000 { compatible = "qcom,sm8750-lpass-ag-noc"; reg = <0x0 0x07e40000 0x0 0xe080>; @@ -2329,6 +2419,38 @@ lpass_lpicx_noc: interconnect@7420000 { #interconnect-cells = <2>; }; + swr2: soundwire@7630000 { + compatible = "qcom,soundwire-v2.1.0", "qcom,soundwire-v2.0.0"; + reg = <0x0 0x07630000 0x0 0x10000>; + interrupts = , + ; + interrupt-names = "core", "wakeup"; + clocks = <&lpass_txmacro>; + clock-names = "iface"; + label = "TX"; + + pinctrl-0 = <&tx_swr_active>; + pinctrl-names = "default"; + + qcom,din-ports = <4>; + qcom,dout-ports = <0>; + + qcom,ports-sinterval-low = /bits/ 8 <0x01 0x01 0x03 0x03>; + qcom,ports-offset1 = /bits/ 8 <0x00 0x00 0x01 0x01>; + qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x00 0x00>; + qcom,ports-hstart = /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-hstop = /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-word-length = /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-block-pack-mode = /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-block-group-count = /bits/ 8 <0xff 0xff 0xff 0xff>; + qcom,ports-lane-control = /bits/ 8 <0x01 0x02 0x00 0x00>; + + #address-cells = <2>; + #size-cells = <0>; + #sound-dai-cells = <1>; + status = "disabled"; + }; + lpass_vamacro: codec@7660000 { compatible = "qcom,sm8750-lpass-va-macro", "qcom,sm8550-lpass-va-macro"; reg = <0x0 0x07660000 0x0 0x2000>; From patchwork Mon May 26 11:46:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 892787 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00ED01FBCAD for ; Mon, 26 May 2025 11:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260005; cv=none; b=tQ8XcCo7+IYUPmVagsZQg7pbDfc+MhnI0LeP+EcMdksn6ymZ4KnY+km2TK4RGOfKkbqum5/OpAFC+40mmCthw1/g2FGTuJ13/k5u59wZvBWMrCAJ3qjUOV/L2IGS2vo/kRHuI4vVdfu2cQgfkOcn2IlzlUAOsRr69U8t/yZLVPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260005; c=relaxed/simple; bh=cnjqJvhbWuR3WHiIP3fHiQ3G4qGuKG4SN/9SLI6xtK8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ID1Q3/43nBUITQGAYvJNWEfwOSsVC+U5YVjfrqq8vGA2ZvgdgwNpKJGLPER9fNN+nHuCYetjXPlipE3jdnoVz8/i4PfWHPfAZQ7auxQVOzZkLf3Z0ykoM7KgXZf1DmKu1+v/OUqUKj6ibdAPedl4i5/xm2jiWQPx7qwtz44j84c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=n47CxTzH; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="n47CxTzH" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3a4cfa5c8ddso349222f8f.0 for ; Mon, 26 May 2025 04:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748260001; x=1748864801; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=psDhaeHurUBXMj/Px7/tCG96t2UI30PEGCPOuXBbmuw=; b=n47CxTzH+R4E0UjNI+b1FHqwtQs8a2Q4ueKoH7KdK7tz/GMXOzyanQ8xzNlLdySV3c J5QhdD/rxXABiwOwv8ibYxxZmiex9DHPN+weZaZuh+mAYsiOiIej/g7pi8xsgSFG0CkH 8De2cyortzq9GIGapq/isxpHWodXJtPHoeKRQmG7SqUPqMoj5QMdWreMVJUiy4viNuQF UgEQ+sjk6p876JMjkiMtTrEi35LaBnIVWJa9bNZr5B92ScBio/h70r6aq4lq6LykxQCh oCuCXXIIRabUSoPID5anpSXQM/ZroQji1RgnY4cInvhErEH4XO9sDaq2r/vThWSahkv3 5z5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748260001; x=1748864801; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=psDhaeHurUBXMj/Px7/tCG96t2UI30PEGCPOuXBbmuw=; b=iZocZA9I/s+z22z0VIxwp71epLBO7iidgtyuLoE4eIP1yC8p0QunnmiExUJplQla82 7RhizIVreXt0BLBCauzRCOWvj3q+NnplDkfyTUh8LDoXAXeMXi9F6FfKiI5wjc4cN4QY zRYZmLljt6/jXORJZsismKX+1/+oQVBrxzsv0aTU35Dhgr6Usf67UelZ6GDomm5c6PgE kNg2+wSq2zohGMKdSkIDY+M/St7K5xKNhkiwfHUnDjbwkrAxbW2bh4Yez9you82ohJ9W XDzRn1Lt8FBuyUuxk9wYTHjF+2MTSLIagxveSzEFGnlS+/MoFg5u83TZbeg6cbF/ZVl7 xQTg== X-Gm-Message-State: AOJu0Yx7eOeYmhJHtTzggKbKzagGZLpccmkFb9G52gTcypvqF3ro9FFM UQK9nTvN5JpBUZU8l55zhfJnn8z06H+kxy/+rFE328h4SAYYpPDnpaMIb1w3xk+E6/A= X-Gm-Gg: ASbGnctuQ/UAQn3TlScBETMSHWrPI1H1MesTkrZ9ATRUCfPCivHAicWX7RxOGYl/pYS Oz+paOZeiGYSzm30vUHGTfbZ1o1SatBo7kzTYN1Txq2ryoe1SDMa3+FHu/ZFmajJGcjUgNvRosD Y8HDzQCWePytuLHyrWSds16ap5PlWz2A1oovfHwZG67W0MohxplMEO2l/MvDV4fQH5PeWjsBS12 cM7Dg1Qcjn0t6DLuRuVAC/Fgsx3w7NQyHzmd9GaPqmN46hvteIpjYNYBS5CMSL0SWDxVOBLzudn kTqLayPwmAd6b1T5QSxc1I6weO6MyeBE2MVELHUZjIDFcA2ukvTw2QDV8rIYZr9ZlQA+w0M= X-Google-Smtp-Source: AGHT+IG3ZE0rvws+D2qpV4ZtCuSF7sGdmES6L31WDPmRuXu3QrnJEWvMmGOkifczCoIrvklIMggTqQ== X-Received: by 2002:a5d:5702:0:b0:3a4:cbc6:9dd0 with SMTP id ffacd0b85a97d-3a4cbc69e7dmr1931155f8f.15.1748260001194; Mon, 26 May 2025 04:46:41 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4cc52ab88sm7592310f8f.11.2025.05.26.04.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 04:46:40 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 26 May 2025 13:46:33 +0200 Subject: [PATCH v3 2/3] arm64: dts: qcom: sm8750-mtp: Add sound (speakers, headset codec, dmics) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250526-sm8750-audio-part-2-v3-2-74429c686bb1@linaro.org> References: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> In-Reply-To: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6735; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=cnjqJvhbWuR3WHiIP3fHiQ3G4qGuKG4SN/9SLI6xtK8=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoNFSbCEMgROTEV8WFLqQ++C00hAy9yoy+pZanq agaCmBfz/+JAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaDRUmwAKCRDBN2bmhouD 11GhD/97K//+Bo6/3QvwkI4sTsvtB9D/Sft5g3Za2Bu6t6JOk3+NwsiDveKNyk5y3p/gxy70AVy exuk3W8XgEtXxe+NM/zaCrvVY1LpZq44n1rVT0uweeDIfa28R74kTrA7ShuO+p3YWrKQQQjZeAQ GJzdaxMuxe9aLcJa1Swdgc5lG8+OSEwnPhe1ozXPl69TPiFqITJiO5y17dh6ryihiJvFrtcIM0L jsakj9gBduMo3wTbP/AGMKmr7U4yeq1hiT60PsozsJKbobvcxC+0j2Z8jjOo8HMwHlwj21ckCLs TUFEAOkk1zI/++G6BJIVzODFOawH7HM08eaRbTMXlJoRO0SXDLU9PPdARwGALdeb6CopJgvR9Hv hCmKTSRH2xlFg36G2hSxCBJUUzXNKp9WDrLQd3PsrzZ4UWvfzmoGPM18ABBOOSzf+TxaujN7t3n k3Vu421GqlIS/KPnLYt0f1wFgv3w7I13HnSXeuLXLJH4oohbz7sL9Rk3EdEd9pPZGiYX8ZrpeHg Nfeo7f5W40pH3Tvb+XPj12CM+eH1T9hVNtrzCRrusX3CB9hLSXVylBdlSy5NkKaOO3i2BDoZsER 9sulELZFbg18+yT5u8G6hHwi5ciHFwRCsQUmrE7mMZEPnUjdPcnvdoNs7WBopOiUf061TGXkgvP TdSTQhGXRa5HXpQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Add device nodes for most of the sound support - WSA883x smart speakers, WCD9395 audio codec (headset) and sound card - which allows sound playback via speakers and recording via DMIC microphones. Changes bring necessary foundation for headset playback/recording via USB, but that part is not yet ready. Reviewed-by: Konrad Dybcio Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 215 ++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts index 72f081a890dfe49bfbee5e91b9e51da53b9d8baf..a9de383d0dddf5c80aee5e1176501238a4977153 100644 --- a/arch/arm64/boot/dts/qcom/sm8750-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8750-mtp.dts @@ -29,6 +29,33 @@ aliases { serial0 = &uart7; }; + wcd939x: audio-codec { + compatible = "qcom,wcd9395-codec", "qcom,wcd9390-codec"; + + pinctrl-0 = <&wcd_default>; + pinctrl-names = "default"; + + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + + reset-gpios = <&tlmm 101 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_l15b_1p8>; + vdd-rxtx-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l15b_1p8>; + vdd-mic-bias-supply = <&vreg_bob1>; + vdd-px-supply = <&vreg_l2i_1p2>; + + #sound-dai-cells = <1>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -81,6 +108,89 @@ key-volume-up { }; }; + sound { + compatible = "qcom,sm8750-sndcard", "qcom,sm8450-sndcard"; + model = "SM8750-MTP"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "AMIC2", "MIC BIAS2", + "VA DMIC0", "MIC BIAS3", /* MIC4 on schematics */ + "VA DMIC1", "MIC BIAS3", /* MIC1 on schematics */ + "VA DMIC2", "MIC BIAS1", + "VA DMIC3", "MIC BIAS1", + "VA DMIC0", "VA MIC BIAS3", + "VA DMIC1", "VA MIC BIAS3", + "VA DMIC2", "VA MIC BIAS1", + "VA DMIC3", "VA MIC BIAS1", + "TX SWR_INPUT1", "ADC2_OUTPUT"; + + wcd-playback-dai-link { + link-name = "WCD Playback"; + + codec { + sound-dai = <&wcd939x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name = "WCD Capture"; + + codec { + sound-dai = <&wcd939x 1>, <&swr2 0>, <&lpass_txmacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wsa-dai-link { + link-name = "WSA Playback"; + + codec { + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + + codec { + sound-dai = <&lpass_vamacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; @@ -702,6 +812,14 @@ vreg_l7n_3p3: ldo7 { }; }; +&lpass_vamacro { + pinctrl-0 = <&dmic01_default>, <&dmic23_default>; + pinctrl-names = "default"; + + vdd-micb-supply = <&vreg_l1b_1p8>; + qcom,dmic-sample-rate = <4800000>; +}; + &pm8550_flash { status = "okay"; @@ -806,6 +924,74 @@ &remoteproc_mpss { status = "fail"; }; +&swr0 { + status = "okay"; + + /* WSA883x, left/front speaker */ + left_spkr: speaker@0,1 { + compatible = "sdw10217020200"; + reg = <0 1>; + pinctrl-0 = <&spkr_0_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&lpass_tlmm 17 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrLeft"; + #thermal-sensor-cells = <0>; + vdd-supply = <&vreg_l15b_1p8>; + }; + + /* WSA883x, right/back speaker */ + right_spkr: speaker@0,2 { + compatible = "sdw10217020200"; + reg = <0 2>; + pinctrl-0 = <&spkr_1_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&lpass_tlmm 18 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrRight"; + #thermal-sensor-cells = <0>; + vdd-supply = <&vreg_l15b_1p8>; + }; +}; + +&swr1 { + status = "okay"; + + /* WCD9395 RX */ + wcd_rx: codec@0,4 { + compatible = "sdw20217010e00"; + reg = <0 4>; + + /* + * WCD9395 RX Port 1 (HPH_L/R) <=> SWR1 Port 1 (HPH_L/R) + * WCD9395 RX Port 2 (CLSH) <=> SWR1 Port 2 (CLSH) + * WCD9395 RX Port 3 (COMP_L/R) <=> SWR1 Port 3 (COMP_L/R) + * WCD9395 RX Port 4 (LO) <=> SWR1 Port 4 (LO) + * WCD9395 RX Port 5 (DSD_L/R) <=> SWR1 Port 5 (DSD_L/R) + * WCD9395 RX Port 6 (HIFI_PCM_L/R) <=> SWR1 Port 9 (HIFI_PCM_L/R) + */ + qcom,rx-port-mapping = <1 2 3 4 5 9>; + }; +}; + +&swr2 { + status = "okay"; + + /* WCD9395 TX */ + wcd_tx: codec@0,3 { + compatible = "sdw20217010e00"; + reg = <0 3>; + + /* + * WCD9395 TX Port 1 (ADC1,2,3,4) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 2 (ADC3,4 & DMIC0,1) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 3 (DMIC0,1,2,3 & MBHC) <=> SWR2 Port 3 (TX SWR_INPUT 4,5,6,7) + * WCD9395 TX Port 4 (DMIC4,5,6,7) <=> SWR2 Port 4 (TX SWR_INPUT 8,9,10,11) + */ + qcom,tx-port-mapping = <2 2 3 4>; + }; +}; + &tlmm { /* reserved for secure world */ gpio-reserved-ranges = <36 4>, <74 1>; @@ -814,3 +1000,32 @@ &tlmm { &uart7 { status = "okay"; }; + +/* Pinctrl */ +&lpass_tlmm { + spkr_0_sd_n_active: spkr-0-sd-n-active-state { + pins = "gpio17"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins = "gpio18"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; +}; + +&tlmm { + wcd_default: wcd-reset-n-active-state { + pins = "gpio101"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; +}; From patchwork Mon May 26 11:46:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 892786 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 358481FCFFB for ; Mon, 26 May 2025 11:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260006; cv=none; b=HHdJrLYLHjBPboADc9qk6z0zZBOGEyxSZlmMiGrEJBBhNY6rD0O5J8fmVXNy6hI+Nj3KKCbacxt1gfCmoFQphw8HCtyw7W8zxgUp0WtKaTkjP85u1cwKOugHx12counje8/8cY83P7jbWB6DpwWqMl3HKZRo37M5m6wnZTewQyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748260006; c=relaxed/simple; bh=bJ6lGifQIT+ZBeucSknj2+MyaK1F5NGNsJWUqaVzyVA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VIFDnUqkCh9lOdbFbumW6dko4A40marzPmJgRhUNU7N4EeegiaidzPXu1gXVIBg7rGor9CrXKFAnak6Usvrpih7+fh56q96Gngk69bqwx/3KwHHxPBFn9XCWMwTYyPFe6N+Q4UGRP/QkPEEgUdojat506cw/pp2Otk2nuBKrzDk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ZbZV9sRz; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZbZV9sRz" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3a4db4d1bd7so104604f8f.3 for ; Mon, 26 May 2025 04:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748260002; x=1748864802; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=EcC6/D6bHu1AIqqOOrM3yvR9MZ9pTE9S6Us8vaRlrZg=; b=ZbZV9sRzvmajuzrl7k4JGIroRveOzCzyQ0/ncsMUuTcIoyAxgk2LYntIXnufZX3nxn df4gh9ghGH7F9SczulT7eNvDxO3cbUwqGLDSNkNhRTHiwWCRO3VM6TKpuzdrP3E+oJtB CPZHmS7fUDQD07DrASxjAtVwfnvSwzsfyy9yhnqJzphqqbp7EF5m8cDgqrzdMald+EcF HfGNbm7YYQfRkXJvRI6OesEZpEYKOE+N52PWUiTHTlF2RjmpopYBgzR+Tmieyy5cOeF2 2y5CecJSnR8JYbHfaWGuuD2iqL4gW8iWAF7pCvNIU8l5x4RGepl0QguofKAaM+z+PTN9 ZIfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748260002; x=1748864802; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EcC6/D6bHu1AIqqOOrM3yvR9MZ9pTE9S6Us8vaRlrZg=; b=GU1TaHdXn93Yms13CTtn7XlTQ6W1LAl+u3fEs7YlWz0QNw7+B/94CEVUSYXFs7knKx 1GJ4Uv8vS3pS1LR1GOUrOKSruork05LOMtMylgbNh2qPO7ARVs/iSeRZ83VMC7Wwa7kh iBQ9pZWzzHd0iPF+ZsoAQjab70+1nzCvHzmBBVZs9v7s/1W/baXokRIUOkZJiWTtn/EH jTUh5HhsiCQzrW5qD+rPIeqgj3Q2gC3VONnejjHt5G8V2FhT4z9PEEdwmiuJsDnx23z0 g+dXl2fdWC6Bv5arawhWZBVIzOLxei2w8eQTt1U+amnTtdE/8h0rYw/yzLVeNnxJ2DE2 qoCA== X-Gm-Message-State: AOJu0Yz5Y91g8EIWfVcn9PRBNeVOodN89ZmbagA8woTZMsrT5zE7aGpK j71cZ60J4kym7HlfZBOAQmt+oSbiupjhd3OjkrRtrvk2zLhLL8sKCxTKEng21eSBSsE= X-Gm-Gg: ASbGncswf7DYakkhkeuYEjnBYJ6eG1P424S9UVqUWL6fkrx4eUNJGtlVibBPtEVhwl0 JUjfg1NG3V81Q7VchMGGmjZ1B7vAfSXD+xd+J6FIEK9Rfu1Dr42uoSKwctb6rXqkYxN3dnrQAYE 3dBUGaIyuRNrK+6NzJUcEiYUaZMJ2N2/FgvF+N3TLqajULVV0Sl5u7q0/qYhviCWJz+rLKwTyyv MzX+sVBMJTpaPPZkTbwy2mW5CvRhyLD8R0IhoZnwhlc8HJIb+tpGD80HNcpppmmFnsn1lE2/Vcd CEYieanjbsONwQ1LNA60An9ZRevEfvv5cyxipDmV48uMwSwpvy1uq1d5z+Ya5B+0W1d/uZU= X-Google-Smtp-Source: AGHT+IE0VI5ghBpvpoBulLaSxnAC+korsgJE7w7jptTWZA/tLkhxL5lFocuc3k1VVPc3L4llWsMmcA== X-Received: by 2002:a5d:5f8b:0:b0:3a3:6a3d:163a with SMTP id ffacd0b85a97d-3a4cb483096mr2280103f8f.12.1748260002407; Mon, 26 May 2025 04:46:42 -0700 (PDT) Received: from [192.168.1.29] ([178.197.223.125]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4cc52ab88sm7592310f8f.11.2025.05.26.04.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 04:46:41 -0700 (PDT) From: Krzysztof Kozlowski Date: Mon, 26 May 2025 13:46:34 +0200 Subject: [PATCH v3 3/3] arm64: dts: qcom: sm8750-qrd: Add sound (speakers, headset codec, dmics) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250526-sm8750-audio-part-2-v3-3-74429c686bb1@linaro.org> References: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> In-Reply-To: <20250526-sm8750-audio-part-2-v3-0-74429c686bb1@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7176; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=bJ6lGifQIT+ZBeucSknj2+MyaK1F5NGNsJWUqaVzyVA=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBoNFSchHytWbez+Qd8A/hVJjiW13w2q5aDOwFd6 uTHP0TPkRGJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCaDRUnAAKCRDBN2bmhouD 18uZEACTnKznZ310+iR7yhsCg+Pl+vPpDx3nbZeLGf6NGo0Exkzjiz68q2KeESj8DZAFys4cBtG DoxhAnrRKD6BD3GhtNFx1qJPN0njCh5MhF3415NBmWC2hvP2bEdyh6sJeMY1Z4n3NJWdFnLNp8x NeLh4gb9pcGPWHwI+m423bY3v1kAT56U35qnHlFYvtJPnSLr5gXsgKKx9nt6VJy8nxm8IIEGDhU Cd9DRvhS15urPZPQRdJL8K6KLJFqvbV/IKCJRC6bGZoArjNuFbqZUJxTPVUNtcDfeivjflOzDZj gXmh9KqbT0QzcGaCxEYygyHMrGm5GRHp7Q8MnxfNKYavVFimgrQ5hARibE0HIzFS/izjvwsrbw6 Ybp+1/f+2CUUk1/eK9UaP88OpmqTwvvho9WNA/HmL1LEBPc3MeL66E1xncBj/8BelN8kp3gC+YQ A6GOXs4bbERU/ZWg9q97WDPnpRBSj/4oxu7jG3VXxZl5EQ20Gz2GMATaNsCPABqTe7SM6cS3M5q a7D2jCeSRkisC+n+xUQorwLnZOh5h7yf9OD3SegL8d4ApteWl/XOEm/BFx2lbzx9gtgHHKQuV7u eBU1X8NlIdgWpZnOCvdwp1/zGov9a2GSSImQu/8+mYIr0JRTLzvQbtzc0ZLJKx8FuQmdBLVsBMl 1KxFkY7Aqpw72wQ== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B Add device nodes for most of the sound support - WSA884x smart speakers, WCD9395 audio codec (headset) and sound card - which allows sound playback via speakers and recording via AMIC microphones. Changes bring necessary foundation for headset playback/recording via USB, but that part is not yet ready. Signed-off-by: Krzysztof Kozlowski --- Changes in v3: 1. New patch --- arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 225 ++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8750-qrd.dts b/arch/arm64/boot/dts/qcom/sm8750-qrd.dts index 840a6d8f8a24670a01376f8fce511da222159016..87e983a5c0e9b82487196adc3b50cc314b6ed0e6 100644 --- a/arch/arm64/boot/dts/qcom/sm8750-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8750-qrd.dts @@ -28,6 +28,37 @@ aliases { serial0 = &uart7; }; + wcd939x: audio-codec { + compatible = "qcom,wcd9395-codec", "qcom,wcd9390-codec"; + + pinctrl-0 = <&wcd_default>; + pinctrl-names = "default"; + + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + + reset-gpios = <&tlmm 101 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_l15b_1p8>; + vdd-rxtx-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l15b_1p8>; + vdd-mic-bias-supply = <&vreg_bob1>; + /* + * Mismatch with schematics - downstream DTS has L15B at 1.8 V, + * schematics L2I at 1.2 V + */ + vdd-px-supply = <&vreg_l15b_1p8>; + + #sound-dai-cells = <1>; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -80,6 +111,88 @@ key-volume-up { }; }; + sound { + compatible = "qcom,sm8750-sndcard", "qcom,sm8450-sndcard"; + model = "SM8750-QRD"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "AMIC1", "MIC BIAS1", + "AMIC2", "MIC BIAS2", + "AMIC3", "MIC BIAS3", + "AMIC4", "MIC BIAS3", + "AMIC5", "MIC BIAS4", + "TX SWR_INPUT0", "ADC1_OUTPUT", + "TX SWR_INPUT1", "ADC2_OUTPUT", + "TX SWR_INPUT2", "ADC3_OUTPUT", + "TX SWR_INPUT3", "ADC4_OUTPUT"; + + wcd-playback-dai-link { + link-name = "WCD Playback"; + + codec { + sound-dai = <&wcd939x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name = "WCD Capture"; + + codec { + sound-dai = <&wcd939x 1>, <&swr2 0>, <&lpass_txmacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wsa-dai-link { + link-name = "WSA Playback"; + + codec { + sound-dai = <&north_spkr>, <&south_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + + codec { + sound-dai = <&lpass_vamacro 0>; + }; + + cpu { + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; @@ -803,9 +916,121 @@ &remoteproc_mpss { status = "okay"; }; +&swr0 { + status = "okay"; + + /* WSA8845, Speaker North */ + north_spkr: speaker@0,0 { + compatible = "sdw20217020400"; + reg = <0 0>; + pinctrl-0 = <&spkr_0_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&tlmm 76 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrLeft"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l2i_1p2>; + + /* + * WSA8845 Port 1 (DAC) <=> SWR0 Port 1 (SPKR_L) + * WSA8845 Port 2 (COMP) <=> SWR0 Port 2 (SPKR_L_COMP) + * WSA8845 Port 3 (BOOST) <=> SWR0 Port 3 (SPKR_L_BOOST) + * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR) + * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 10 (SPKR_L_VI) + * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS) + */ + qcom,port-mapping = <1 2 3 7 10 13>; + }; + + /* WSA8845, Speaker South */ + south_spkr: speaker@0,1 { + compatible = "sdw20217020400"; + reg = <0 1>; + pinctrl-0 = <&spkr_1_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrRight"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l2i_1p2>; + + /* + * WSA8845 Port 1 (DAC) <=> SWR0 Port 4 (SPKR_R) + * WSA8845 Port 2 (COMP) <=> SWR0 Port 5 (SPKR_R_COMP) + * WSA8845 Port 3 (BOOST) <=> SWR0 Port 6 (SPKR_R_BOOST) + * WSA8845 Port 4 (PBR) <=> SWR0 Port 7 (PBR) + * WSA8845 Port 5 (VISENSE) <=> SWR0 Port 11 (SPKR_R_VI) + * WSA8845 Port 6 (CPS) <=> SWR0 Port 13 (CPS) + */ + qcom,port-mapping = <4 5 6 7 11 13>; + }; +}; + +&swr1 { + status = "okay"; + + /* WCD9395 RX */ + wcd_rx: codec@0,4 { + compatible = "sdw20217010e00"; + reg = <0 4>; + + /* + * WCD9395 RX Port 1 (HPH_L/R) <=> SWR1 Port 1 (HPH_L/R) + * WCD9395 RX Port 2 (CLSH) <=> SWR1 Port 2 (CLSH) + * WCD9395 RX Port 3 (COMP_L/R) <=> SWR1 Port 3 (COMP_L/R) + * WCD9395 RX Port 4 (LO) <=> SWR1 Port 4 (LO) + * WCD9395 RX Port 5 (DSD_L/R) <=> SWR1 Port 5 (DSD_L/R) + * WCD9395 RX Port 6 (HIFI_PCM_L/R) <=> SWR1 Port 9 (HIFI_PCM_L/R) + */ + qcom,rx-port-mapping = <1 2 3 4 5 9>; + }; +}; + +&swr2 { + status = "okay"; + + /* WCD9395 TX */ + wcd_tx: codec@0,3 { + compatible = "sdw20217010e00"; + reg = <0 3>; + + /* + * WCD9395 TX Port 1 (ADC1,2,3,4) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 2 (ADC3,4 & DMIC0,1) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 3 (DMIC0,1,2,3 & MBHC) <=> SWR2 Port 3 (TX SWR_INPUT 4,5,6,7) + * WCD9395 TX Port 4 (DMIC4,5,6,7) <=> SWR2 Port 4 (TX SWR_INPUT 8,9,10,11) + */ + qcom,tx-port-mapping = <2 2 3 4>; + }; +}; + &tlmm { /* reserved for secure world */ gpio-reserved-ranges = <36 4>, <74 1>; + + spkr_0_sd_n_active: spkr-0-sd-n-active-state { + pins = "gpio76"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins = "gpio77"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + + wcd_default: wcd-reset-n-active-state { + pins = "gpio101"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; }; &uart7 {