From nobody Sun Feb 8 13:08:51 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D88DC433F5 for ; Mon, 23 May 2022 17:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240538AbiEWRVF (ORCPT ); Mon, 23 May 2022 13:21:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239886AbiEWRRQ (ORCPT ); Mon, 23 May 2022 13:17:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7091363525; Mon, 23 May 2022 10:17:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D8A7160916; Mon, 23 May 2022 17:15:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C389BC385A9; Mon, 23 May 2022 17:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1653326146; bh=Suj0qgbA1cL7GbMkLai5H2A7Ktk/OdIQ9OEfQRVttWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oM4DNt29IvrLJHsr2WSGOiFKlkTZaSoxV03Sam7Xis5M8NKEbRT/R+SaYRQcIdySP cwqU7PlF+XR/XWarOplTBwunbu8GDZ9i80JZITCaYJZpyruboiWqlPia9KsngAF+tR C0C+W/Ix7Hl9IBDBKvAkXrP1Bv3R9i9E0nY5iFd8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abel Vesa , Shawn Guo , Philippe Schenker Subject: [PATCH 5.4 63/68] ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk Date: Mon, 23 May 2022 19:05:30 +0200 Message-Id: <20220523165812.903709333@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220523165802.500642349@linuxfoundation.org> References: <20220523165802.500642349@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Abel Vesa commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 upstream. The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), but according to the reference manual, there is no such gate. Moreover, the consumer driver of the mentioned clock might gate it and leave the ECSPI2 (the true owner of that gate) hanging. So lets use the audio_mclk_post_div, which is the parent. Signed-off-by: Abel Vesa Signed-off-by: Shawn Guo [ps: backport to 5.4] Signed-off-by: Philippe Schenker Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++-- arch/arm/boot/dts/imx7-mba7.dtsi | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 ++-- arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++-- arch/arm/boot/dts/imx7d-sdb.dts | 2 +- arch/arm/boot/dts/imx7s-warp.dts | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -77,7 +77,7 @@ =20 dailink_master: simple-audio-card,codec { sound-dai =3D <&codec>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -152,7 +152,7 @@ compatible =3D "fsl,sgtl5000"; #sound-dai-cells =3D <0>; reg =3D <0x0a>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_sai1_mclk>; VDDA-supply =3D <®_module_3v3_avdd>; --- a/arch/arm/boot/dts/imx7-mba7.dtsi +++ b/arch/arm/boot/dts/imx7-mba7.dtsi @@ -250,7 +250,7 @@ tlv320aic32x4: audio-codec@18 { compatible =3D "ti,tlv320aic32x4"; reg =3D <0x18>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names =3D "mclk"; ldoin-supply =3D <®_audio_3v3>; iov-supply =3D <®_audio_3v3>; --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts @@ -284,7 +284,7 @@ codec: wm8960@1a { compatible =3D "wlf,wm8960"; reg =3D <0x1a>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names =3D "mclk"; wlf,shared-lrclk; }; --- a/arch/arm/boot/dts/imx7d-pico-hobbit.dts +++ b/arch/arm/boot/dts/imx7d-pico-hobbit.dts @@ -31,7 +31,7 @@ =20 dailink_master: simple-audio-card,codec { sound-dai =3D <&sgtl5000>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -41,7 +41,7 @@ #sound-dai-cells =3D <0>; reg =3D <0x0a>; compatible =3D "fsl,sgtl5000"; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply =3D <®_2p5v>; VDDIO-supply =3D <®_vref_1v8>; }; --- a/arch/arm/boot/dts/imx7d-pico-pi.dts +++ b/arch/arm/boot/dts/imx7d-pico-pi.dts @@ -31,7 +31,7 @@ =20 dailink_master: simple-audio-card,codec { sound-dai =3D <&sgtl5000>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -41,7 +41,7 @@ #sound-dai-cells =3D <0>; reg =3D <0x0a>; compatible =3D "fsl,sgtl5000"; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply =3D <®_2p5v>; VDDIO-supply =3D <®_vref_1v8>; }; --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -356,7 +356,7 @@ codec: wm8960@1a { compatible =3D "wlf,wm8960"; reg =3D <0x1a>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names =3D "mclk"; wlf,shared-lrclk; }; --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -75,7 +75,7 @@ =20 dailink_master: simple-audio-card,codec { sound-dai =3D <&codec>; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -232,7 +232,7 @@ #sound-dai-cells =3D <0>; reg =3D <0x0a>; compatible =3D "fsl,sgtl5000"; - clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks =3D <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_sai1_mclk>; VDDA-supply =3D <&vgen4_reg>;