From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A74B629E9; Tue, 23 Jan 2024 01:56:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705974969; cv=none; b=iz3bsaqULgsqsx8txAf2pnZYcppqvmjyjC9Ory9kZQwBBPyw574kOi9gNTJrpKD6lu+kGgDbw8ZPJum8Di33p8MIpY56yg+bHDn9mztW9wEvtJPNo+leqplZpsIzW5DZUsZbQxbPinxppu67/sUaPz2vxmqTY9+3AoF86y7WQws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705974969; c=relaxed/simple; bh=lwvUqJbpC/K8fuUtnvaFrttbpCc8poTJ569Pi3voZmU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xnlu0UIN52v5JwvjfMzpimGgrKGKoHmg91p90BouM7Bhkz0gZRcWvS4s+gH+QPd/q0S1p5ku+GHWUsO3nyM8h4gHTxmCrPb5lAsM54pnc49e0/9CiuNHTEpZRDYEFO1FO2B2ep2gACb7dsXFJJRJsPPJxPvpJk487XKLdH5zXRI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N4p7OSJO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N4p7OSJO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D221BC433F1; Tue, 23 Jan 2024 01:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705974968; bh=lwvUqJbpC/K8fuUtnvaFrttbpCc8poTJ569Pi3voZmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N4p7OSJOCpfwrZIRvSj3KjKCv3eYEpoQb7kBPWzD3Zuk6vEBN3BkFYePMS7IekD09 Is8cp49Ogkol/V+IPKb0Tk0+9yw7HS2zX2Y41toCLQyMwiFj56VwBCJe7ouAYbriDJ 7wAv3TiIbl+wCeP/FHhGmfNP3CALphC6v0lnhxm0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikita Travkin , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.6 173/583] arm64: dts: qcom: acer-aspire1: Correct audio codec definition Date: Mon, 22 Jan 2024 15:53:44 -0800 Message-ID: <20240122235817.321933679@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nikita Travkin [ Upstream commit feec9f0add432a867f23e29afcd2f7088889b8e2 ] When initially added, a mistake was made in the definition of the codec. Despite the fact that the DMIC line is connected on the side of the codec chip, and relevant passive components, including 0-ohm resistors connecting the dmics, are present, the dmic line is still cut in another place on the board, which was overlooked. Correct this by replacing the dmic configuration with a comment describing this hardware detail. While at it, also add missing regulators definitions. This is not a functional change as all the relevant regulators were already added via the other rail supplies. Fixes: 4a9f8f8f2ada ("arm64: dts: qcom: Add Acer Aspire 1") Signed-off-by: Nikita Travkin Link: https://lore.kernel.org/r/20231205-aspire1-sound-v2-2-443b7ac0a06f@trvn.ru Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- .../arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts index dbb48934d499..3342cb048038 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts @@ -209,9 +209,22 @@ alc5682: codec@1a { AVDD-supply = <&vreg_l15a_1p8>; MICVDD-supply = <®_codec_3p3>; VBAT-supply = <®_codec_3p3>; + DBVDD-supply = <&vreg_l15a_1p8>; + LDO1-IN-supply = <&vreg_l15a_1p8>; + + /* + * NOTE: The board has a path from this codec to the + * DMIC microphones in the lid, however some of the option + * resistors are absent and the microphones are connected + * to the SoC instead. + * + * If the resistors were to be changed by the user to + * connect the codec, the following could be used: + * + * realtek,dmic1-data-pin = <1>; + * realtek,dmic1-clk-pin = <1>; + */ - realtek,dmic1-data-pin = <1>; - realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; }; }; -- 2.43.0