From patchwork Tue Aug 15 23:11:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13354405 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 A14ECC001B0 for ; Tue, 15 Aug 2023 23:12:06 +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=3J0EYodCDS5Ilr6AL5qRJmTl8tNXrtjRUPHvtZBWxEY=; b=ARWNIQz9FpOsFD 02+2SSlav6JKjkOWDSGBebSzWOXPrwPE5NlxuiFxAT/wFd+kowm9bnQP14J03J4bQAaH21o7neypC ewtIf9d3k/H4F8OOwQnJSDMSmATR3nq3oiCW0YGjREngVGixaDFDCFqF4qVJAI8ud+JUvNtl5QLLl IYkGlDXJPimX0Ivjt6KPSmR0pscq/buXwF6En7iBObVVmLMEp8VSoKkm65tDWsEFUnK4TCToP2XB1 eLR3dz5xEbqQ+0B7nwKxml/YkP+fapm1dTR04oe3paoMePUE90xC+XwAhHgdFqthsiaZcLdH2qJNw 4XrWJ6qEwUeOIU7y5fYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qW3CE-002meh-1m; Tue, 15 Aug 2023 23:11:30 +0000 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qW3CB-002mdd-2v for linux-arm-kernel@lists.infradead.org; Tue, 15 Aug 2023 23:11:29 +0000 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-34aa0a1a2fbso9736805ab.3 for ; Tue, 15 Aug 2023 16:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692141086; x=1692745886; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sVdCFRYiJluvXWxrH/bota2puhBJeIdTwsLdcgILr6M=; b=UDFmY7Zqkf4s4cJm00FKh5lhVcBZZtabEE0vGRsWZ78EuhJv1rAqiqfaVUWL/gsJJc yzE/WTiKNmUN0KwQl2oYwhbNOKVvScKuuVoDSy+kVKyxL69++uXLbf0OqeM1WmSrxu6f qpAvNvJB8+dFNQXm32TjCtGccpzaLqa3O0+zloQNVhgm8J0XJOgHpqMY5lQxdEafa8mu u31bALakkbTiKlfo4XDsjRRMlBCtEes0uFpW9CyrbmP9bSJDU5WqoYrKVPNAJHyRo3Kj NPhqDE0Pyc8cVXhwTb8CmAPEPQVbi2EVYu+e/RrZdhlRYAlO0PpiJiL/QLB0fV+JdVyE xSrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692141086; x=1692745886; 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=sVdCFRYiJluvXWxrH/bota2puhBJeIdTwsLdcgILr6M=; b=POegT6ngimwc1cK3LpOqN05BOV6fD3df9oMWQR0/Z6hHM6te/fQGf0H8FiwhCtzrx2 +fcjSL33jvHRCkw90CyKnpoiFx2exiL31DbXHklalBBcmhQlXqQ22r7WBgrHL63EClCr +d6kDPz4QGjAhPGcPJpvCJg3Kx76Zf8ZdhWXJiKymi/nCUQfc0PIodiLFaQdyNu0qBBD cuMVGlvrf6n31LrZ67JewMXCsjkMiz3UGqQudVn0M8syEqeL1qZQMUtrcr4peU4HTNGA qvsB/71n3U7lMimpoF8fh0gsUyTjaqHiT6D2fACNYLx4pVkHYsiCd2txehvY6h8MO3uF WPeQ== X-Gm-Message-State: AOJu0YwSNZl5sOJSAP3JNdJDYBm0+amTSzrCPTi9tUdfjBTWKagSXSNA lgpSGczV+u1wO1nIxNhjoTb/YL4VmeM= X-Google-Smtp-Source: AGHT+IEzDIy1xWM1KBwFCTPOhXP87WVXa4Q2qMpRmZ/zZQQi4zLUupVmh31rhtd13AZSfwvDIeZKUg== X-Received: by 2002:a05:6e02:12e8:b0:349:8a8b:70ca with SMTP id l8-20020a056e0212e800b003498a8b70camr518752iln.14.1692141085720; Tue, 15 Aug 2023 16:11:25 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:9622:3fc0:6e75:a6c0]) by smtp.gmail.com with ESMTPSA id i14-20020a056e02054e00b003421231fb8csm4190093ils.74.2023.08.15.16.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 16:11:25 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Lucas Stach , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 1/2] arm64: dts: imx8mp: Fix SDMA2/3 clocks Date: Tue, 15 Aug 2023 18:11:16 -0500 Message-Id: <20230815231117.15169-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-20230815_161127_947137_9EC7D2A7 X-CRM114-Status: GOOD ( 11.34 ) 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 Reviewed-by: Fabio Estevam --- V2: Slow AUDIO_AXI to 600MHz for nominal drive. Individual boards can increase this to 800MHz if they have the proper voltage configured. diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index 6f2f50e1639c..83d907294fbc 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>, + <600000000>; }; pgc_gpu2d: power-domain@6 { From patchwork Tue Aug 15 23:11:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13354406 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 1AD63C0015E for ; Tue, 15 Aug 2023 23:12:08 +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=dmHmjMN5HaJSZfNGyzvvGUNSogSfAWTfp2WTI3NdCjA=; b=zbkCs3AEZpb/QJ JfX5xvNMFwaJDFmLI84K1tkW61CgoyYTIxgm6dCwKxCLpRo7v12sHEhpwoyA1P/GdVGnqyAzgXPnr NazlifYAaWLXULeHyzatFeaUXcsEXq3DQEddEU1fLTnTSsDRHol4XYp7JO8w1CKzKVez73WFD6w/2 DIlxa/zdyaXb3yvnwdbCYw98AAk90yZANbziZGc7kBvGxqxk8Sz2lvXQWAb9PkqEar/KlZXKg95KB RjPihY278mjuGBhWowfAY4TgCVyxAahtkFwdyckeeB+/ZlBkhyIvTOl1E+k6FRi9mqgok2tQ3IlmM 1hx0mCc7CzAIfuAWz92A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qW3CM-002mfd-0j; Tue, 15 Aug 2023 23:11:38 +0000 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qW3CC-002me1-3A for linux-arm-kernel@lists.infradead.org; Tue, 15 Aug 2023 23:11:30 +0000 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-34aa2883f1cso8274095ab.3 for ; Tue, 15 Aug 2023 16:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692141087; x=1692745887; 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=IFuVWEZAayPE5YmN8cygrBYhtB1NcKCdwRoP31NzXkw=; b=CVr3SmK6yMXlTFfFbcWxbD7vs61Yp3FziYtTuX9eSZgR0j7klupfKh4IbQEysjTD2H tiHKlQROjAtYA8SA6K3PPODpyuh9KFhVXJulC3pW1bNNPn2NXIzTNUlUdMC6mzMXpUD7 5XKlsVXl94faQGiWq1MicusRDdGChbGlO7p/oPiXc8xznayhTSgfWxL5sOIEgc4hN+Ps Ojm3rLJ6SJquiSdA4QLbUPsctb/tQ4qfS6oxN4uc5vCWSaLRCG/VCTvLWajQUJn8LfM8 6MIi+giRt6ZrbvxjiawrD2mjV4SfNzMQwMMCvRlvqqU/ay9OHnH3jZvdbcv06Jhm5r36 QYrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692141087; x=1692745887; 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=IFuVWEZAayPE5YmN8cygrBYhtB1NcKCdwRoP31NzXkw=; b=fwwwmqLsD4WwSPxHGHZEuslama6KdHDmc5KU7NxLDCf/b2YrQLrmFm+YI2M+pZIFym stGtg+QCVLVhLhdcbYKc3W7TJcUbW4AheseXb7ZJgNO72z0M/5VwhhT3shuryPRc76Dr T314kg2kD/mnLs4A0koycp77Qk4as3Lve9I/nETY0wH7R+jzZ+QNCun4xU2pwAt+PDiC NtcQJ/bpp81EA0vnGbk4c2n2RToBly2Ty0Cnox65YETjxqP6mEJwQTLN90YiCXn5P87Y L4pj3wSj+8jdp5J2AHlOK2H6iUQLgzQ8Nl+Sn9UJYBU++QiipNf+0/F+GBiOA8eaaJI6 /F4w== X-Gm-Message-State: AOJu0Yw/IAYc8KhL/XKQhq1hf5GRyQbnxU5JnPIt4VoE/RnQL0LQIVtP SByozi1P/4u3mEBFHjvoVX90zY+edl8= X-Google-Smtp-Source: AGHT+IGDZoXS/wW3wFfvPCaoY5jxROtdqRC78WsHWjiv5QtkDcgtP4GMYgZteHS26ZdVKydZa2P4cQ== X-Received: by 2002:a05:6e02:194e:b0:348:999b:2c44 with SMTP id x14-20020a056e02194e00b00348999b2c44mr551971ilu.26.1692141087360; Tue, 15 Aug 2023 16:11:27 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:9622:3fc0:6e75:a6c0]) by smtp.gmail.com with ESMTPSA id i14-20020a056e02054e00b003421231fb8csm4190093ils.74.2023.08.15.16.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 16:11:26 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Lucas Stach , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 2/2] arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock Date: Tue, 15 Aug 2023 18:11:17 -0500 Message-Id: <20230815231117.15169-2-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230815231117.15169-1-aford173@gmail.com> References: <20230815231117.15169-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230815_161129_021315_708A90D6 X-CRM114-Status: GOOD ( 10.12 ) 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 Reviewed-by: Fabio Estevam --- V2: No change 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"; };