From patchwork Sun Aug 13 16:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13352178 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 EEDF9C001B0 for ; Sun, 13 Aug 2023 16:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=N2fI5Z+IIayJDCBfbP9+7xXBrSSRV5jG2ptvZvPWMNA=; b=pcM7+rJawAoev/ 8al2OwOsqGsyfNdqCzUqbsVDvl4erllay3HZl+kN0vM4bzIEQKliTWjuz2g4wxxWCEaYhR/YRFH9b 506Ic74G/dJzZwlJh3IbXkWEjp2BkmdezjZswXONEtse853ae3PviAaK0gJs4s0KxZRAprO+lnLP6 HToDxcA6IgvVHF4NvBb7b+he0AySw9q2FH/7/7LMg+Cm6HF00thiPwkn1skKdFVoGlZWl1v0gANDf 0kzSlMeipYEw30t2RX+IB/ivZ5aXIjxj+6iztxNJKhtfVdUyclpVmoQlhcls6G18w8zJpSSV4snQn 52TN9w5lURXuUl0nTffw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVDxt-00FS5k-0b; Sun, 13 Aug 2023 16:29:17 +0000 Received: from mail-io1-xd2f.google.com ([2607:f8b0:4864:20::d2f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVDxr-00FS4h-06 for linux-arm-kernel@lists.infradead.org; Sun, 13 Aug 2023 16:29:16 +0000 Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-79196067c75so75519039f.1 for ; Sun, 13 Aug 2023 09:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691944153; x=1692548953; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3cwCNs6X4jJcwApJaNSkv7YlnkadabMnWiNmxCJPzIk=; b=s1Llsb0zuv3RvKl172ebqYoUJ7ExuiMBapH7bui0VG/0n9OCww2xTDWS/Jd2fKw8Qu 8H7kzhPbnDF6Y/YH6tOGY1FhNyVdLyxH2rEDRj2NEi6EPZHDh2X0bcOe3Du6IefxLOmI bzGhiMmRp24jrrZxznM13ROlkST4397AfjXLQZiLUyw16IOkvu2y2XqcPl0GGoQnXdGr JDbMi5QkIY4OjVJ0GhHrL3LCqhfPznzzS/5qMQNgAHJtxBjumneqhYMNpv5BJBqMRkBu +kr0l5yzvcFtPnYlJ2Y8mpD+ORMmwZwX/wYpmfGGphICNkd/Lk9XpwhWTcit3ves1jV8 j+5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691944153; x=1692548953; 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=3cwCNs6X4jJcwApJaNSkv7YlnkadabMnWiNmxCJPzIk=; b=NWTOI72GL0IVhCSlDE2LW+G6OBx+8Ja9gi6GLHVWRWDpAeoXvYBnb/vedQytTf4a8q 6Ca/ZQ297ljNzBF4iLz4aQWdrPfq07wBw4BtlX5O2YsuL3Y7AyLjRn2SMOcCHTBZdYou NE8KSjBGDFHFX/8JCOeIrWLbzLIQg7S8ry8ZvyIytAXmTKywTCAIV6KIwbgAIIOumMZZ FDr+sItrCQQ3q16ZCZ8sRVBdW8pkidUUSZhYgXAbHNseU+JLqHQyBYHY0yfAF2e1h2Cl pSsyOAT55MENonT90STjJ+r+RL+wn/W6yNpUsZw16S1/3S/6qMBfp/xC2TPL2h4yxj2w 9Pow== X-Gm-Message-State: AOJu0Yzm7wEn+hyQ6JYgT4//4C0kj2jk2kMht0wRFbS1wTwiTZFXtDp8 wZI3FB4c0WTXSoqp9CCQEC3fWMleiCg= X-Google-Smtp-Source: AGHT+IFBO6DdSxulJCL01P2Lxc06UrO+73c8UExGsPeBdNbmi7kj9S34TR9Qxs5alyyeR0JpKdzBTA== X-Received: by 2002:a6b:5c08:0:b0:790:c9a9:d760 with SMTP id z8-20020a6b5c08000000b00790c9a9d760mr9174772ioh.16.1691944152951; Sun, 13 Aug 2023 09:29:12 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:21ab:bc25:b29c:7b7e]) by smtp.gmail.com with ESMTPSA id fu11-20020a056638668b00b0042b6a760c31sm2454767jab.28.2023.08.13.09.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 09:29:12 -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 , NXP Linux Team , Lucas Stach , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: imx8mp: Fix SDMA2/3 clocks Date: Sun, 13 Aug 2023 11:29:05 -0500 Message-Id: <20230813162906.22640-1-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230813_092915_074284_957E8DA3 X-CRM114-Status: GOOD ( 10.68 ) 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 A previous patch to remove the Audio clocks from the main clock node was intended to force people to setup the audio PLL clocks per board instead of having a common set of rates since not all boards may use the various audio PLL clocks for audio devices. Unfortunately, with this parenting removed, the SDMA2 and SDMA3 clocks were slowed to 24MHz because the SDMA2/3 clocks are controlled via the audio_blk_ctrl which is clocked from IMX8MP_CLK_AUDIO_ROOT, and that clock is enabled by pgc_audio. Per the TRM, "The SDMA2/3 target frequency is 400MHz IPG and 400MHz AHB, always 1:1 mode, to make sure there is enough throughput for all the audio use cases." Instead of cluttering the clock node, place the clock rate and parent information into the pgc_audio node. With the parenting and clock rates restored for IMX8MP_CLK_AUDIO_AHB, and IMX8MP_CLK_AUDIO_AXI_SRC, it appears the SDMA2 and SDMA3 run at 400MHz again. Fixes: 16c984524862 ("arm64: dts: imx8mp: don't initialize audio clocks from CCM node") Signed-off-by: Adam Ford Reviewed-by: Lucas Stach diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index 6f2f50e1639c..408b0c4ec4f8 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -790,6 +790,12 @@ pgc_audio: power-domain@5 { reg = ; clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>, <&clk IMX8MP_CLK_AUDIO_AXI>; + assigned-clocks = <&clk IMX8MP_CLK_AUDIO_AHB>, + <&clk IMX8MP_CLK_AUDIO_AXI_SRC>; + assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>, + <&clk IMX8MP_SYS_PLL1_800M>; + assigned-clock-rates = <400000000>, + <800000000>; }; pgc_gpu2d: power-domain@6 { From patchwork Sun Aug 13 16:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13352179 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 361A2C001E0 for ; Sun, 13 Aug 2023 16:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/0JTqAgsloIlV6aTjtoHdBYqqq+cEwPipEUfjZdMQ9s=; b=JsNYAi1oBpPUt3 T1/SI1pFHrsGrt7pnJQH6yV6fiFhVXlPAT1w7Pyv/rn9gt0mKJ5jWBjPxoY6qp7PGL6V42DO6HwSn GjcZ0BJWN1nzydj0aT9KxzXZg71z/WWHJ/dKGnNXdd3WwFt5TTrp62pC6wzqug4EpINQkwnlsDAYr XdulmxmdSG09SNS3EVZ3qkA0ICW3hmgan/DOcXfcliX8ZY3QcrAH5bOCXWEvVl2hiv3dBmYr28gpE nZqOJnuvJtRlGvjNLROZozf/tVOoXp0T3IwzGuI4zufjklGQq6aJgb8tY3Zk+ykPT8W8NHP2gTdOe Ac8JCiA6dRLQhaMbcxPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVDxy-00FS7A-2b; Sun, 13 Aug 2023 16:29:22 +0000 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVDxr-00FS52-2k for linux-arm-kernel@lists.infradead.org; Sun, 13 Aug 2023 16:29:17 +0000 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3490cf176feso16410915ab.0 for ; Sun, 13 Aug 2023 09:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691944154; x=1692548954; 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=DA+ZWuyHKJYTTZUzLnuxcZhi2heRAd+OrRpIKUB1wiU=; b=QdH9YumwVmjEsIUbUB7j19JLn2O0caIdEoBwnQYJ7g7iEX4suyHTjp8FInDY3eVfHc 5unAcqep3MOSY1ww5GvIYAhVl71UQ4BzWJFTg5mtwaE07DmUigTZkLllphM/DJ7QRTnd DVooy5S9vRnswwuXVsH+ovxUnv77uFLb+/x4bE368aku0Ml/14fyyNeHKGyYxUt54ozu YoZJZvaEsei/kgZKom7bW5eUAArr2/0G9kTcZBGqP+y3SF7Z2IwO4yN44jmUIHJ8zeBR Jh4l7U2raS/yMEHmCoMyMgagCTTNjDPesnf3+g4owOcRNHTyFySQ7qP+1i8ATz216Yao wL6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691944154; x=1692548954; 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=DA+ZWuyHKJYTTZUzLnuxcZhi2heRAd+OrRpIKUB1wiU=; b=bYwbhEJGk0hmp0UfLTTyfk/I2N7fJvS9bb6Oold07PlWwqBeJXpx+vDemZbOJf/2yW mQBg+KvgUoA3MprRmOaHscZaAjHquKRWkPJmleMi7toq8rPV/yJDRXjukVavXaEqVxCq lfD8p8c3eUJFp8sOaf/d0obW0+D2vdUX/kpDfMkKr2KZCG8Bct2kH2r0eaQFirOy4Lxm RV9G30OuIMWJ/4xTNfjP0uWF9yMK2cpqcyon0jcQve2bKtb58v2JsZUtzUdk66HEuQZR f5QSqWhSCjuuOyQGQ7RmV5eCRYNc/hmSUmCEBVlNZetzgb5q0Hb16O5ciroEKEeah38F AsBw== X-Gm-Message-State: AOJu0YxALFnbP7WVzKzrGjtn5dvosl8jzqAEwhmXR/b3NpjjtQ2sPfMV eG0u90jgMy4deJPGCkEx1LnM4CKcz8s= X-Google-Smtp-Source: AGHT+IHgoAHPGWRVRZD7DETU0nXsOcsrlg27kCfVkL+zoPENg5flmlObvJHbBJLDIuN3BUZ9IDVFPw== X-Received: by 2002:a05:6e02:1154:b0:348:8542:a673 with SMTP id o20-20020a056e02115400b003488542a673mr8750265ill.22.1691944154263; Sun, 13 Aug 2023 09:29:14 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:21ab:bc25:b29c:7b7e]) by smtp.gmail.com with ESMTPSA id fu11-20020a056638668b00b0042b6a760c31sm2454767jab.28.2023.08.13.09.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 09:29:13 -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 , NXP Linux Team , Lucas Stach , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock Date: Sun, 13 Aug 2023 11:29:06 -0500 Message-Id: <20230813162906.22640-2-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230813162906.22640-1-aford173@gmail.com> References: <20230813162906.22640-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230813_092915_885191_05F77337 X-CRM114-Status: UNSURE ( 9.99 ) 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 A previous patch removed the audio PLL configuration from the clk node, which resulted in an incorrect clock rate when attempting to playback audio. Fix this by setting the AUDIO_PLL2 rate inside the SAI3 node since it's the SAI3 that needs it. Fixes: 16c984524862 ("arm64: dts: imx8mp: don't initialize audio clocks from CCM node") Signed-off-by: Adam Ford Reviewed-by: Lucas Stach diff --git a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts index 06e91297fb16..acd265d8b58e 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts @@ -381,9 +381,10 @@ &pcie_phy { &sai3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai3>; - assigned-clocks = <&clk IMX8MP_CLK_SAI3>; + assigned-clocks = <&clk IMX8MP_CLK_SAI3>, + <&clk IMX8MP_AUDIO_PLL2> ; assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>; - assigned-clock-rates = <12288000>; + assigned-clock-rates = <12288000>, <361267200>; fsl,sai-mclk-direction-output; status = "okay"; };