From patchwork Sun Jul 14 17:20:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13732762 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F430C3DA42 for ; Sun, 14 Jul 2024 17:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=OlQJVnEnvYtG6Urx8xlXkjHKNYwq7RXhH4sQHIkE5Zk=; b=kZa8XcvB2YIoZajpRXeJ5DkTvN 1Dl3yiv/CTC/pZBCL7zxl64Qod9gqE+BvCu1HG72sLVwkyTmSYbdmRWbOWTy1lYKN0XmvXaRpUjVQ eSfWZmGqsnaAEQBjNu67Gjn9/jCifWXQCEQQI+/Wh6FSL0aSA19A+wbeuDzSNglQOPdBMU1JsNnLj iF4Xc6jjo4JQEZkmaUlpKvag9O+MBu9QRkPu4aij2aVw0rpSNc9y73SPqSl1kCqHIXVAo23/5Cld/ WM89Nveb6pD3WgA+ZlJLu5hLyu/bmG3gE4Jy1UBIxO3N3/VbzK5AYPdS5XlI0r4BNqLZTCWf0i8C4 GXTOnmiw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sT2tx-00000004qCN-0xRT; Sun, 14 Jul 2024 17:20:45 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sT2td-00000004q8M-2igZ for linux-arm-kernel@lists.infradead.org; Sun, 14 Jul 2024 17:20:27 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-389ccd2f0abso12863305ab.2 for ; Sun, 14 Jul 2024 10:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720977624; x=1721582424; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OlQJVnEnvYtG6Urx8xlXkjHKNYwq7RXhH4sQHIkE5Zk=; b=H0qUTNsZIP8D8Wz21LuwKglilK7JBbLC75uinbjxY0/kzvmPs2x47e1sj7vCxHNLsl q8AjlhLX5ah17muHXuX5aB4D5YWulYObQ7irjHbKCLy80t4qhX9KLf9kMRzAq9lMwQ41 2BJfhw2onSjYHRYJzMN9Qx5EdOi7E+aqNgwqcUaJVui4GPU/jroJSmqTihjnyn9ntE1v lMb9O27ZObB26ok6wQOTluIb2HBZNV3dAuqlL8PsH7H+7+urxyIERwKCwt8wYC1BvSEO wMXViWR+WBTPrC35vuHlo2NFfOjeesv9+l5Izq7PFj6TH8bm5BqSRIFr9osKlHeh7xzx ExLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720977624; x=1721582424; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OlQJVnEnvYtG6Urx8xlXkjHKNYwq7RXhH4sQHIkE5Zk=; b=XP8nZwxNbMLAraqOEHgTwMLXI3ITjQ7Gboi3wMwp2u+ODBpsQHp/TM78l/rAQ5EUjs nHZAnffODg/iE8NcfDbbwOY0TDRUKtHzuV8zJ+HM7t7UodnC3J3GvoRpqE3+zBYGk2Rb tbf6YIW8A4AcUsEyDi0svI/qTGYgrwBby5YBvCiA6C1/mpsjn0kPL+72T81tyRx2zUik cHXb387eeZClPmSmp1W2rz2lb+554lwESvH97fa72QsHCIYhauT+hHUra85u71xDVDV+ lMlW64mpGVRRl4XgF7NQJq8Bv6oL2ipeOUAJsRDE4nNyPap4DNdU8fUheb9NBZz3reAB nrOg== X-Gm-Message-State: AOJu0YyBeKS3vRvJ539o18qWcwmlccOOMfZVjg23wg0R5PyDqUgdy/0e nyj9ULMr60z8gGMHK3pHQqgEZRWHnxS4yoB3GbSGRKA7ZxeGgFSXQMstkoxm X-Google-Smtp-Source: AGHT+IF6DTVl/wDe0J/V/t+5rtM8BQuGZZ8qgIqSyMgnG7/Y0BdktL+/90gcxU5w1DRx/MZmfcmztg== X-Received: by 2002:a92:c546:0:b0:375:a7ee:dff9 with SMTP id e9e14a558f8ab-38a585825f7mr226453335ab.17.1720977623667; Sun, 14 Jul 2024 10:20:23 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:5d97:4e3d:78d3:be9d]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3900f5280b1sm11357625ab.32.2024.07.14.10.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jul 2024 10:20:23 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Lucas Stach , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962 Date: Sun, 14 Jul 2024 12:20:17 -0500 Message-ID: <20240714172017.422811-1-aford173@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240714_102025_731291_D4F517F3 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The L/R clock needs to be controlled by the SAI3 instead of the CODEC to properly achieve stereo sound. Doing this allows removes the need for unnecessary clock manipulation to try to get the CODEC's clock in sync with the SAI3 clock, since the CODEC can cope with a wide variety of clock inputs. Fixes: 161af16c18f3 ("arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock") Fixes: 69e2f37a6ddc ("arm64: dts: imx8mp-beacon-kit: Enable WM8962 Audio CODEC") Signed-off-by: Adam Ford diff --git a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts index 1871c10f5c12..de5b64fa479a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts @@ -222,13 +222,12 @@ sound-wm8962 { simple-audio-card,cpu { sound-dai = <&sai3>; + frame-master; + bitclock-master; }; simple-audio-card,codec { sound-dai = <&wm8962>; - clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>; - frame-master; - bitclock-master; }; }; }; @@ -544,10 +543,9 @@ &pcie_phy { &sai3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai3>; - assigned-clocks = <&clk IMX8MP_CLK_SAI3>, - <&clk IMX8MP_AUDIO_PLL2> ; - assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>; - assigned-clock-rates = <12288000>, <361267200>; + assigned-clocks = <&clk IMX8MP_CLK_SAI3>; + assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>; + assigned-clock-rates = <12288000>; fsl,sai-mclk-direction-output; status = "okay"; };