From patchwork Tue Dec 3 17:44:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 13892775 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.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 A65241FBCA1 for ; Tue, 3 Dec 2024 17:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733247862; cv=none; b=uRiCsu1g7deM3RCBe/IepuBkZ6kHVAc0BZ4iMXOSOwu2LJ39RD+rTpTS9gHbsK4lrREcClevUBWFay3dgPDkmlzAVjkvw6+/fVrfe+ynhVpjJh6oYm1b5L08S9t+kT4RXVdBSQael9jkgr8O9Ln9qZ9wfKHLl2zpqvJ3oehawYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733247862; c=relaxed/simple; bh=/p05xSypzO/4OeH+2vX+nGZmcBYlJ2JK65edxSL5uQo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pAKuhp5LtIk/vvwOWGT4Oqny0Es0yFbfU1Z854pXFHLhznRctMGwd1AhBGEk+kw+mv2tG8sRhdyo2HVim7stOIxxTWMyPdfXMpjvU1D1EzW9gO9Jdjtt4Vou+mVRy5e+vyKCBnsDlezMi9+e7Uneb9EesieOcI5ndLAG4X5gi9Q= 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=U0weV0Y6; arc=none smtp.client-ip=209.85.128.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="U0weV0Y6" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4349fb56260so51222115e9.3 for ; Tue, 03 Dec 2024 09:44:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733247859; x=1733852659; 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=20enjGFbIMY6ySoTLbqeBiSJRGb2uQMuia/Z5TqK/Vk=; b=U0weV0Y6Dd76An6ast9Ib9o0DP3SetY+zXv/J9FiR0Y0buNdXZeA3obQK33TpDxKVa JDQWmg2W1IXCvBNJfT2yFAd+HNF97H6Av9MBOX/r13dvXLovztEjkENQ7tmCGf8SuzCX LZDCWu+0V2LDFj7ZSmmlmAVbTvbpbad5LWWTRerrGTRTvWJ/P9WMBFOkYsObqmTPO5rY p3nU0S5fIumsKDAGRUhOw+hs3TmNdhr9dyfTUKwVFiUBGPjxb4m72NDRaxpapNfTaOSw Jhtov0VB/5mKZVUBuHUIHyG/FM52cLla8FMtmV3jo7J8h7lfBWqEZmPQZCQXVSGD4etN 9gxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733247859; x=1733852659; 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=20enjGFbIMY6ySoTLbqeBiSJRGb2uQMuia/Z5TqK/Vk=; b=Q2hxm3EbADfkHID0rUifMOiZXm93pN0e7oLvkPgT8AWsW0Nilh26cjfmAR8sggfZSu qnKHpX4ByQPWlM/2If1WxeQmK0z6i1mVQYcHAXva46CcHpe4j5qcPXmBEowos6tJ2Y8s a7YQjqFin1lGtzKuyg0bnWFU4VGkzI42mv8lOk54t8XAp+C0OG4Kyhm/OfG9wVRAZBll H4ekdsHRDJ9NaD7a6vxMZYSZcfnbVkSOEmcyEhZSan2L/Lse0xElnNdmG5wKj7/KQB5L uQWtJ76jvtky9ikA4U37Z6aEtau7LgoK0aLWl16jwFy2Y+ymHIv7/FTDIDWFibJhKmEj TQAw== X-Forwarded-Encrypted: i=1; AJvYcCXX07vz1JrjhycuYVy1pSMeDtZcRCu88NF9gC/ifi8/SqK1JYyNkYAcg9pTrx9XuxJFj5/14WPqG0QqumQ4@vger.kernel.org X-Gm-Message-State: AOJu0YxPOBCnbmL/LO+odixH5WbM6FJLds2wWsOKRhI2+zGCJfRzgjz+ uMUQDTw+ve7rBF3gbviT6Sw+BprGK5lhH29Cekm1WP2fEKsmPseDT89/PYdeV7M= X-Gm-Gg: ASbGnct+qcUzIqwgUWiIdWakyp2dmkOKFl4EdxZLhC0VbQB+gCU3lVPZrdhI98SuHLd MQkH73YZqvVYbAhJ5kI7diO4+FH1M+UrJvFUC4a7zqOpEzpadbtrixt1SGTlpAEb/dmY0sqjn4i pvf9gVjk1O71cGJLvjaqoT1VgCoA8i20wGwdJ0/R7n8Q/8+xkYIzIYsvGOidLnE2NqZ++hayOvK 4AG+RHPHslcAhgv+V8Ajk1G2eP1kZ2pRDXYvXTV3kgVaQnVPF0JtVdRr3obtOs= X-Google-Smtp-Source: AGHT+IHWm+MdE4pGT7/SWD+IygidPPYvtwFY2rLG6XMxPlA0erOfEDLVdpRRoXo4nK9V4WvRYNyvTQ== X-Received: by 2002:a05:600c:524d:b0:431:5aea:95f with SMTP id 5b1f17b1804b1-434d09ce368mr32037235e9.16.1733247858857; Tue, 03 Dec 2024 09:44:18 -0800 (PST) Received: from [127.0.0.2] ([2a02:2454:ff21:ef40:9f9f:834f:9008:1528]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434d05b4909sm17648055e9.2.2024.12.03.09.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 09:44:18 -0800 (PST) From: Stephan Gerhold Date: Tue, 03 Dec 2024 18:44:02 +0100 Subject: [PATCH 1/2] arm64: dts: qcom: sc8280xp-x13s: Drop duplicate DMIC supplies Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241203-x1e80100-va-mic-bias-v1-1-0dfd4d9b492c@linaro.org> References: <20241203-x1e80100-va-mic-bias-v1-0-0dfd4d9b492c@linaro.org> In-Reply-To: <20241203-x1e80100-va-mic-bias-v1-0-0dfd4d9b492c@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Conor Dooley , Srinivas Kandagatla , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Vesa , Johan Hovold X-Mailer: b4 0.14.2 The WCD938x codec provides two controls for each of the MIC_BIASn outputs: - "MIC BIASn" enables an internal regulator to generate the output with a configurable voltage (qcom,micbiasN-microvolt). - "VA MIC BIASn" enables "pull-up mode" that bypasses the internal regulator and directly outputs fixed 1.8V from the VDD_PX pin. This is intended for low-power VA (voice activation) use cases. The audio-routing setup for the ThinkPad X13s currently specifies both as power supplies for the DMICs, but only one of them can be active at the same time. In practice, only the internal regulator is used with the current setup because the driver prefers it over pull-up mode. Make this more clear by dropping the redundant routes to the pull-up "VA MIC BIASn" supply. There is no functional difference except that we skip briefly switching to pull-up mode when shutting down the microphone. Fixes: 2e498f35c385 ("arm64: dts: qcom: sc8280xp-x13s: fix va dmic dai links and routing") Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index f3190f408f4b2c7ca9fe368d652d5d66bb3949af..0f1ebd869ce315bfed2c17ae90b2451b3892b96b 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -1202,9 +1202,6 @@ &sound { "VA DMIC0", "MIC BIAS1", "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", - "VA DMIC0", "VA MIC BIAS1", - "VA DMIC1", "VA MIC BIAS1", - "VA DMIC2", "VA MIC BIAS3", "TX SWR_ADC1", "ADC2_OUTPUT"; wcd-playback-dai-link { From patchwork Tue Dec 3 17:44:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 13892777 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 7CDF21FCFD8 for ; Tue, 3 Dec 2024 17:44:21 +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=1733247863; cv=none; b=PKs0Kp+xik8RBjlGyLG/d1wA25hV45IUtvlgP27hTN8wMwu0jJNzUYqpyzkYcKmU1MdSm7G0IhRtVXtRCizMsGApUrhKyepm223NVjrBK/g5gu2F5X63hGdaT+Ew1seiQ/+lAWYOMqWdx8uYcS5ANpHssZPJ5BOHLyJzHL6Dr00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733247863; c=relaxed/simple; bh=2vUh2HRZeyPWfbk0QDMsBffCmlUfC7m/5QcWWanc6W8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s4E4mc229fXWrcX0eY+Zg28nYvjQFIiRPUOxZp6RgW6feG6B2RYX7+OIi/mtytHvFFu6Os8MmEdFkomWEOLy87DjqpuQyiBZgq/pIQha1y1JHCvIim5tKZsRKYbGR4PZqIYDUQq0pKCmqs+C/s5e56yhR9mliMYNDrei9gMyzjI= 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=E7+J0tKw; 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="E7+J0tKw" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-385dfb168cbso2865994f8f.1 for ; Tue, 03 Dec 2024 09:44:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733247860; x=1733852660; 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=eiErjYAhu8MnB1/TnKAdAC45bnXaP34pbBdqkHH8OQc=; b=E7+J0tKwi9qZsncfVqm68oPZRrKd/kk6i7iObD+hk2Zg+LSFigy3K7jEIhaG9heEPX WUEIFemmw+8CUpl2krzhNneQPYnYzYVfmsockR1akn97XxKdymfNsCqVAEfwdqqHSkoK MI3yVWhb4Hjm6epVMgaH5WH/np8OWjbhn9WTTONmiF/lnz8QIvrRl6NxEdloWslI1BnR 9U2oNrPD9h7sx3MJHw4NgnsH/Nbd+ogjrgd+pD9/R3eloFFh+qioVkTCIqvMsWIGXz+y 1vU9Fvk+Dr7mjz/J+kGaCVee5LwHyeLAGzae6yir+80YpXYRtkHcmN+zvwPt7NQWIMoG 8AxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733247860; x=1733852660; 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=eiErjYAhu8MnB1/TnKAdAC45bnXaP34pbBdqkHH8OQc=; b=kZb62QSOdKedRNGZ5uY1LULz/uMK25MJDP+FvGJiB8RGJhbF/uUMMujEZzkbGR2V6n URAkKL0albC41noZRrvITxaO3YY5C0CVY7ay6trn/LzafUihOm1Xn0TlD6PFJNFR3XCk 185Jy1kNkPtmvi3zngwV+Ht6Po0jDkTWYK9DYT0nWxEQrJR2JIfEQdlVw9HW1BDD9omU DRyQP4kFCas3lHtYwamkZnHxOqDjRRypTEdLWP3YID6jxdWwR13WuGvVamol5hZuVT0Q FXZJjEDbd3NMpP7KV/V5ODwLbeHf6UAbPJTRy6K+HS5WKz62vt03Ys8IObU5lkq+xGZY A6gQ== X-Forwarded-Encrypted: i=1; AJvYcCVSvPmP0tNA0/WTPNW6gc5e9LHw1n9h9y/MkzKOkLAzo2QdNJq5Bfd7xVNwLXUmGAwGKB3uMn85fF5uPB3G@vger.kernel.org X-Gm-Message-State: AOJu0YzUe2sD+4fKbX0NhO7XwyM7W3OGY85OQQTymQanBJfbA+iIHROl vgUHV+MUBNo1yhRd67fVeNuZ+j3uIyS//vcweVCeQdVyqL15jEf81N8+moodqOM= X-Gm-Gg: ASbGncupKh3Uldr+TDcXD9PahOVNnQtOPh0/PQsGBMGDwcPuHiYCNgHTQSWACvg8M/y 5k0FeVS/QbjQ8ixW/QaG2daTEUgM5/9ncqO6P9MFHpLDfv09SiFFv0qdtmaDw9ZPJdrKE1OXQlO p6YraEmfArUBoKAorqw2FTbN8pNx8V54v2brcpcwDogUpGvbj7MFIQGtspOeWd6xmyG2tmlxs0L JA09Ne503bDCdMjGr0NjH8P/5GOT5pxVHHdssnxtb6ma8sZCPO5CQBk5NUehb4= X-Google-Smtp-Source: AGHT+IFL8yQpR4qeo7vpbXPHJqpugZ+Ztt1Yb4rNNqrVGzJhhHzSTPAwa0n5C5zUlHAIIYEJzjKpwQ== X-Received: by 2002:a05:6000:2a1:b0:385:fc00:f5d4 with SMTP id ffacd0b85a97d-385fd3e9d3amr2314279f8f.29.1733247859714; Tue, 03 Dec 2024 09:44:19 -0800 (PST) Received: from [127.0.0.2] ([2a02:2454:ff21:ef40:9f9f:834f:9008:1528]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-434d05b4909sm17648055e9.2.2024.12.03.09.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 09:44:19 -0800 (PST) From: Stephan Gerhold Date: Tue, 03 Dec 2024 18:44:03 +0100 Subject: [PATCH 2/2] arm64: dts: qcom: x1e80100-crd: Drop duplicate DMIC supplies Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241203-x1e80100-va-mic-bias-v1-2-0dfd4d9b492c@linaro.org> References: <20241203-x1e80100-va-mic-bias-v1-0-0dfd4d9b492c@linaro.org> In-Reply-To: <20241203-x1e80100-va-mic-bias-v1-0-0dfd4d9b492c@linaro.org> To: Bjorn Andersson , Konrad Dybcio Cc: Rob Herring , Conor Dooley , Srinivas Kandagatla , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Abel Vesa , Johan Hovold X-Mailer: b4 0.14.2 The WCD938x codec provides two controls for each of the MIC_BIASn outputs: - "MIC BIASn" enables an internal regulator to generate the output with a configurable voltage (qcom,micbiasN-microvolt). - "VA MIC BIASn" enables "pull-up mode" that bypasses the internal regulator and directly outputs fixed 1.8V from the VDD_PX pin. This is intended for low-power VA (voice activation) use cases. The audio-routing setup for the X1E80100 CRD currently specifies both as power supplies for the DMICs, but only one of them can be active at the same time. In practice, only the internal regulator is used with the current setup because the driver prefers it over pull-up mode. Make this more clear by dropping the redundant routes to the pull-up "VA MIC BIASn" supply. There is no functional difference except that we skip briefly switching to pull-up mode when shutting down the microphone. Fixes: 4442a67eedc1 ("arm64: dts: qcom: x1e80100-crd: add sound card") Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index 39f9d9cdc10d8e79824b72288e2529536144fa9e..a4d8da81bb4468e03ba8a9d37efaae10f7a6b53e 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -188,10 +188,6 @@ sound { "VA DMIC1", "MIC BIAS3", "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 {