From patchwork Thu Jun 27 11:55:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13714287 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.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 BF161156898 for ; Thu, 27 Jun 2024 11:56:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719489368; cv=none; b=NymIJuiOqlziy0xpBFFj9LfD7hb2vBAvFHSE5j5KaWcaJJxvLnNmFKNwj9z+5Es2lkdDEADdiimJNYwg+pfQXDvpob2fyB3flvqtu+QZSi0PyN9CK0zmAxTxp123WWLUu+LlWjf2NhCenp5n+nGtXf7HBrvL9lKj3uZOeuxSAro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719489368; c=relaxed/simple; bh=KpBwvqPApgC7BTXtL0cPb5X/4XDGASS/oIMKDjK9Deo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P4xh5xsGZSnHcqhKJpi3s9ldIeE/VspiHJ0b63yGBxcLPZk9zr4uwzofJrzlK8EaMriao3xvo8V5mVqfKfEhzdqFQ+4+5d0GniSmIEdOm+mv+oQgTeZ+43fsgbhoDcE4MXlKL+kNncDDUyHGcvdJLfF34QQhIhDv7B+2RQH3qtk= 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=BjFZt05o; arc=none smtp.client-ip=209.85.128.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="BjFZt05o" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-42566fb8302so2879955e9.0 for ; Thu, 27 Jun 2024 04:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719489365; x=1720094165; 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=fUAdAcYA0qOL/HQiRFHsxlPcPsEL1Ruth0kB6T0BP2c=; b=BjFZt05o0g1URDuMjQ1weZxe+NW3JjXmsxjf4DPkNmTWZdkiVqaafptxFJoNNX6IA8 3Y0ene3I0pcP+LhiNIy1xYw35nv3b6ISYpFbHSNcGs4VXFFXBRyIUh9Iz2gigQsBPiG2 /oA5Q8feVKOcsATncHRsEW2bNWDhowY0PV/y3BSfw/Po9y5fSwV9ZioK7ycu6e7/IvH4 8Z7mn4xmoVEE2MjkUYSFMQ0GhZ1foKLPFYRNmYWn9/fx+Zv0om+x0MQStf5tyfXQzPF9 RKNPUC5OUi7dfNdAF8VbrF1N311Ep5IbjR0QKkKFJsc4hsX8XilovXUQ/gUM6qo/KySc 2nkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719489365; x=1720094165; 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=fUAdAcYA0qOL/HQiRFHsxlPcPsEL1Ruth0kB6T0BP2c=; b=Pf+v2Lzv5/OdO6JEd+8+DNnPy4TlDbmxRDE8dTbG4ycHNMj7NgE39MDLBZ5XtGHcoQ dJCf84D37EA6bdBafkjwfOrAbTHTTjf2Ei9fxVT2C00R6H79lyLTbi7KVbvLai6a0klN H7cz+6OGHQLkMO5zwXHL79SyXqZyjbR7f6adTIUCgPyXKKBEhemouHdUEdb1B0PLw3bb WydYvmM4SHFm5i+yu0RumrDJV8EU1EPkVkbA29540RZnNrR/BOPwoozdN7WFt/NEGzNP LIWfBRmVr8STu58esYtzz8tDWBWBiyPcAG86r4duDRMh7NSFLaX0iDlpc9gmi/2X/RNq QrwA== X-Forwarded-Encrypted: i=1; AJvYcCXXbcf05nGiJFWbcXzTh7XdeBoSXpYKfGxlqoWhUIRgFBiExRdzX3357zieEfkm8Foh+XD/q85SwKa7/4HQmaqeM6z2bIatoEZ52UQ= X-Gm-Message-State: AOJu0YzPlb/TAJuoMl9yR/RDv0OU6wQxYTRUKu7HlsO/s/Faz5jxYNfL wzybtRYwRBNjU0xdR7QvwwrSmXlUZx07QjpY6qPznScYTF0+FwviMMmGggl01S8= X-Google-Smtp-Source: AGHT+IGvW0hLop2OsW0c2VyEig+um838vsjHyARjdNe3qlkvb9DzxMySU8m1ZOUZmWWhoDlWsmLqOg== X-Received: by 2002:a05:600c:2e87:b0:425:5e8b:af9a with SMTP id 5b1f17b1804b1-4255e8bb07fmr34042215e9.36.1719489365279; Thu, 27 Jun 2024 04:56:05 -0700 (PDT) Received: from [192.168.1.195] ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3674369980asm1597552f8f.80.2024.06.27.04.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 04:56:04 -0700 (PDT) From: Srinivas Kandagatla Date: Thu, 27 Jun 2024 12:55:21 +0100 Subject: [PATCH 5/6] arm64: dts: x1e80100-crd: fix wsa soundwire port mapping Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240626-port-map-v1-5-bd8987d2b332@linaro.org> References: <20240626-port-map-v1-0-bd8987d2b332@linaro.org> In-Reply-To: <20240626-port-map-v1-0-bd8987d2b332@linaro.org> To: Banajit Goswami , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Bjorn Andersson , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, Neil Armstrong , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Srinivas Kandagatla X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1686; i=srinivas.kandagatla@linaro.org; h=from:subject:message-id; bh=KpBwvqPApgC7BTXtL0cPb5X/4XDGASS/oIMKDjK9Deo=; b=owEBbQGS/pANAwAKAXqh/VnHNFU3AcsmYgBmfVNNox7RstRcA2AkFGvJ//D8Zj2mIdxz2mpOt uopA1QtYqyJATMEAAEKAB0WIQQi509axvzi9vce3Y16of1ZxzRVNwUCZn1TTQAKCRB6of1ZxzRV NzgOCACELIeGXVxIgRLBFFIwuTonBWhLIu1LrdDFExawQnHithYxq1bKfsqNY1UvNMceN0rcYLu 6wS3R71OJihguEyOapPmykZIMgALSxPlCubv950d1NzP84IPnA41tkPdwHG+TpgWumqB5c0R1Nc 0FXd78PXpT0zKRR6NBDC07Z308LDhTQDdSdnjXvugSNB3Rg+BgRHBcPOnqZlYxSOrJiXTw6VXQv nltrD93hCYSFZC81tjTrnTL/2iPU9n5mKxlghnA7plMb8+8bame8wqi0/scr7n597+ORxkyPi4I Zt94VxrT90adygGvfkCpY3Mg/YloHJzUSSCi7mf8RfFrorjA X-Developer-Key: i=srinivas.kandagatla@linaro.org; a=openpgp; fpr=ED6472765AB36EC43B3EF97AD77E3FC0562560D6 Existing way of allocating ports dynamically is linear starting from 1 to MAX_PORTS. This will not work for x1e80100 as the master ports are are not mapped in the same order. Without this fix only one speaker in a pair of speakers will function. After this fix along with WSA codec changes both the speakers starts working. Signed-off-by: Srinivas Kandagatla Reviewed-by: Krzysztof Kozlowski Tested-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index ce80119d798d..67c5cd89b925 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -841,6 +841,7 @@ left_woofer: speaker@0,0 { sound-name-prefix = "WooferLeft"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <1 2 3 7 10 13>; }; /* WSA8845, Left Tweeter */ @@ -852,6 +853,7 @@ left_tweeter: speaker@0,1 { sound-name-prefix = "TwitterLeft"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <4 5 6 7 11 13>; }; }; @@ -892,6 +894,7 @@ right_woofer: speaker@0,0 { sound-name-prefix = "WooferRight"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <1 2 3 7 10 13>; }; /* WSA8845, Right Tweeter */ @@ -903,6 +906,7 @@ right_tweeter: speaker@0,1 { sound-name-prefix = "TwitterRight"; vdd-1p8-supply = <&vreg_l15b_1p8>; vdd-io-supply = <&vreg_l12b_1p2>; + qcom,port-mapping = <4 5 6 7 11 13>; }; };