From patchwork Thu Jan 27 14:10:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 12726844 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 A0465C433F5 for ; Thu, 27 Jan 2022 14:13:34 +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=GvZLFozJjcQN7Af/ju5UF9mVe8cBiEOs3q8ZnFnnsK8=; b=gDr27VA/uYx6Zp SwkVXTsBp+8y5phQ6+ZamYV1aGKu1Z/gg6egLA8dw85w3sfEkkT/aHSJuwfVOLOZBOifKNcFyxo6Z Kzpi/jzpgVrrDN1dmuON6dXpTKt0Y/Aycov/dasSRpCys3uVvH20+tzU7y09zIjD2IWK4aMdhCzGx 3c5JDgEdqOxhbOMj7nRqZ7duh0tUGZ9Dje/nu3Z7XqjprDB9RzcoLXHbROUs7VGxRSggCEJcINlb7 97c9wj43DL57Zud1UDlKVmHawfiMn2z/yu9JDaTJ9Ri+hWxdSdwY35j2ByHdkkVOBWOdrL4bN3CVi KnGiZ3dfZZKV4/qG9I7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nD5VQ-00G1tk-FK; Thu, 27 Jan 2022 14:12:08 +0000 Received: from mail-eopbgr70054.outbound.protection.outlook.com ([40.107.7.54] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nD5VD-00G1pe-Js for linux-arm-kernel@lists.infradead.org; Thu, 27 Jan 2022 14:11:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GLuuVUBYOYvtp85VH8OOwtUe4v7TfUzPK6+bJiWB1o4zSOpOpibVjCN5Cvh+9dPL9Am8aGDsKM4OaNyYsFS3J47L7zjIjDdDyMC6IkQvBlw1Af1RK/p4ybHb+JoAWm350HAibkPCBUFsqmU+cCI7TncbhEpsL/NY0E2tVK2onvp1InlzNRKSMQizPQRG5qXjSIxKeasPh01JYRhm5HVX1InikIX3EveznvNOIoH7onRq8Gv5qmyotNZfkVegHu6TWdjIZp0o41TjEcyEsQ+Xn3snK/HevSZGjy5tBLjxoH5p6w4UVZfYHyMkr6U/Hz4jnUxKMDSlO0deR0FjJe/Lcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TRc5R1X4Cvg8rNGNUpZOcSFll5ZvlXEO7Q+N5Nfr+7o=; b=iqtY4kHcgxzENrw08CGHEJXK4PQf8yY9IUbIUjWQlwoFax5U0+JrXbjEoZVL3+IB62edFbGoX6JE32sxHFPb3Hn/Vm5Z9iuIdmRexS50BCIeyojjgrS2fJe20uex+PH5qjnEA6cY+DnzryIMGbVw8P4A+WJHIb3xVkvhDwX6IjT2/28F+v/Qswm4FtM7jnI2o9Y8PAPk5gvXHkAr0CRopuZyU2BF/WySZG93ljaKuJgjAGLwcAIhYVuiFxyOiMHmXuxK+jl6IYL2APDpB6MfjUHh+HXChi0Y38l5S5znG0Q3YJWOwqBrf7B3dGdP9lU1MD+tKlT9rejFhT7CJrUdtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TRc5R1X4Cvg8rNGNUpZOcSFll5ZvlXEO7Q+N5Nfr+7o=; b=FJGnPGgw6n4US37/gBC9xJT++Ux+EAhcHeYBVJaP7eGhO+FPljs7nctN1DFHYNE4PaHIaxF/soIVP7+R6Aiy1EmxDKdog2GZiLoqyVt1QEvHu8YctUbTw2jRILPhlmM/xJmKwXfn1vXRl4U3SkQEfaaCOSD2S5fqcG3snpD4dzM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) by AS8PR04MB9208.eurprd04.prod.outlook.com (2603:10a6:20b:44f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Thu, 27 Jan 2022 14:11:47 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::f853:4e9a:7ab6:dbf7]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::f853:4e9a:7ab6:dbf7%6]) with mapi id 15.20.4930.015; Thu, 27 Jan 2022 14:11:46 +0000 From: Abel Vesa To: Stephen Boyd , Rob Herring , Shawn Guo , Sascha Hauer , Mike Turquette Cc: Pengutronix Kernel Team , Peng Fan , Fabio Estevam , NXP Linux Team , Frank Li , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List , linux-clk@vger.kernel.org Subject: [PATCH 1/2] arm: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk Date: Thu, 27 Jan 2022 16:10:51 +0200 Message-Id: <20220127141052.1900174-1-abel.vesa@nxp.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: VI1PR08CA0178.eurprd08.prod.outlook.com (2603:10a6:800:d1::32) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56c2441e-6d44-4a1c-4f37-08d9e19ef36f X-MS-TrafficTypeDiagnostic: AS8PR04MB9208:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e/3OoIdLwZZR6AuyEoPFiXUBufCHec88kbr3ZTZqxxr3hmbQ5s27pskqJDv3REKT2dTYWGQcGIk8HiMAp/1R+iiONP6xlE+KxyxIj4otEyojYKz42SOqfvP8AzWxSAqp1nLImLkW7uLs5hB3nhNclc1FcUeGfadV5SuBhD2AptHglqiaVwSnDVV72y5lahl6c5HLImwVti0lyNHyz/j3uiC823zc488/vsTAV6BHuXD3qt/dbnW4jrzwoWRHbKg8xdhdmPi6a4v8VPq2n7UIvsq7Z2l6saOdzNwpe0+hjuggipH+8H5gvela5On4C4GzJ73Z9/SPx23ieoCvOs06I92geE40vl+bQRLGz6ofgeRkn0okHW1HN7wc2o1OC4Nj7Z4W5dLEo6El7o7zk9mnpbFzWznEqIbxiCFXWPrwGViRhrZtBysLexowVMZIieAx2eKYC+KBU9qbQeJfsZmbP4YjfXX/yo/cySLaJjsEc0U0CRORU0hH5w8RDIebvWWQMwlLqg/SHuD0ytb260BOGCcF5QOAF6y3IIsuJ46BM2tyaCBeogy0LkyolIfZYX2OE+SeIy6ZcKLGbyCs4Ixr30ZFi1rGTpvlcjnNWmecAnHREhFOOa2dhyXlchhCf/peGYeYnBSV/fHIsJfv1TXBO1oRnt8CutoLASHFMNQnSkeDd5XxadROyCLUWI8w6Ta+/VZyNdFOMUaxT5fqkCOTUw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(54906003)(86362001)(110136005)(66946007)(83380400001)(316002)(38100700002)(52116002)(26005)(186003)(38350700002)(2616005)(6506007)(1076003)(4326008)(6666004)(66556008)(8676002)(66476007)(8936002)(508600001)(5660300002)(6512007)(6486002)(2906002)(36756003)(7416002)(44832011)(20210929001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zxUNcF3zaNScPAgzBr2sBVyY45/DXRuGt/ZCUq2bF9ZzTV1P3TuqipUp+8yCw7G9gQgiECVICX7ZGtl4NAM/kljYsDAm/cAjJaeSAieUTxqQsBaNCCsD76rkymyNnkAh3dBEU42Nd7oFmpL+/MG4Ze0j5GoD8ki/FWg35fSFEXlskSmRieE0pfR8y8v5a7sYJahqt/Bso4ZXzEbHPjHkrUAl9DlJ5gZ1Icg9J3bKgF6Wp2giG2O9lCxUca0/UVLJyR63CpNKx60y4mfaUilJRe82tuvPD6906mxnZkAGmF9k/ywwNM3EE8Uql+1l8lun9YOqna1OSgMfkLM83fFVcip8ALcQ7aOfMKRQ4AnaUpKx6fFwXU3ql2aY+AvrXdEkYwnwgxQ6+Jt9MtusCDGKmMCSZ53rE2GNe8DKFi2MxMv7Mo7utLYM8GLaa07bh/XotkGj3qoCoCkYjNaGn3rH2XndFRMgh/ig6FZIjE3ukzw6IvIoqpasWegO9G6zre9hgFwoYnKvyNfLeDhRao3GzGEFPZPygQX/xOm02zHmXmK4Lv7xwKbQcItjx1CnsNJB1nWqbsAmJlhEC2Bh5eU1+zYmCOcJUaljVq7uVC5sY6waKKuIUckKmw8okp5UQAiibX89/yiMkm+cNSfsNqssaHUSeIAbpg94YzYagjK3z08MjBliUryYDzkMUOH5yicMmJlJ/5bMYKEllnwakGb11DXcaMRq8Xz0l6jniw6rJPfpt4BTUMPTHRZRmbcQM1i/ResyHGMXJocRaIb9O7dCGU28x2ByDVC3z+aFOdPGGxCzs49qttb2SgD9LRS0vlne2EmQ5a/NkW0Z1VWF554aEBKZZJvKm8td0zmIrMZRdZeO2TSY0PN3FvT7NwAx/ELyv0wzsK8yMXw4xhZ+pElEd5/WvZ1L+V6q5OwhF0mowBXrFpC8kh42+PSFjQxKdgbouFAut994ODsmX2ZoagNFriUxqacIKsjPWp/M4aG8Iy5XybaxmhDfhnV61iLnX0oKu9NNqJsOuLP5WWrmnWcz2S5kYPCZ0js51pM/gom72RgahVW/UcO0Wgd2oMkzkohnUet7bpsFS62JgKo0Tb6kh8GWyKq4o4pN9rMU7doKEQVwXl9tenNOueP1trvr1dqCLuCycGPl4M+E3FAK7bcyEYlFU0Ua0nIqYcn8XtH1aDmlbhQ3MPesaIA/iu3RnLES3Ate7K7RHWlkLM+UeMsIBPKoBn9dMCpTYzzVHXepZDPg8qxS/fWbwhU0Rs9NGBjMLHMlKQceHqTlxzou2xC/q3C3kM8Jg/F5hNpl+a14kDWZuFsx/5VXRdxVjZAieJnLVad6o6TvnI8zDAYxQOv4xnFSJmTPEDrkTWcwOdrOb6BWC3NY+JEvoewtxMmMJYMnVLmKgTU+GnJOyTmMzv7XQHE9NUmzwlUemhz3fDu4cvHJ1zTyh+r86FNAbQJC9sJp1tD8C6RGwtRV6fqzw7JwnVO2dBVwWSDN2wxy08tGlZuYTqzjQCFaZZvLRneq+io/18E3nS1jWB1x1kBNZBz1q1BcWbDHo8TnB8V9vKvqoPkD5hHhRgZTWy8K4KaCw++Ej/a12FrznYbGF//4i5FwZzxVozQYYsUcV4gjUCJ9F7w= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56c2441e-6d44-4a1c-4f37-08d9e19ef36f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 14:11:45.8626 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: c5PNfeNte9mo6q9bPmiSBCpzdY5/9KTO+yOVzp358V2ZfcBLOhgYGR3Oa0XWxrUUQFBuOlLaNO7uF7w33xy/3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9208 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220127_061155_690481_7E9BBB87 X-CRM114-Status: GOOD ( 12.67 ) 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 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 --- 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 | 4 ++-- arch/arm/boot/dts/imx7s-warp.dts | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 62b771c1d5a9..f1c60b0cb143 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -40,7 +40,7 @@ simple-audio-card,cpu { dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -293,7 +293,7 @@ codec: sgtl5000@a { compatible = "fsl,sgtl5000"; #sound-dai-cells = <0>; reg = <0x0a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <®_module_3v3_avdd>; diff --git a/arch/arm/boot/dts/imx7-mba7.dtsi b/arch/arm/boot/dts/imx7-mba7.dtsi index 49086c6b6a0a..3df6dff7734a 100644 --- a/arch/arm/boot/dts/imx7-mba7.dtsi +++ b/arch/arm/boot/dts/imx7-mba7.dtsi @@ -302,7 +302,7 @@ &i2c2 { tlv320aic32x4: audio-codec@18 { compatible = "ti,tlv320aic32x4"; reg = <0x18>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; ldoin-supply = <®_audio_3v3>; iov-supply = <®_audio_3v3>; diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts index e0751e6ba3c0..a31de900139d 100644 --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts @@ -288,7 +288,7 @@ &i2c4 { codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; }; diff --git a/arch/arm/boot/dts/imx7d-pico-hobbit.dts b/arch/arm/boot/dts/imx7d-pico-hobbit.dts index 7b2198a9372c..d917dc4f2f22 100644 --- a/arch/arm/boot/dts/imx7d-pico-hobbit.dts +++ b/arch/arm/boot/dts/imx7d-pico-hobbit.dts @@ -31,7 +31,7 @@ simple-audio-card,cpu { dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -41,7 +41,7 @@ sgtl5000: codec@a { #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; }; diff --git a/arch/arm/boot/dts/imx7d-pico-pi.dts b/arch/arm/boot/dts/imx7d-pico-pi.dts index 70bea95c06d8..f263e391e24c 100644 --- a/arch/arm/boot/dts/imx7d-pico-pi.dts +++ b/arch/arm/boot/dts/imx7d-pico-pi.dts @@ -31,7 +31,7 @@ simple-audio-card,cpu { dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -41,7 +41,7 @@ sgtl5000: codec@a { #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; }; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 7813ef960f6e..f053f5122741 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -385,14 +385,14 @@ &i2c4 { codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; wlf,hp-cfg = <2 2 3>; wlf,gpio-cfg = <1 3>; assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>, <&clks IMX7D_PLL_AUDIO_POST_DIV>, - <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; assigned-clock-rates = <0>, <884736000>, <12288000>; }; diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index 4f1edef06c92..e8734d218b9d 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -75,7 +75,7 @@ simple-audio-card,cpu { dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; }; @@ -232,7 +232,7 @@ codec: sgtl5000@a { #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <&vgen4_reg>;