From patchwork Tue Jun 11 14:25:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 803279 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.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 69C2C17DE07 for ; Tue, 11 Jun 2024 14:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718115964; cv=none; b=lWkQY2CyI1XNBIJm4rzGDtrr15uLUw7MaQBEjY5e0zD4xc1eFu2p5TXGNGMHhJKyDO3KeLtLpmxy728y2G5qzUZgOijVvZ5FlmY/dvkQMy4veWIk4RaFT5euZRhg8/Ps5aSBx+VmeWrRxHoeMFTn5gbQ5B8AGOTtTWn2Qti4T9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718115964; c=relaxed/simple; bh=jTgcJ6I9f/rRMv8ZQvu6QHiOuSVE1U6c/CD+DvrI+aE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aTEVLuv3E8cNnufWPLR+XtcBbh1Z8MS2/Z+zf7TJFdkcE/QCgGvGMuJceoBOU+sT6venj321KPw+pukiIVgF/I22Xc5sPtszbEzpo5UklRI6uEEsu78SEF/ApnTxMzsPD+eBRVpt90xuntyuVPnS1BMTCqhEbmqTvXa2SY+NpBc= 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=Rmqmor8I; arc=none smtp.client-ip=209.85.218.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="Rmqmor8I" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a62ef52e837so704883766b.3 for ; Tue, 11 Jun 2024 07:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718115960; x=1718720760; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fEIGYp+wGh2VjZ0I9sLID7yRBrttreOePBUNcFhAtA0=; b=Rmqmor8I6jAEFEwF831mIAawoeA/3BBfBS16C2z0mD1y0GfHvnXkb4Uw0t4RQ5pqYg LHrdBESI1u/818rvowDNiO5nQvoyrGiqOD0hS2ymM/J0D1hMfXV9XXhVLWdJ0nlUMviw Z0H9BjWRK8Hfu8wwpD6wK9DYPrM46XXH91yChEC5Ocbl5enkeKRvW/4khvRbEyi2UH7d Y4H9Ya6Ou0MhCxnmoKGewM5FdTXYaKOWQQ+oMyl37Sb22hzpswnLXv71gLvBX65wo7EI N27jHiE7DgIGhHsRaFnDEX392AFrPJw7CoWVZtrlLW3sNGA7lGJmXqBQ419pxJYdbB7W xa6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718115960; x=1718720760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fEIGYp+wGh2VjZ0I9sLID7yRBrttreOePBUNcFhAtA0=; b=wBYcTlkRY9nnIH+CwIMucSxAErVobTYgWAq0V7oLw3YRB3XOVfNFE31p21xXD1fCbx ZheYshZGsP0bCRmGceOhr1vGjUuyLk+lUz05NSQKEgqDuJGdKdHoEQAlWQdvEf7cBz79 9eeeqbZu6NJVwhUqAu59AlWX93YZWowfByNANfqlsWLHUlUuD8cy/eb2H4JBH32B4dwb jYd7+IoZXG0LwwKhGgQCy/+hYpZltp7YRyDFf8RVSjpJhz80vF+YCooJBFy4Ul7MJSZA VbZ73uUpRRZFXbRmoj0D32V0z4dMeKOWz0icqGKB3hDJ+3+iAZEbuPK+gQTecHX56sKX L3Ww== X-Forwarded-Encrypted: i=1; AJvYcCUprKSVeFS+u+5sxnRzSdnlGPTf/0AaXfypONsAj29TPxEhNSSSg76csSxqAFVeEwXA/zStc0Ts45o7UYrQKOmnSLQqDD1PclVAe7nSLQ== X-Gm-Message-State: AOJu0Ywekd9HXmZ1DLg/e93pZBwYLoMP+L9ODV/OyZwVbEd7nkphQhjY 4X7DKnO9hFb4Aie37Wx6dGwZIGUBFTNFf4P/RfTXf35l/QHyl2muyb3xRqysbe4EHhvxoPXlRNB n X-Google-Smtp-Source: AGHT+IH+rsh5Ih113GwCiPSGW2KUD3lICD/Laz7ogIuvQXHqM5nyY5Tw1tvqnk/4FjQ38ojd000sDw== X-Received: by 2002:a17:906:68c5:b0:a6f:2d5c:5c8d with SMTP id a640c23a62f3a-a6f2d5c6342mr272886466b.30.1718115959823; Tue, 11 Jun 2024 07:25:59 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6ef83ac0c4sm518070666b.74.2024.06.11.07.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 07:25:59 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , stable@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: x1e80100-crd: fix DAI used for headset recording Date: Tue, 11 Jun 2024 16:25:55 +0200 Message-ID: <20240611142555.994675-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240611142555.994675-1-krzysztof.kozlowski@linaro.org> References: <20240611142555.994675-1-krzysztof.kozlowski@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The SWR2 Soundwire instance has 1 output and 4 input ports, so for the headset recording (via the WCD9385 codec and the TX macro codec) we want to use the next DAI, not the first one (see qcom,dout-ports and qcom,din-ports for soundwire@6d30000 node). Original code was copied from other devices like SM8450 and SM8550. On the SM8450 this was a correct setting, however on the SM8550 this worked probably only by coincidence, because the DTS defined no output ports on SWR2 Soundwire. This is a necessary fix for proper audio recording via analogue microphones connected to WCD9385 codec (e.g. headset AMIC2). Fixes: 4442a67eedc1 ("arm64: dts: qcom: x1e80100-crd: add sound card") Cc: Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index 12a4c4637baf..05e62d9f1cbc 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -102,7 +102,7 @@ cpu { }; codec { - sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>; + sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>; }; platform {