From patchwork Thu Jun 27 12:57:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13714342 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 0EECC17965E for ; Thu, 27 Jun 2024 12:57:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493046; cv=none; b=Sv48Vpm0PDT4vwZsDFWLwpetE+iVur79p4qrS3tFqYBb60JMZ8Z7gsg06Ka50Kbs+sawnFdFetnht8raDWaSel1lzIxPmZ2FB2NSZoSYXiEEgGCPiTt7xEE6+5kIl9CfwMfK/W76Z+Q/OWRNCxGCIdyIAtu4s6xb9ZxFFSfFJPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493046; c=relaxed/simple; bh=qk0AqVYhSWDWjHHJE1wLcilj6w7ry61qK4waqocNLII=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VCwVgPu5gNGpsaBhXgju2oPp07AFnOP13ieNjojwD0WQAai+/UdmRDAk6+aUNKXSbrAFK1bKqKF9Hqiwg/ROThaOUD2kFX+YwySeKasxaROHnDm0zApmFEWyKLxcpsAXUpPY1tYaj3+9fNZyJcvkCrLkGk2d5xEPd3XNvFyfoyA= 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=Igh5UJZR; arc=none smtp.client-ip=209.85.221.53 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="Igh5UJZR" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-362b32fbb3bso5020805f8f.2 for ; Thu, 27 Jun 2024 05:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719493043; x=1720097843; 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=pKjszb83CsEYX7PAp5HEuYs2y4v1+lep4AAiRj0YQNs=; b=Igh5UJZRXclIwntSXUcD8rw/6E/PuTczxyIl4WSJPbjIKOw+Ncsh8DH4IjtCGxto+j lDn3dkyzrddXs27f326440RcnpDctwYJyQLaUyBzNLYXRpf+e6zLpRhsS6zqWVsoePEv Mx7VqEmbX5rdWRqVtOFYU7Qn+6D7fv22v/pjLvpCR/ZLllSoInkV90ELm4n3fSqX6eQq jSb2WUTTPqAw2lx+K+o8IXOpyS0Kqr/UccOsQuPfPMZabNRCSYTmLpPsjVg1c/LiFCsd gxvnyun7I/M4sh2my1TLHm/UtfufKASBru9HK6lavvzoHAOKLyl50Jv/0pGSsGig5WYn rRkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719493043; x=1720097843; 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=pKjszb83CsEYX7PAp5HEuYs2y4v1+lep4AAiRj0YQNs=; b=TNbwauPQ/i0MndbdOBRuBIg373eBBCa2e/bsRQwpKeCWCrS7YXEcZSl0eoh1LwHC/v X9LVzAqsh/ycBnkKLR+rjEfzY0WSvvXsf6ZwVlUiXOOUwef005IOlBtYY/IDYCdJ9G7N G9oPu2xUU9N1A+GxA0yoFgn1tvqh7Q8N01taMd4wYMYcWMvSBTbr9vHuuGqGG4hnX6o5 1bBFXoxKM1Xe0a8X11pw/80DgIw84cTxC/Pu5eWzBF3d1sAosYQHJS/psOWJoA/HTD1R Zqj+IUZndYwf9kFE8G3RvmtpWNXkZEPeKtTl+kfil9ZGENCc3DNpMppIDaQNQhUqURAI 8Arw== X-Gm-Message-State: AOJu0YwlGSXeM/R5+t0AmM2fL7EzbwKfKi565ShCdXN+bmSc/n3yYi+9 0wlhFVLo9N9wXGTEuJUxWUeE8WFelu0aKc0mNK0DBHBty0O1t/x5B1iifvnn0DY= X-Google-Smtp-Source: AGHT+IEMNQfSOqY7Yqb2X0OTu+FbXJzDzz+qP4cl0us/udj2+A4BUzIOsmirGNMU4TCfcEsjE4+zGQ== X-Received: by 2002:a05:6000:144b:b0:366:f2c2:61f5 with SMTP id ffacd0b85a97d-366f2c263a8mr12349854f8f.52.1719493042978; Thu, 27 Jun 2024 05:57:22 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3674357fcecsm1800752f8f.26.2024.06.27.05.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 05:57:22 -0700 (PDT) From: Neil Armstrong Date: Thu, 27 Jun 2024 14:57:14 +0200 Subject: [PATCH 1/3] arm64: dts: qcom: sm8650-hdk: add port mapping to speakers Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240627-topic-sm8650-upstream-was-port-mapping-v1-1-4700bcc2489a@linaro.org> References: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@linaro.org> In-Reply-To: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@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, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1743; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=qk0AqVYhSWDWjHHJE1wLcilj6w7ry61qK4waqocNLII=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmfWGwkGSglCHpAG6WBO2cCw1YuI0WLdXBmA8Pew3/ V40mcEiJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZn1hsAAKCRB33NvayMhJ0WHZD/ sHRk65mAh0FmWnplGquaJWy16ZT3uYAoviIFvUcjLiw6Ks5khebXA/3x8CoWxKHzHwOUHj0sDdgGvD lODibu2xOpepNS244Zp2joDdLt8ByQY9ip6Vv5PwkVMZeD3gbUdTgNNSu1D243gcOk43R8IbVR7cuA M++HQ860L5EE1dbyFrBkBMqo27EtOFVqrMM34x91R7Qnq4gQ0q9Eeb1evaEUTKdWp3+ijqBw90/Mqu K1enAbEgS4BNR/4ILaO7yVff2OXbPsotXjkgI18BHeesBSBe3HpyMMnlrY+odkp3zlW99zzkm//rs3 pmNNPzcMqODs9SHetZvekIfxC/SiXBLB6XC5F+bRfyXAPOI+BVFTUTbfJdc5yDNnmv8Pq8ZlLvbFTe KRaYJUsgTPTI8FnDBlFAky9Ti+1nQZFWT0sKtgVwnio9pnzP+hOx0t3B0ZWg35K7hbuzGjWjBI+vKx fuyYLv96nS9XFCCjByJbZ9ur/YnR/Vz4wYj7vu++rDFqKE26KjC+pUWgVBtLD0j1qhaQTaiXKVSWXB oeORF36KaRs42H5SlA1AYW4VHeEpXJepKyVVJtCTyAFLfM4lNK5+lZLuDe8UcZNtSsooZJUGnHHYnr tCdznv6q/jhz6XkWra8AFAhVkIjRHmOKFRTBVd6dxjts63lJqHzsHDNHAxOA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Add appropriate mappings of Soundwire ports of WSA8845 speaker to correctly map the Speaker ports to the WSA macro ports. Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts index eb2f910b4f58..591e6ab9bf5b 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts @@ -1137,6 +1137,16 @@ north_spkr: speaker@0,0 { sound-name-prefix = "SpkrLeft"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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 */ @@ -1150,6 +1160,16 @@ south_spkr: speaker@0,1 { sound-name-prefix = "SpkrRight"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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>; }; }; From patchwork Thu Jun 27 12:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13714343 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.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 48CD217BB11 for ; Thu, 27 Jun 2024 12:57:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493047; cv=none; b=jCrSPFW3JF+ny9XY9degnLThGhfGe8U3iigPSg2yVJkRy18tH7LNQ4NldjB3LMqorNxaafzIytCt1vTLUQBfk4v0vTN5OXR78FhQSX+y7SoqAUfX6/GjJRpdQybAWpMpd7T4hcxdm2swpsWQAFgjA9OT5PiMgMWrGxvA2S+whgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493047; c=relaxed/simple; bh=PnZ4A6lE1NKKtqh+tk7FmZuOCHNuJgNobgQ12ZeKfEk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UO2azuXMPG/thBWXp4kBJEc9vh0PMoYTA/iQ6MgFf0thabsmX3WxccQp16gBTszD4vX9gKbyxEEIfNRHs0e20EH0W4fgVfKhg3qlExIrAvXGGLa1nMDtQhe6DL+RjhOsM9Wpz4SAwfD1Ixyzb6noaydpiAhLOIfzmgTkdUGLDAU= 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=eTPSaGQm; arc=none smtp.client-ip=209.85.167.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="eTPSaGQm" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52cdf4bc083so8324968e87.2 for ; Thu, 27 Jun 2024 05:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719493044; x=1720097844; 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=oH6y1W05QvkpADQypriHH+zyjk8fNo4r5NhWJ1Z3yZY=; b=eTPSaGQmxvqTwKGi8mIJtuhqwDzEz6WEc1UDsZw5Tj2IcNIZwK16cKXT/CHvb0oET9 ZbeZ9GX6TwGbP2baitW1yVcaD9BHr1vVxYYvg1TqyCRrWfnE6hw0/Onho2Fo0+XaU4TR 4I9MWNxpBHKAzL2rtxvJIRMbfE9fa0k0U52MiVvRiOlY/VlLYz4kBs8LS+e1aq0oI1aW G9PBEm76jOlg2PNolT07p7A96jHPQC23ZjhsQI+/R3V4LLHLK1RAQFzTXb9HUfriFmkT H3XoAxl7jhTlq0Tifv+FRSdqDjVHf7nLnO5XLz6x6lWS2cra184BYHiUvLj9pfg2Hgch CNQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719493044; x=1720097844; 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=oH6y1W05QvkpADQypriHH+zyjk8fNo4r5NhWJ1Z3yZY=; b=cJqCvx6NEwdem/YP4av6sxzJcqKxCkGFZA10RxdwFggmd1tbHxkrRiQiKdsY3WmZiZ gNTS+hyPKsA1Bbc6ZBQ5YqHvBFTNxqm6kEDMyWx8UkR0rXSy/V0WpkvY7nkgsnpfHkra Yx9bf7htcVYRPMNlnFY7fH31UWNZSNIp7ROFNnb7G80nqKf1+A8xEDEoE5bbDmGjcvho NrAKMevGKx8GVJWSDmJezdY6LGH9ElRAIHDCGperHNK+TJqZibE9JwdqUvNaOG+M/r01 M5+6p8ahKPdTK40w4twCA8wVyISuusMjuC2dS4yG6WdGHMxFkJM2c/V8VvMgN/P1IEyD Muyg== X-Gm-Message-State: AOJu0YxyLiXKTV9bcfU2b5vRIKoaXYDmm622XVFOyouP1SZEqHrVjPeq 5vFrjWsOZ/r9dKTAI7yaXuu73OYJCx56sAu8WTWkFAVt3J5HPD1i5SBqeTaPzYM= X-Google-Smtp-Source: AGHT+IF3PqgfFJ4Rk+ejoDF5sCo4WkTC3CbhAPa4rp/+ID8u32Ssut7uZHSxndMoNFg1vE4SM3zz/A== X-Received: by 2002:ac2:495c:0:b0:52c:90ba:9705 with SMTP id 2adb3069b0e04-52ce0641504mr10638278e87.49.1719493043912; Thu, 27 Jun 2024 05:57:23 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3674357fcecsm1800752f8f.26.2024.06.27.05.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 05:57:23 -0700 (PDT) From: Neil Armstrong Date: Thu, 27 Jun 2024 14:57:15 +0200 Subject: [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add port mapping to speakers Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240627-topic-sm8650-upstream-was-port-mapping-v1-2-4700bcc2489a@linaro.org> References: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@linaro.org> In-Reply-To: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@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, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1738; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=PnZ4A6lE1NKKtqh+tk7FmZuOCHNuJgNobgQ12ZeKfEk=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmfWGwAJ3VImKrhPTc13jb7J4P5V+GE63AMtN5bWP6 MhzwVIKJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZn1hsAAKCRB33NvayMhJ0U+vD/ 9Gi99bNIcYBb/+M2VlI3rWygIsrFr4TY1LvogiDM4ABvxTyXPwaSf4aTofk/7FTDb6gBzHSbzrC6js His35GVV0piuTglit3dIGnegHMzMlaEBfY3gTPW8TPHcMas+HpzrNXQEZXQ3KK0zXC4DsJipzRmobw m8bc0yFTbBnI2kgAF8sHqwDNr9ECqmaMdLy1HehwyqE79k/TutxhzHOdlGQ5jReZ7QYdgpI/8i0/Ie yhOtVca0aH2FCcuCVeo/aYHJ/4q4K4grQQ2gS0Lyq1YzyNEAV/s7YloOa55kRktMNBJCf5vyZrSn6M L8pwAf+38NG93g9sYcZ0vdxnykv9Mi0x7YRABEcPduN7/sSGpe3n6EcNg3ONzw3Nm3XoNcQ6VgL/dl 1y3O6OAI7lMvtsiPF8696O9TWMujcMBU31pq5OJrd5S1IKA45yX1a4sUhp1tMm2zvYvMXFSZ6SBU6z DCSnsJlgcDQSAmWLk/DPnLN1RzIFJkRP/c5cnP5QfA4avP7TCCemb+aRf8IO6kP5PhUHrvD5mhiT44 HjL93PVRX0UszfiveiWX2PPkEtPiA5AR7gciZY9Tx42EOe/gNpTg//9nb+0h5EZuN3pyBlDjhlH+wn Qkn2QpI+7Sp0ORHFmqIw0DzpauDlFc1Uizj9S+FeoRBHrac0xKqG95MeRMkw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Add appropriate mappings of Soundwire ports of WSA8845 speaker to correctly map the Speaker ports to the WSA macro ports. Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts index fa6c3b397f2d..c63822f5b127 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -751,6 +751,16 @@ left_spkr: speaker@0,0 { sound-name-prefix = "SpkrLeft"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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 Right */ @@ -764,6 +774,16 @@ right_spkr: speaker@0,1 { sound-name-prefix = "SpkrRight"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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>; }; }; From patchwork Thu Jun 27 12:57:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13714344 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 C5B7717E8FB for ; Thu, 27 Jun 2024 12:57:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493048; cv=none; b=sqAgXKSKa/BNsVUterq2HWQiN3FrzuijYzt3oOYB6u7ghDGVhfA2DqYcV0pPSOxzk/+R4Qqn3qXcgdsIAwcwvFZTXgXVH/wASWFi/Tdlcq8bveWjXnsg1Mnnb9GJNwkUOwyH4Ue4yn5eBlmQsjeEMbGV3zmH+3smbeeWbQQOUx0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719493048; c=relaxed/simple; bh=NyS3TLZdFohVfLQ5bqtioaXNOjd/oLz6cpJ7e11ZJ7U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t4YTIxT6jeL1/gdRf7SZInsqlELrVi7kBxLEH8+YWFGo5OZndxAaOe908Nzf8q7KONnVuTgx25Xpm1XE0aQdQ9xNlxuT4FKX+wvQOmpLV7bKSA0TGDXxNxRUjGxXM/eh/h9+e1WX4fsSbTRhXUUujz74OPuqok0FRqjetKdMgYk= 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=rHChTwNA; arc=none smtp.client-ip=209.85.221.45 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="rHChTwNA" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-356c4e926a3so6924341f8f.1 for ; Thu, 27 Jun 2024 05:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719493045; x=1720097845; 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=Te6g76k8XNkEaZHqMN4hQzbVVFxq2CbJOANJNvJMA+w=; b=rHChTwNAwEgYdw0OG3LW66N95OHxH6baL/u1XKNaSBEX/UAMjRxcP2m/+4IegV040q DdOR/fbWvLIbP9/rT01GoiSLY6qavZ4K8vYhrN2whoeSiTWMi8qKG1VwKapKFi+TX9eN RE1H32xAufRPFc6xJIHvDSK8rc1dBWlxFHU6YI0aacZMvqsOaUkBuPUXapbHp/f7TFKp hBkCjoE/1VDblTj+7m/cd/d5oYzsXJ/WsMcfog/5iu4qXqTMLu1cie6Kvpl7058HsdU1 imf8MnQQsWZVBjgmi1EydvWkMxbOGWYaO70XO8Lhpb4EaOVq5MfMIDDKnZmXNQWTLO1C /LuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719493045; x=1720097845; 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=Te6g76k8XNkEaZHqMN4hQzbVVFxq2CbJOANJNvJMA+w=; b=rg/ewe6x4gdeYacfqBLIUGCCNJ+JW+ZoKr+yYbbnHOIu+BFjUG5zgDdzXCAanld97+ DnwBFiQYkuOmpVFYFyPW1nCFlftS+gWIy9WnB31obLf6ghHaEaa5s0jGTZ+6FwSb7w+4 lt6P5Zp6tmxL4p9NPi/HH/LkW6lwvJRj4TvwPUwBzpZi7duApBiEYUtxefVICcsuM1xT m+VZOL3GOY9U5vZtbib3KbRgK5UtL2XVyfK6nIj/3a8nlMm4EDeniU0qh+63Ly9qMeVN PdcRxQeOtZhIJOQyZyq8oolBte2yHo6w+/Q7ueuIFNl3whgWF8uKFgpMYounxLm+gxd/ ElYQ== X-Gm-Message-State: AOJu0YzZ04PI1GOrC0xq2rgzp2iu3WTykDzfp9jyWMvets0cJcu4Dkf1 3V31qIiklAHPtAlbo+cmoT+noRoKaFH4anmdq3z3KXuS+PRbuT0pNeMcVeAdgrI= X-Google-Smtp-Source: AGHT+IFBnAk/qN/L3JWjCwHZN/xfyMXbj6Qd6jXyAHhIu3H2hS3NCKaHjU/ZqsHMpoDfIu2ZxGcesQ== X-Received: by 2002:a5d:5f8f:0:b0:366:f41f:8cc7 with SMTP id ffacd0b85a97d-366f41f8d56mr9555673f8f.46.1719493044795; Thu, 27 Jun 2024 05:57:24 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3674357fcecsm1800752f8f.26.2024.06.27.05.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 05:57:24 -0700 (PDT) From: Neil Armstrong Date: Thu, 27 Jun 2024 14:57:16 +0200 Subject: [PATCH 3/3] arm64: dts: qcom: sm8650-qrd: add port mapping to speakers Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240627-topic-sm8650-upstream-was-port-mapping-v1-3-4700bcc2489a@linaro.org> References: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@linaro.org> In-Reply-To: <20240627-topic-sm8650-upstream-was-port-mapping-v1-0-4700bcc2489a@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, Neil Armstrong X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1742; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=NyS3TLZdFohVfLQ5bqtioaXNOjd/oLz6cpJ7e11ZJ7U=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmfWGwOJO9+ISZb4i5cZ9u+tTfMObpcRWR5nBDMMS9 oSn5o8KJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZn1hsAAKCRB33NvayMhJ0UMnD/ 0Rpuro+D1aA8cM4/FNDFr2dRklfDJDjISR9dxszySGW1J/7E0jO54HEbwZmtXYBSB2Jclu533WMB+u JF/ZBlFyo2TxUnIu+2P5RMYeoQUFr2B7fDG8aM3ROQw9MjnO1TOb3lYVJcKjSyL58Pl+F6Z8NNyS8b VAb3N3CeSrTpaITIkpMYNcLo9rgKFXxD/8/J6yMavlfKPY2MQEtPBvIZ8WOwKwI3n2tGhSqHD5qZ+L 9Mik1uwBpeAthGtEPRvaGHWOEkUS+PnD+adqLm6yv9qhbBQRcZkxABGa8dxMf0ktGD31+2F7E5WiPn h1LsC1y3/KIB/6G12QQUnVbmsw4Yx7yveirKR1u9isQNqVD0QFVC+eZmL8rjd9JQJhv8fAuA7hkCdf TsgIhIrZCE2UcqUkZJaRUxuujgBOmxk6MYEQ4XFxK1UXSzNp5lPB/8rqbCy/fYGKDhgXRnh70JKVpr XqFZppJC6NMouInC1ZK3hJdlsR2Hdt0GygRRRMDrHYXgp4NsinS3ncHP+9uKI5CPBzme/Xt2SWBZGs sHkEOXexD7jr8RLhny7Hk6swWn/xvaajpqUtyzmb6avbanYApWXBm1O1B+20qMoNvZ5PWyA9yK2z8v AXseo6hH9+zDVlvoKTH9LNO4ILPy5A0p0ADAgZtiKeLCzwrw9h2euKxPF/lQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Add appropriate mappings of Soundwire ports of WSA8845 speaker to correctly map the Speaker ports to the WSA macro ports. Signed-off-by: Neil Armstrong Reviewed-by: Konrad Dybcio Reviewed-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts index 6e3c4d8dcc19..b0d7927b708f 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -1089,6 +1089,16 @@ left_spkr: speaker@0,0 { sound-name-prefix = "SpkrLeft"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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 Right */ @@ -1102,6 +1112,16 @@ right_spkr: speaker@0,1 { sound-name-prefix = "SpkrRight"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l3c_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>; }; };