From patchwork Thu Nov 17 11:36:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2497 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 25EFA4211D for ; Thu, 17 Nov 2022 12:36:48 +0100 (CET) Received: by mail-ej1-f69.google.com with SMTP id dn14-20020a17090794ce00b007ae5d040ca8sf951672ejc.17 for ; Thu, 17 Nov 2022 03:36:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668685008; cv=pass; d=google.com; s=arc-20160816; b=Llq+SV8gmZhAk+TwuOS/nZ5QOrCFiwuoVbjWcbTW9i1jH5M6Grl38KYYH+N5VnjDwy EZo1oMHzb8nKDqCv2GgMKvfq1/utOIcbY4Xb+H1/JPX5+QY4CHoJI60tS5xscx7b1mNI Qjzsj8V/15xLXpcSA5D+2WDdgz4Mjx6pLP/hPR3/dBGSPBYdPbKWaahy4I+35OQ1JVyN FSiuV3Aih0uHAXuAKnUaUbElBM8phRZ8ieL5UT3q5QhHB9KJFOJ12m4Yg2QjMb1yd5gO SS+BHr/sFZeqNMJVFpC1byndXKMqGkLe44YYTxc9OPQVocjm8MsnezeY8gLZGaE1V9BQ i/ug== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3ldJpsKOmLadNO6AhRGQQEICKYd1PVp9R2sy+dq4Bg8=; b=rJK3B2DKEeGhPkLIyqXJiUt7G/s6zyOk/uKCF4LhY1ltAbv4deQCBlTHkpz+iEMwHZ FNEmLdLGRshagKqy+e+SXgem5H4bKxZVlKgWgzWQLMLmoph8JD25wo7fqCfKzfpLqYfc vHJ/GInccXCIjXHZADlgyt4X9sNfxHtY6eWOtzaYcYG6sKsyPw7BaAKOpxgnUnshMink NHJSOyLpmQjZaahJbAOp1BKQH0IU+cviCuIqtjnlddTDQRzGoR3OH6yhTyHHXx6ZLkC/ z78YS45T+4TN+S/NG/qg4obGOK80RyUEX3D2w7ANUg9KwRKA+i8LSoNInIo56Mrz2NSt 1PnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OzcPBlTd; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3ldJpsKOmLadNO6AhRGQQEICKYd1PVp9R2sy+dq4Bg8=; b=bsb7mJVoDDR7PvdHovvGDnvsv2omCchcHg8v42TJJyprqG3/ETngtb7pJkcSghVmqc tTqD3MPlr8QJtDdmj+TCUj/aF2lukUvO2abztDl8kEctbXcmHb7QcewKseD0Rhn0drhz 0qFZyq9avuSG6HZpxvVmmWUJ056ISnRRAvbJg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender: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=3ldJpsKOmLadNO6AhRGQQEICKYd1PVp9R2sy+dq4Bg8=; b=StzkGPo3n7j0elq8OY45hwZH1gD2LrPirsL67AaYARBCVgtdE5MtOQgBXUBfFN+mH0 70H1Zo6lHjWiJFbWNpYW8aHSgm5+zcxHz/YkAqtY99y3sLUyg5gG+64plBuPZzY7KFt6 I5sC98okb8FzT6ARXNND2y+JuDdreF+qjpaps5qgIpaeGj2beCWUpzSTSvFRVzGvT/3/ ybC1nB7emlA9CpDG+/GYHjZlsKKSToIsRyMjtGLSYzYK9kell2zFzbmbpl8E1Kqdf2/E vDVyBQCZGfLpXdXao0MVnnZ14OnbjPcg1ejDt3mJrmc/jJsbeMr+dggLEgRJS6nrUBxP IHCA== X-Gm-Message-State: ANoB5pk+2de04mCs4fz9Z5ymoerXjhL5OXphTDoFAdV6IfYU8B+FoEP6 8v7DwfW1wDL1kZIrc27MrdZdZclU X-Google-Smtp-Source: AA0mqf7A3xYQV1ByrvR4EstZtMtnUpMhKRaPYKnvvSiE9f4wEj41kxWj6w6axqpEF1m3J/5cFL8jWA== X-Received: by 2002:a17:906:950a:b0:7ab:2559:8bc4 with SMTP id u10-20020a170906950a00b007ab25598bc4mr1688631ejx.682.1668685007797; Thu, 17 Nov 2022 03:36:47 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:d184:b0:7ad:9efd:4692 with SMTP id c4-20020a170906d18400b007ad9efd4692ls891802ejz.4.-pod-prod-gmail; Thu, 17 Nov 2022 03:36:46 -0800 (PST) X-Received: by 2002:a17:906:28d5:b0:7ad:88f8:68fb with SMTP id p21-20020a17090628d500b007ad88f868fbmr1841197ejd.277.1668685006611; Thu, 17 Nov 2022 03:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668685006; cv=none; d=google.com; s=arc-20160816; b=yasHX4vDN/vDVGCk19eCx5zOnoY93IqQm5zKWzao0Bf8LqePo0VdF216iMq6f67uLM AES4GOtrCDcy929KSLaKj3DflwHHXPK9QR3O0EZhTN4ChjZq/1yQ8lggdUgl7qmOBbCU TTBTpZ8KhNw/aHz+k0rh5jTWJpT9vTDDlpfanG8mI8GBZzQgLcEgvkZ7OuFN5nu7i824 NbxXzAIRmdf7HrtPCKiRIQaiwbl4ZcqQJjcVMFuIO5Pi3HVtDKVEEUP/lx5Qg1U0tuP0 6ZcL+c7AqZswsakSyqKZI0MzImdrxEhd2o1ih77S+dGgxJ/UBHQeF5SwwIfbVQdEDavy 4E8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ROWbtxy/soEJAKDSGVx/bebkoFFFAxHo/Tr5JwjJoOE=; b=GXTaLWE2Aiy3dhb40OmDLNyLMKd3poV+Iv3AA5WSO9R02k2iZ23t146uBsw8kjM+jB crUZpexF/yOeMmD1aaBbl0d65peC/wqc0tkoKTYNy+ci64Rj65mOjJ2qm60aYy9aZG1T dhOqR5pnQ0Gk8n9YmQ61T/GZg61xxGkLdZ9FQKu64/J3ToDegTuEd13L6bnpgudZVGtF MIQWzegG9NfPCu3YRP2bcUdxwMtXdtM+qOCyda4fOBcPj2w3nUuJpyey8wLa7hWmVM4c rvqfmbqtNzusS5igxiqxx6QkjLLgl9WENJvC1M1gc4TmOUi0M5qeF6zmA4/beB2tw6Hj LCaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OzcPBlTd; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id y25-20020a1709064b1900b007ae298b9e76sor258221eju.121.2022.11.17.03.36.46 for (Google Transport Security); Thu, 17 Nov 2022 03:36:46 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:1182:b0:78d:99f2:a94e with SMTP id n2-20020a170906118200b0078d99f2a94emr1805874eja.232.1668685006404; Thu, 17 Nov 2022 03:36:46 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (mob-5-90-137-239.net.vodafone.it. [5.90.137.239]) by smtp.gmail.com with ESMTPSA id g3-20020aa7c843000000b0043bbb3535d6sm413897edt.66.2022.11.17.03.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 03:36:46 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , Abel Vesa , Anson Huang , Fabio Estevam , Krzysztof Kozlowski , Michael Turquette , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , Stephen Boyd , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH v2 1/5] clk: imx8mn: rename vpu_pll to m7_alt_pll Date: Thu, 17 Nov 2022 12:36:33 +0100 Message-Id: <20221117113637.1978703-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> References: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=OzcPBlTd; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The IMX8MN platform does not have any video processing unit (VPU), and indeed in the reference manual (document IMX8MNRM Rev 2, 07/2022) there is no occurrence of its pll. From an analysis of the code and the RM itself, I think vpu pll is used instead of m7 alternate pll, probably for copy and paste of code taken from modules of similar architectures. As an example for all, if we consider the second row of the "Clock Root" table of chapter 5 (Clocks and Power Management) of the RM: Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX]) ... ... ... ARM_M7_CLK_ROOT 0x8080 000 - 24M_REF_CLK 001 - SYSTEM_PLL2_DIV5 010 - SYSTEM_PLL2_DIV4 011 - M7_ALT_PLL_CLK 100 - SYSTEM_PLL1_CLK 101 - AUDIO_PLL1_CLK 110 - VIDEO_PLL_CLK 111 - SYSTEM_PLL3_CLK ... ... ... but in the source code, the imx8mn_m7_sels clocks list contains vpu_pll for the source select bits 011b. So, let's rename "vpu_pll" to "m7_alt_pll" to be consistent with the RM. The IMX8MN_VPU_* constants have not been removed to ensure backward compatibility of the patch. No functional changes intended. Fixes: 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver") Signed-off-by: Dario Binacchi Reviewed-by: Abel Vesa --- Changes in v2: - Update the commit message. - Add Fixes tag. - Maintain IMX8MN_VPU_* constants to not break backward compatibility. drivers/clk/imx/clk-imx8mn.c | 16 ++++++++-------- include/dt-bindings/clock/imx8mn-clock.h | 12 ++++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index d37c45b676ab..72f9563a0ff6 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -30,7 +30,7 @@ static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_ static const char * const video_pll1_bypass_sels[] = {"video_pll1", "video_pll1_ref_sel", }; static const char * const dram_pll_bypass_sels[] = {"dram_pll", "dram_pll_ref_sel", }; static const char * const gpu_pll_bypass_sels[] = {"gpu_pll", "gpu_pll_ref_sel", }; -static const char * const vpu_pll_bypass_sels[] = {"vpu_pll", "vpu_pll_ref_sel", }; +static const char * const m7_alt_pll_bypass_sels[] = {"m7_alt_pll", "m7_alt_pll_ref_sel", }; static const char * const arm_pll_bypass_sels[] = {"arm_pll", "arm_pll_ref_sel", }; static const char * const sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; @@ -40,7 +40,7 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pl static const char * const imx8mn_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; -static const char * const imx8mn_m7_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "vpu_pll_out", +static const char * const imx8mn_m7_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "m7_alt_pll_out", "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; static const char * const imx8mn_gpu_core_sels[] = {"osc_24m", "gpu_pll_out", "sys_pll1_800m", @@ -252,10 +252,10 @@ static const char * const imx8mn_gpt6_sels[] = {"osc_24m", "sys_pll2_100m", "sys "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_wdog_sels[] = {"osc_24m", "sys_pll1_133m", "sys_pll1_160m", - "vpu_pll_out", "sys_pll2_125m", "sys_pll3_out", + "m7_alt_pll_out", "sys_pll2_125m", "sys_pll3_out", "sys_pll1_80m", "sys_pll2_166m", }; -static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "vpu_pll_out", +static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "m7_alt_pll_out", "sys_pll3_out", "sys_pll2_200m", "sys_pll1_266m", "sys_pll2_500m", "sys_pll1_100m", }; @@ -352,7 +352,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_REF_SEL] = imx_clk_hw_mux("video_pll1_ref_sel", base + 0x28, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL] = imx_clk_hw_mux("dram_pll_ref_sel", base + 0x50, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL] = imx_clk_hw_mux("gpu_pll_ref_sel", base + 0x64, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - hws[IMX8MN_VPU_PLL_REF_SEL] = imx_clk_hw_mux("vpu_pll_ref_sel", base + 0x74, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + hws[IMX8MN_M7_ALT_PLL_REF_SEL] = imx_clk_hw_mux("m7_alt_pll_ref_sel", base + 0x74, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_ARM_PLL_REF_SEL] = imx_clk_hw_mux("arm_pll_ref_sel", base + 0x84, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_SYS_PLL3_REF_SEL] = imx_clk_hw_mux("sys_pll3_ref_sel", base + 0x114, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); @@ -361,7 +361,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1] = imx_clk_hw_pll14xx("video_pll1", "video_pll1_ref_sel", base + 0x28, &imx_1443x_pll); hws[IMX8MN_DRAM_PLL] = imx_clk_hw_pll14xx("dram_pll", "dram_pll_ref_sel", base + 0x50, &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL] = imx_clk_hw_pll14xx("gpu_pll", "gpu_pll_ref_sel", base + 0x64, &imx_1416x_pll); - hws[IMX8MN_VPU_PLL] = imx_clk_hw_pll14xx("vpu_pll", "vpu_pll_ref_sel", base + 0x74, &imx_1416x_pll); + hws[IMX8MN_M7_ALT_PLL] = imx_clk_hw_pll14xx("m7_alt_pll", "m7_alt_pll_ref_sel", base + 0x74, &imx_1416x_pll); hws[IMX8MN_ARM_PLL] = imx_clk_hw_pll14xx("arm_pll", "arm_pll_ref_sel", base + 0x84, &imx_1416x_pll); hws[IMX8MN_SYS_PLL1] = imx_clk_hw_fixed("sys_pll1", 800000000); hws[IMX8MN_SYS_PLL2] = imx_clk_hw_fixed("sys_pll2", 1000000000); @@ -373,7 +373,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_BYPASS] = imx_clk_hw_mux_flags("video_pll1_bypass", base + 0x28, 16, 1, video_pll1_bypass_sels, ARRAY_SIZE(video_pll1_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_DRAM_PLL_BYPASS] = imx_clk_hw_mux_flags("dram_pll_bypass", base + 0x50, 16, 1, dram_pll_bypass_sels, ARRAY_SIZE(dram_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_GPU_PLL_BYPASS] = imx_clk_hw_mux_flags("gpu_pll_bypass", base + 0x64, 28, 1, gpu_pll_bypass_sels, ARRAY_SIZE(gpu_pll_bypass_sels), CLK_SET_RATE_PARENT); - hws[IMX8MN_VPU_PLL_BYPASS] = imx_clk_hw_mux_flags("vpu_pll_bypass", base + 0x74, 28, 1, vpu_pll_bypass_sels, ARRAY_SIZE(vpu_pll_bypass_sels), CLK_SET_RATE_PARENT); + hws[IMX8MN_M7_ALT_PLL_BYPASS] = imx_clk_hw_mux_flags("m7_alt_pll_bypass", base + 0x74, 28, 1, m7_alt_pll_bypass_sels, ARRAY_SIZE(m7_alt_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_ARM_PLL_BYPASS] = imx_clk_hw_mux_flags("arm_pll_bypass", base + 0x84, 28, 1, arm_pll_bypass_sels, ARRAY_SIZE(arm_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_SYS_PLL3_BYPASS] = imx_clk_hw_mux_flags("sys_pll3_bypass", base + 0x114, 28, 1, sys_pll3_bypass_sels, ARRAY_SIZE(sys_pll3_bypass_sels), CLK_SET_RATE_PARENT); @@ -383,7 +383,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_OUT] = imx_clk_hw_gate("video_pll1_out", "video_pll1_bypass", base + 0x28, 13); hws[IMX8MN_DRAM_PLL_OUT] = imx_clk_hw_gate("dram_pll_out", "dram_pll_bypass", base + 0x50, 13); hws[IMX8MN_GPU_PLL_OUT] = imx_clk_hw_gate("gpu_pll_out", "gpu_pll_bypass", base + 0x64, 11); - hws[IMX8MN_VPU_PLL_OUT] = imx_clk_hw_gate("vpu_pll_out", "vpu_pll_bypass", base + 0x74, 11); + hws[IMX8MN_M7_ALT_PLL_OUT] = imx_clk_hw_gate("m7_alt_pll_out", "m7_alt_pll_bypass", base + 0x74, 11); hws[IMX8MN_ARM_PLL_OUT] = imx_clk_hw_gate("arm_pll_out", "arm_pll_bypass", base + 0x84, 11); hws[IMX8MN_SYS_PLL3_OUT] = imx_clk_hw_gate("sys_pll3_out", "sys_pll3_bypass", base + 0x114, 11); diff --git a/include/dt-bindings/clock/imx8mn-clock.h b/include/dt-bindings/clock/imx8mn-clock.h index 07b8a282c268..694e3c050d04 100644 --- a/include/dt-bindings/clock/imx8mn-clock.h +++ b/include/dt-bindings/clock/imx8mn-clock.h @@ -19,7 +19,8 @@ #define IMX8MN_VIDEO_PLL1_REF_SEL 10 #define IMX8MN_DRAM_PLL_REF_SEL 11 #define IMX8MN_GPU_PLL_REF_SEL 12 -#define IMX8MN_VPU_PLL_REF_SEL 13 +#define IMX8MN_M7_ALT_PLL_REF_SEL 13 +#define IMX8MN_VPU_PLL_REF_SEL IMX8MN_M7_ALT_PLL_REF_SEL #define IMX8MN_ARM_PLL_REF_SEL 14 #define IMX8MN_SYS_PLL1_REF_SEL 15 #define IMX8MN_SYS_PLL2_REF_SEL 16 @@ -29,7 +30,8 @@ #define IMX8MN_VIDEO_PLL1 20 #define IMX8MN_DRAM_PLL 21 #define IMX8MN_GPU_PLL 22 -#define IMX8MN_VPU_PLL 23 +#define IMX8MN_M7_ALT_PLL 23 +#define IMX8MN_VPU_PLL IMX8MN_M7_ALT_PLL #define IMX8MN_ARM_PLL 24 #define IMX8MN_SYS_PLL1 25 #define IMX8MN_SYS_PLL2 26 @@ -39,7 +41,8 @@ #define IMX8MN_VIDEO_PLL1_BYPASS 30 #define IMX8MN_DRAM_PLL_BYPASS 31 #define IMX8MN_GPU_PLL_BYPASS 32 -#define IMX8MN_VPU_PLL_BYPASS 33 +#define IMX8MN_M7_ALT_PLL_BYPASS 33 +#define IMX8MN_VPU_PLL_BYPASS IMX8MN_M7_ALT_PLL_BYPASS #define IMX8MN_ARM_PLL_BYPASS 34 #define IMX8MN_SYS_PLL1_BYPASS 35 #define IMX8MN_SYS_PLL2_BYPASS 36 @@ -49,7 +52,8 @@ #define IMX8MN_VIDEO_PLL1_OUT 40 #define IMX8MN_DRAM_PLL_OUT 41 #define IMX8MN_GPU_PLL_OUT 42 -#define IMX8MN_VPU_PLL_OUT 43 +#define IMX8MN_M7_ALT_PLL_OUT 43 +#define IMX8MN_VPU_PLL_OUT IMX8MN_M7_ALT_PLL_OUT #define IMX8MN_ARM_PLL_OUT 44 #define IMX8MN_SYS_PLL1_OUT 45 #define IMX8MN_SYS_PLL2_OUT 46 From patchwork Thu Nov 17 11:36:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2498 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2F9AD4211D for ; Thu, 17 Nov 2022 12:36:51 +0100 (CET) Received: by mail-ed1-f72.google.com with SMTP id z11-20020a056402274b00b00461dba91468sf1039269edd.6 for ; Thu, 17 Nov 2022 03:36:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668685011; cv=pass; d=google.com; s=arc-20160816; b=K9gNqqTBnaWM9S6/DFflxotbJtQAWZm8HtTA6/9bW7hLXpejElaA3I5mI8qwRKjHp9 TQwhFFGXOZYKvCpgcHuPlK0BOyG+jCyop8h8PhTsewLnHyFeqMiSUHVtB+/PfS4A0ip8 hFHzUwRh0B7RCVqnn1+lPbIbCSLbZPjH+yVin8rWxPb4EqDyaHtl86hYtHn1cG9yS+Ih j9ADP9TCVHNA3IdZlmi78Mi1nWsOE8maWtzEGnUmE6MEUL4woRdaaozObrLS+UMh8xiu w3mBgb+5hXfKDbKMIIF5DQloo8WluITKuLRmdUf3I9dxV1sjD3zE5myGesy8I8X1KZud wIBA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hbwxr+5ZzyI0mWDQ8lTNlVqlWN9b+ep8AayiCU1AJqY=; b=tuPgPPcujlgAe7UZsQRYMLrr1TcrQLcL+kKAaTWUOSYq1rGEDxU2+niiZbShXBUM1U D2RAowWk2vEl50gaQnVHGQNAKj49nxObZMPAVdTF1h3XF2aqwaZtIp9szYKvEv4/urZO xfnRk2DdolAvwVjneKdFYDvXG3vZqKJ628xgoIMqGqzfWkWoiniC44xteYtFnhPd9fgZ PsPdc7R/IpSiCgljSKbmACm1HrwlhlATn5b0fJV9t6zK9vQ4Px64PJ0fCZfRqYbxcPDm rkLY6xJGzkcsa7rN6H+7S19rOGmOME0KkO+rO1Alr9BPck+jMZmP6ZT7LRcSEUZ6zyRe kTmA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=N3eCNDBE; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=hbwxr+5ZzyI0mWDQ8lTNlVqlWN9b+ep8AayiCU1AJqY=; b=fE3q9IZAUlgY45N4Ko6o311eeHkUSGuxTfdfUgJpd5F8HSxX50uFQbEwQJJQNju0Y9 loL1R36VlDUqf0Y/IrT7fDSXO7bRyGimn1ICbPmn76IwYhmw2gih/sAXDnYoZxg0tjcT 0K2LY3n0WmNAFgJsHn1mmy465rs4r4L4bKjXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender: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=hbwxr+5ZzyI0mWDQ8lTNlVqlWN9b+ep8AayiCU1AJqY=; b=Ly7aNr3lzeAMtcOK8qbzm0OeXz18byMmGRePh+EI/9aATQNWYLuC8/xEmNfcxfOXfH Bz1uK/7hIeOmCDYZiGu7ZJ9WmOreRLKHefH8ZKl/8G47oU13g0uQW1u/4swQ0iKDDDc8 LsvshKnHlb5IcVnBHNLQ67iTYA+CrWEqQYBIe6Q0tNnc3rpIqxwGSGNEnvY0HE5q120C fxbU/BqlEdYAZl30zI40eyaSHHu3ZgHaCn2JC7Kao0IBZRmcx3nuBbO51wXSbYEru4Q7 X7y/A2hWVmbn5v37XvylP88OjRUu3kPL1gQhNoVgywc/mqiX1GkiNikjHmQ3jAUVy56G qY/A== X-Gm-Message-State: ANoB5pltkO/p2XYccujDwbo1L7CtVwprxct6h+5oZhmA8ww8ULb8TXc7 KOkpIX0qJi1r4Oz1j0PMNJKXnDBp X-Google-Smtp-Source: AA0mqf7+6q1A5sdS7tKNP1SUUuXxOnoy4tJPA9xa7hrnWVCoBr9RIRNGizz+uZB4Fy2WSFvdRk5P6A== X-Received: by 2002:a17:906:4c4f:b0:7ad:a8c3:588f with SMTP id d15-20020a1709064c4f00b007ada8c3588fmr1680984ejw.687.1668685010984; Thu, 17 Nov 2022 03:36:50 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:7e1a:b0:7ad:934f:14b9 with SMTP id e26-20020a1709067e1a00b007ad934f14b9ls883505ejr.9.-pod-prod-gmail; Thu, 17 Nov 2022 03:36:50 -0800 (PST) X-Received: by 2002:a17:906:2743:b0:7b2:92ce:faf2 with SMTP id a3-20020a170906274300b007b292cefaf2mr1779624ejd.158.1668685009894; Thu, 17 Nov 2022 03:36:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668685009; cv=none; d=google.com; s=arc-20160816; b=Z0lEmaEpbJCJvQrPoBdK/ebapqCQ90K9iDMmUJ1Ly0VO0RNSZVorZvMrrfV/hHHMpq Gof/8RZ0ZHQ/j+xOP49c56/+Sdi4Ng4IuzWgJ1x3QCEBhv+QAFsz+MYzVuef15mop94e hz6cBl0Edm1Jnvt5TTDJ+KRNRSVn1AGZSw7xdNMAQOSSesTRYNHh//mrpyT57am2E6Ql J6tJHrZtlgxJLe7BVm/ieNbOZVY5/Kzzj6apgP3UCLijdbgq0CPZDas65im2AJD+gTY5 gUjf4imfFK+MXdoHxQA9vasGv3gzjrc+ItN9bbM//b23+CvXzKprjC+VK02Km8VHKBPm 2g3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=yxMfjMiirY7i5b76cAjsj02YyQXT341SCmcBph5Qf+U=; b=A3pLW008Z1OtwpHFPZZSfN6F9Wd3DKUULufEklnBN2vzGYDtw2PrPT24axEkoPt1hK CMeMp2uPN8nj0jhJtqTKxikrv5CZ8cazVCEZoR/FK5hqY+ReV+fwsBfrAmBbhGhEze89 8fpKS4kWMrztQyZJHdyD20fi1ck4P8cMxd/1FTX/b/Ot0objAP/7Y0/p5RXRsFFf3Stz OnTzoAVR+58eu36bvrmLTGFqOhFffdvS8QEOVLB7d9SK+OdFeyCB2Ph6pyHPmsbz11/I vV7g3NNT9o5qUSom5uHaSZLIacVwi9LuQ22VrgIEucuQ/lCKa0Zdr72AG7kC456oiDDC ykeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=N3eCNDBE; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id bq16-20020a056402215000b00459284788a2sor512241edb.10.2022.11.17.03.36.49 for (Google Transport Security); Thu, 17 Nov 2022 03:36:49 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:1399:b0:461:53b0:2ac0 with SMTP id b25-20020a056402139900b0046153b02ac0mr1740983edv.153.1668685009735; Thu, 17 Nov 2022 03:36:49 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (mob-5-90-137-239.net.vodafone.it. [5.90.137.239]) by smtp.gmail.com with ESMTPSA id g3-20020aa7c843000000b0043bbb3535d6sm413897edt.66.2022.11.17.03.36.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 03:36:49 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , Abel Vesa , Anson Huang , Fabio Estevam , Michael Turquette , NXP Linux Team , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH v2 2/5] clk: imx: replace osc_hdmi with dummy Date: Thu, 17 Nov 2022 12:36:34 +0100 Message-Id: <20221117113637.1978703-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> References: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=N3eCNDBE; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , There is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes 76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "osc_hdmi". Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits. Tested on the BSH SystemMaster (SMM) S2 board. Fixes: 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver") Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 72f9563a0ff6..0fae97e61e2c 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -108,27 +108,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", }; static const char * const imx8mn_sai2_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai3_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai5_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_sai6_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai7_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_spdif1_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "osc_hdmi", + "video_pll1_out", "sys_pll1_133m", "dummy", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m", From patchwork Thu Nov 17 11:36:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2499 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id AF9E44211D for ; Thu, 17 Nov 2022 12:36:53 +0100 (CET) Received: by mail-ed1-f72.google.com with SMTP id f17-20020a056402355100b00466481256f6sf1036434edd.19 for ; Thu, 17 Nov 2022 03:36:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668685013; cv=pass; d=google.com; s=arc-20160816; b=NbTldgp5TsdLH/nz0X/UAI+K/IueRykPRFxExlIDlM6Y8dALuwZQ6C2y2Zp5QDVz4q xCuUbBoewKmEZEhILh2j4yiYy9RAySgy8kkJiXvi/N7EdNzLqVIxYTLxT435ljnAZd9s 79vBvblo7bWTgAAnIGjKEe+My74EBL28ghCXdD9XczIPwENlbHDyBQwvpohRBpeN/dZl hdHFhozgZ9IJdY06bb22wDuimBR/l2iR5zxBuDR6xNrDD6WwXXpuvChA+GtwVUGCmn7t pa5SA/lvCrasFpcbuiUG4HM6QqPGdQZP0HGhITxnCQ3ybHpqIjobTfUjWkXUXiQw3VBv vmiw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=AvST1PbVm8C13RsEsfXJrhOs2NeAwcJecSw53V9ZOHY=; b=TFC+BqR3/B1FxkZP79wTcA0TvG9bhIv1IH/BriclZ3LhHjgYA6QJHCD+MKD61Ar5XX 9JLgvcy98kb0SsW1cpNzzgpOtd6I+EO+cmYY/MwponoAYAqccTo9zgGRpSvC3bUVyqz3 htU6hh+MKnK3/BtFV1Ttxf3pwup2JS0hKatOAhbVxEpNCcFViHk+03ZNHij/BEKa/Vg/ voS2eZJDxC45jBQ5EQFNowNtstjOIICk8Uju4AhLaucjCwpxz6Yu6Fbd7/SN8++BiPrn SFDq0W36Ft3WIve2CSnEVtmYRkk7MKwA3IKF4t5LRnin9WUg4YiV57jOEn0E6hMIVcnP RLDg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ozxzcdyD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=AvST1PbVm8C13RsEsfXJrhOs2NeAwcJecSw53V9ZOHY=; b=Gr7iYAbJGUfvaSVr/CX6zSNWng/YwdJ/4qO4oRheF5dx4S1gy7lZ5nlJXx0Ezrc8WT 1odRh/eE/KiKgfd40QqLE0vTv8z3AtzdGbu6iY/kTBOqOWp0XsEMq+w6cQtcznn6clK4 ilnvVIlJZ3nAZmpUJPY73UXZ48olMzWJlmUDo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender: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=AvST1PbVm8C13RsEsfXJrhOs2NeAwcJecSw53V9ZOHY=; b=UsoPNGjhjIS9Jcd8n7iP+jNBX8VH10ZyNahqzv5LBYP4+Ib6pZ2Z5+ToTPMGYmvt+V tq8v38TU00ZT0PZMINTMjJ2Rs1oFud6dKzQ3jHzdO3jdiaT/H1tZeTD9dhUZ9FeG40/I H+mzjlVN7ISX5NxDs/zxW5yEr+rp+sCR7tLPuIpPglR4NpQdMvyaB9PDmy4HmUe8eASG AZrbAJKsVm4sNSsbGhhVtn3xp1fGl2RkkfJgk+UwJnaFJD9F3fT6YH4NIN/FRQbdkkzs EuX7gh8sce2ivGPYX/PsB9IRyD1zd701eBrVPKggGzCdQDVsZ/MN5o929jmiH0cJStRp BoIQ== X-Gm-Message-State: ANoB5pmIOgNBWPICZH3xCr/upmwGZhfFnpxK5Cg2VAGYahXsRdv4GRyB GZKmgXPeEpbWAwgNxovbVlaJQfQn X-Google-Smtp-Source: AA0mqf7y8LH8QT3o8OgtPwEmk7GvWK9lewr/Wc6XScp8eFKRoNuk1cErTRzlf8/8whe0Gp1zN4M1wQ== X-Received: by 2002:a17:906:a889:b0:7ad:bd02:f491 with SMTP id ha9-20020a170906a88900b007adbd02f491mr1840871ejb.703.1668685013402; Thu, 17 Nov 2022 03:36:53 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:1452:b0:7b2:77f0:9d5 with SMTP id q18-20020a170906145200b007b277f009d5ls879677ejc.5.-pod-prod-gmail; Thu, 17 Nov 2022 03:36:52 -0800 (PST) X-Received: by 2002:a17:906:68cd:b0:7ac:f8e3:d547 with SMTP id y13-20020a17090668cd00b007acf8e3d547mr1830490ejr.53.1668685012224; Thu, 17 Nov 2022 03:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668685012; cv=none; d=google.com; s=arc-20160816; b=APw9BMyQonsZnQh9Hnx/+7KEqTKNZD+0mPuxsFP93wY4vHbYy2xv6GdDU8xNpcSdfo 0Y8UxTuXOS5ZGi5XCf0EtGvhSNUM8C1klJyHVHrl7RInHwJD0iPJUjuwpmF7bnGtp6OA OLu8QmLPJF3wpj92sde903vWYzzFzCPfceE490Hd0cPh2ga8xdXJi+BhSHQcGoC0SB9U Jl22/SylBFZH32ExfMnKdCJWYIc9cX6jrWUAApXEC16EScOQAzsx6VZZpTp+WmkVSWki a3LEICn6f8KTglL2UuTE13hVWAsQAcC/1oVlxq41dugBQltgFoFH2LEK+5DgVYXLcRrE HkFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Rl6wZCAHM6P6IFwXGM/MR+ypnVw95L969SDFtD13ca0=; b=Eg+o0UhS9iPmlVHrgIzb7YEbNWzoPFz97hJCGHgpXvQHWba7KBEK6oXbOz2IrA3yBX /kcSbclabmFl8X4dhwUWmmNRK7eMbuj6Fm6CfqepNBAD5ogbTeLxLXo7hw46D/k5Ett/ 8uu7RH+mCnvJPRxegw4JwoJwpCOD0AX4AGkECvWCfwwaA47VXkKR9mj2YwbWKpouxBoT 3kUgYeNxqfRBM7jYwND3qMy9n9qZxvV5ZwvYYlE3CwhBB0j4eWUxK+nJK95Jwb3icL0M y3WI33jTlpVQjrGIawhj/cJYPVEB2QsH00/ItUU38NkjvO7+NUQDSiw7V7ZXMJamPOYj +6JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ozxzcdyD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id gk1-20020a17090790c100b0078df67502desor274509ejb.124.2022.11.17.03.36.52 for (Google Transport Security); Thu, 17 Nov 2022 03:36:52 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:b210:b0:7ae:d116:fabb with SMTP id p16-20020a170906b21000b007aed116fabbmr1744882ejz.317.1668685011937; Thu, 17 Nov 2022 03:36:51 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (mob-5-90-137-239.net.vodafone.it. [5.90.137.239]) by smtp.gmail.com with ESMTPSA id g3-20020aa7c843000000b0043bbb3535d6sm413897edt.66.2022.11.17.03.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 03:36:51 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , Abel Vesa , Anson Huang , Fabio Estevam , Krzysztof Kozlowski , Michael Turquette , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , Stephen Boyd , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH v2 3/5] clk: imx: rename video_pll1 to video_pll Date: Thu, 17 Nov 2022 12:36:35 +0100 Message-Id: <20221117113637.1978703-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> References: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ozxzcdyD; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Unlike audio_pll1 and audio_pll2, there is no video_pll2. Further, the name used in the RM is video_pll. So, let's rename "video_pll1" to "video_pll" to be consistent with the RM and avoid misunderstandings. The IMX8MN_VIDEO_PLL1* constants have not been removed to ensure backward compatibility of the patch. No functional changes intended. Fixes: 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver") Signed-off-by: Dario Binacchi Reviewed-by: Abel Vesa --- Changes in v2: - Update the commit message. - Add Fixes tag. - Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility. drivers/clk/imx/clk-imx8mn.c | 96 ++++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 12 ++- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 0fae97e61e2c..b80af5d1ef46 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -27,7 +27,7 @@ static u32 share_count_nand; static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", }; static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", }; static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_ref_sel", }; -static const char * const video_pll1_bypass_sels[] = {"video_pll1", "video_pll1_ref_sel", }; +static const char * const video_pll_bypass_sels[] = {"video_pll", "video_pll_ref_sel", }; static const char * const dram_pll_bypass_sels[] = {"dram_pll", "dram_pll_ref_sel", }; static const char * const gpu_pll_bypass_sels[] = {"gpu_pll", "gpu_pll_ref_sel", }; static const char * const m7_alt_pll_bypass_sels[] = {"m7_alt_pll", "m7_alt_pll_ref_sel", }; @@ -41,23 +41,23 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pl static const char * const imx8mn_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; static const char * const imx8mn_m7_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "m7_alt_pll_out", - "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; + "sys_pll1_800m", "audio_pll1_out", "video_pll_out", "sys_pll3_out", }; static const char * const imx8mn_gpu_core_sels[] = {"osc_24m", "gpu_pll_out", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_1000m", "audio_pll1_out", - "video_pll1_out", "audio_pll2_out", }; + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_gpu_shader_sels[] = {"osc_24m", "gpu_pll_out", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_1000m", "audio_pll1_out", - "video_pll1_out", "audio_pll2_out", }; + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_main_axi_sels[] = {"osc_24m", "sys_pll2_333m", "sys_pll1_800m", "sys_pll2_250m", "sys_pll2_1000m", "audio_pll1_out", - "video_pll1_out", "sys_pll1_100m",}; + "video_pll_out", "sys_pll1_100m",}; static const char * const imx8mn_enet_axi_sels[] = {"osc_24m", "sys_pll1_266m", "sys_pll1_800m", "sys_pll2_250m", "sys_pll2_200m", "audio_pll1_out", - "video_pll1_out", "sys_pll3_out", }; + "video_pll_out", "sys_pll3_out", }; static const char * const imx8mn_nand_usdhc_sels[] = {"osc_24m", "sys_pll1_266m", "sys_pll1_800m", "sys_pll2_200m", "sys_pll1_133m", "sys_pll3_out", @@ -77,23 +77,23 @@ static const char * const imx8mn_usb_bus_sels[] = {"osc_24m", "sys_pll2_500m", " static const char * const imx8mn_gpu_axi_sels[] = {"osc_24m", "sys_pll1_800m", "gpu_pll_out", "sys_pll3_out", "sys_pll2_1000m", "audio_pll1_out", - "video_pll1_out", "audio_pll2_out", }; + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_gpu_ahb_sels[] = {"osc_24m", "sys_pll1_800m", "gpu_pll_out", "sys_pll3_out", "sys_pll2_1000m", "audio_pll1_out", - "video_pll1_out", "audio_pll2_out", }; + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_noc_sels[] = {"osc_24m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_1000m", "sys_pll2_500m", "audio_pll1_out", - "video_pll1_out", "audio_pll2_out", }; + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_ahb_sels[] = {"osc_24m", "sys_pll1_133m", "sys_pll1_800m", "sys_pll1_400m", "sys_pll2_125m", "sys_pll3_out", - "audio_pll1_out", "video_pll1_out", }; + "audio_pll1_out", "video_pll_out", }; static const char * const imx8mn_audio_ahb_sels[] = {"osc_24m", "sys_pll2_500m", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll2_166m", "sys_pll3_out", - "audio_pll1_out", "video_pll1_out", }; + "audio_pll1_out", "video_pll_out", }; static const char * const imx8mn_dram_alt_sels[] = {"osc_24m", "sys_pll1_800m", "sys_pll1_100m", "sys_pll2_500m", "sys_pll2_1000m", "sys_pll3_out", @@ -103,49 +103,49 @@ static const char * const imx8mn_dram_apb_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", }; -static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out", "audio_pll2_out", +static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll_out", "audio_pll2_out", "audio_pll1_out", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", "clk_ext4", }; static const char * const imx8mn_sai2_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai3_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai5_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_sai6_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai7_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_spdif1_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll_out", "sys_pll1_133m", "dummy", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m", "sys_pll2_100m", "sys_pll1_160m", "audio_pll1_out", - "video_pll1_out", "clk_ext4", }; + "video_pll_out", "clk_ext4", }; static const char * const imx8mn_enet_timer_sels[] = {"osc_24m", "sys_pll2_100m", "audio_pll1_out", "clk_ext1", "clk_ext2", "clk_ext3", - "clk_ext4", "video_pll1_out", }; + "clk_ext4", "video_pll_out", }; static const char * const imx8mn_enet_phy_sels[] = {"osc_24m", "sys_pll2_50m", "sys_pll2_125m", - "sys_pll2_200m", "sys_pll2_500m", "video_pll1_out", + "sys_pll2_200m", "sys_pll2_500m", "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_nand_sels[] = {"osc_24m", "sys_pll2_500m", "audio_pll1_out", "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out", - "sys_pll2_250m", "video_pll1_out", }; + "sys_pll2_250m", "video_pll_out", }; static const char * const imx8mn_qspi_sels[] = {"osc_24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m", @@ -160,19 +160,19 @@ static const char * const imx8mn_usdhc2_sels[] = {"osc_24m", "sys_pll1_400m", "s "audio_pll2_out", "sys_pll1_100m", }; static const char * const imx8mn_i2c1_sels[] = {"osc_24m", "sys_pll1_160m", "sys_pll2_50m", - "sys_pll3_out", "audio_pll1_out", "video_pll1_out", + "sys_pll3_out", "audio_pll1_out", "video_pll_out", "audio_pll2_out", "sys_pll1_133m", }; static const char * const imx8mn_i2c2_sels[] = {"osc_24m", "sys_pll1_160m", "sys_pll2_50m", - "sys_pll3_out", "audio_pll1_out", "video_pll1_out", + "sys_pll3_out", "audio_pll1_out", "video_pll_out", "audio_pll2_out", "sys_pll1_133m", }; static const char * const imx8mn_i2c3_sels[] = {"osc_24m", "sys_pll1_160m", "sys_pll2_50m", - "sys_pll3_out", "audio_pll1_out", "video_pll1_out", + "sys_pll3_out", "audio_pll1_out", "video_pll_out", "audio_pll2_out", "sys_pll1_133m", }; static const char * const imx8mn_i2c4_sels[] = {"osc_24m", "sys_pll1_160m", "sys_pll2_50m", - "sys_pll3_out", "audio_pll1_out", "video_pll1_out", + "sys_pll3_out", "audio_pll1_out", "video_pll_out", "audio_pll2_out", "sys_pll1_133m", }; static const char * const imx8mn_uart1_sels[] = {"osc_24m", "sys_pll1_80m", "sys_pll2_200m", @@ -213,42 +213,42 @@ static const char * const imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "s static const char * const imx8mn_pwm1_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m", "sys_pll3_out", "clk_ext1", - "sys_pll1_80m", "video_pll1_out", }; + "sys_pll1_80m", "video_pll_out", }; static const char * const imx8mn_pwm2_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m", "sys_pll3_out", "clk_ext1", - "sys_pll1_80m", "video_pll1_out", }; + "sys_pll1_80m", "video_pll_out", }; static const char * const imx8mn_pwm3_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m", "sys_pll3_out", "clk_ext2", - "sys_pll1_80m", "video_pll1_out", }; + "sys_pll1_80m", "video_pll_out", }; static const char * const imx8mn_pwm4_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m", "sys_pll3_out", "clk_ext2", - "sys_pll1_80m", "video_pll1_out", }; + "sys_pll1_80m", "video_pll_out", }; static const char * const imx8mn_gpt1_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_gpt2_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_gpt3_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_gpt4_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_gpt5_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_gpt6_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_400m", - "sys_pll1_40m", "video_pll1_out", "sys_pll1_80m", + "sys_pll1_40m", "video_pll_out", "sys_pll1_80m", "audio_pll1_out", "clk_ext1", }; static const char * const imx8mn_wdog_sels[] = {"osc_24m", "sys_pll1_133m", "sys_pll1_160m", @@ -261,15 +261,15 @@ static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "m7_ static const char * const imx8mn_dsi_core_sels[] = {"osc_24m", "sys_pll1_266m", "sys_pll2_250m", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_dsi_phy_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_100m", "sys_pll1_800m", "sys_pll2_1000m", "clk_ext2", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_dsi_dbi_sels[] = {"osc_24m", "sys_pll1_266m", "sys_pll2_100m", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_usdhc3_sels[] = {"osc_24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", @@ -277,15 +277,15 @@ static const char * const imx8mn_usdhc3_sels[] = {"osc_24m", "sys_pll1_400m", "s static const char * const imx8mn_camera_pixel_sels[] = {"osc_24m", "sys_pll1_266m", "sys_pll2_250m", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_csi1_phy_sels[] = {"osc_24m", "sys_pll2_333m", "sys_pll2_100m", "sys_pll1_800m", "sys_pll2_1000m", "clk_ext2", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_csi2_phy_sels[] = {"osc_24m", "sys_pll2_333m", "sys_pll2_100m", "sys_pll1_800m", "sys_pll2_1000m", "clk_ext2", - "audio_pll2_out", "video_pll1_out", }; + "audio_pll2_out", "video_pll_out", }; static const char * const imx8mn_csi2_esc_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll1_80m", "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", @@ -306,9 +306,9 @@ static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "du "dummy", "sys_pll1_80m", }; static const char * const imx8mn_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_400m", "sys_pll2_166m", "sys_pll3_out", "audio_pll1_out", - "video_pll1_out", "osc_32k", }; + "video_pll_out", "osc_32k", }; -static const char * const clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", "video_pll1_out", +static const char * const clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", "video_pll_out", "dummy", "dummy", "gpu_pll_out", "dummy", "arm_pll_out", "sys_pll1", "sys_pll2", "sys_pll3", "dummy", "dummy", "osc_24m", "dummy", "osc_32k"}; @@ -349,7 +349,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1_REF_SEL] = imx_clk_hw_mux("audio_pll1_ref_sel", base + 0x0, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_AUDIO_PLL2_REF_SEL] = imx_clk_hw_mux("audio_pll2_ref_sel", base + 0x14, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); - hws[IMX8MN_VIDEO_PLL1_REF_SEL] = imx_clk_hw_mux("video_pll1_ref_sel", base + 0x28, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); + hws[IMX8MN_VIDEO_PLL_REF_SEL] = imx_clk_hw_mux("video_pll_ref_sel", base + 0x28, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL] = imx_clk_hw_mux("dram_pll_ref_sel", base + 0x50, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL] = imx_clk_hw_mux("gpu_pll_ref_sel", base + 0x64, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); hws[IMX8MN_M7_ALT_PLL_REF_SEL] = imx_clk_hw_mux("m7_alt_pll_ref_sel", base + 0x74, 0, 2, pll_ref_sels, ARRAY_SIZE(pll_ref_sels)); @@ -358,7 +358,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1] = imx_clk_hw_pll14xx("audio_pll1", "audio_pll1_ref_sel", base, &imx_1443x_pll); hws[IMX8MN_AUDIO_PLL2] = imx_clk_hw_pll14xx("audio_pll2", "audio_pll2_ref_sel", base + 0x14, &imx_1443x_pll); - hws[IMX8MN_VIDEO_PLL1] = imx_clk_hw_pll14xx("video_pll1", "video_pll1_ref_sel", base + 0x28, &imx_1443x_pll); + hws[IMX8MN_VIDEO_PLL] = imx_clk_hw_pll14xx("video_pll", "video_pll_ref_sel", base + 0x28, &imx_1443x_pll); hws[IMX8MN_DRAM_PLL] = imx_clk_hw_pll14xx("dram_pll", "dram_pll_ref_sel", base + 0x50, &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL] = imx_clk_hw_pll14xx("gpu_pll", "gpu_pll_ref_sel", base + 0x64, &imx_1416x_pll); hws[IMX8MN_M7_ALT_PLL] = imx_clk_hw_pll14xx("m7_alt_pll", "m7_alt_pll_ref_sel", base + 0x74, &imx_1416x_pll); @@ -370,7 +370,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) /* PLL bypass out */ hws[IMX8MN_AUDIO_PLL1_BYPASS] = imx_clk_hw_mux_flags("audio_pll1_bypass", base, 16, 1, audio_pll1_bypass_sels, ARRAY_SIZE(audio_pll1_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_AUDIO_PLL2_BYPASS] = imx_clk_hw_mux_flags("audio_pll2_bypass", base + 0x14, 16, 1, audio_pll2_bypass_sels, ARRAY_SIZE(audio_pll2_bypass_sels), CLK_SET_RATE_PARENT); - hws[IMX8MN_VIDEO_PLL1_BYPASS] = imx_clk_hw_mux_flags("video_pll1_bypass", base + 0x28, 16, 1, video_pll1_bypass_sels, ARRAY_SIZE(video_pll1_bypass_sels), CLK_SET_RATE_PARENT); + hws[IMX8MN_VIDEO_PLL_BYPASS] = imx_clk_hw_mux_flags("video_pll_bypass", base + 0x28, 16, 1, video_pll_bypass_sels, ARRAY_SIZE(video_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_DRAM_PLL_BYPASS] = imx_clk_hw_mux_flags("dram_pll_bypass", base + 0x50, 16, 1, dram_pll_bypass_sels, ARRAY_SIZE(dram_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_GPU_PLL_BYPASS] = imx_clk_hw_mux_flags("gpu_pll_bypass", base + 0x64, 28, 1, gpu_pll_bypass_sels, ARRAY_SIZE(gpu_pll_bypass_sels), CLK_SET_RATE_PARENT); hws[IMX8MN_M7_ALT_PLL_BYPASS] = imx_clk_hw_mux_flags("m7_alt_pll_bypass", base + 0x74, 28, 1, m7_alt_pll_bypass_sels, ARRAY_SIZE(m7_alt_pll_bypass_sels), CLK_SET_RATE_PARENT); @@ -380,7 +380,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) /* PLL out gate */ hws[IMX8MN_AUDIO_PLL1_OUT] = imx_clk_hw_gate("audio_pll1_out", "audio_pll1_bypass", base, 13); hws[IMX8MN_AUDIO_PLL2_OUT] = imx_clk_hw_gate("audio_pll2_out", "audio_pll2_bypass", base + 0x14, 13); - hws[IMX8MN_VIDEO_PLL1_OUT] = imx_clk_hw_gate("video_pll1_out", "video_pll1_bypass", base + 0x28, 13); + hws[IMX8MN_VIDEO_PLL_OUT] = imx_clk_hw_gate("video_pll_out", "video_pll_bypass", base + 0x28, 13); hws[IMX8MN_DRAM_PLL_OUT] = imx_clk_hw_gate("dram_pll_out", "dram_pll_bypass", base + 0x50, 13); hws[IMX8MN_GPU_PLL_OUT] = imx_clk_hw_gate("gpu_pll_out", "gpu_pll_bypass", base + 0x64, 11); hws[IMX8MN_M7_ALT_PLL_OUT] = imx_clk_hw_gate("m7_alt_pll_out", "m7_alt_pll_bypass", base + 0x74, 11); diff --git a/include/dt-bindings/clock/imx8mn-clock.h b/include/dt-bindings/clock/imx8mn-clock.h index 694e3c050d04..04809edab33c 100644 --- a/include/dt-bindings/clock/imx8mn-clock.h +++ b/include/dt-bindings/clock/imx8mn-clock.h @@ -16,7 +16,8 @@ #define IMX8MN_CLK_EXT4 7 #define IMX8MN_AUDIO_PLL1_REF_SEL 8 #define IMX8MN_AUDIO_PLL2_REF_SEL 9 -#define IMX8MN_VIDEO_PLL1_REF_SEL 10 +#define IMX8MN_VIDEO_PLL_REF_SEL 10 +#define IMX8MN_VIDEO_PLL1_REF_SEL IMX8MN_VIDEO_PLL_REF_SEL #define IMX8MN_DRAM_PLL_REF_SEL 11 #define IMX8MN_GPU_PLL_REF_SEL 12 #define IMX8MN_M7_ALT_PLL_REF_SEL 13 @@ -27,7 +28,8 @@ #define IMX8MN_SYS_PLL3_REF_SEL 17 #define IMX8MN_AUDIO_PLL1 18 #define IMX8MN_AUDIO_PLL2 19 -#define IMX8MN_VIDEO_PLL1 20 +#define IMX8MN_VIDEO_PLL 20 +#define IMX8MN_VIDEO_PLL1 IMX8MN_VIDEO_PLL #define IMX8MN_DRAM_PLL 21 #define IMX8MN_GPU_PLL 22 #define IMX8MN_M7_ALT_PLL 23 @@ -38,7 +40,8 @@ #define IMX8MN_SYS_PLL3 27 #define IMX8MN_AUDIO_PLL1_BYPASS 28 #define IMX8MN_AUDIO_PLL2_BYPASS 29 -#define IMX8MN_VIDEO_PLL1_BYPASS 30 +#define IMX8MN_VIDEO_PLL_BYPASS 30 +#define IMX8MN_VIDEO_PLL1_BYPASS IMX8MN_VIDEO_PLL_BYPASS #define IMX8MN_DRAM_PLL_BYPASS 31 #define IMX8MN_GPU_PLL_BYPASS 32 #define IMX8MN_M7_ALT_PLL_BYPASS 33 @@ -49,7 +52,8 @@ #define IMX8MN_SYS_PLL3_BYPASS 37 #define IMX8MN_AUDIO_PLL1_OUT 38 #define IMX8MN_AUDIO_PLL2_OUT 39 -#define IMX8MN_VIDEO_PLL1_OUT 40 +#define IMX8MN_VIDEO_PLL_OUT 40 +#define IMX8MN_VIDEO_PLL1_OUT IMX8MN_VIDEO_PLL_OUT #define IMX8MN_DRAM_PLL_OUT 41 #define IMX8MN_GPU_PLL_OUT 42 #define IMX8MN_M7_ALT_PLL_OUT 43 From patchwork Thu Nov 17 11:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2500 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 1FACC4211D for ; Thu, 17 Nov 2022 12:36:55 +0100 (CET) Received: by mail-ej1-f70.google.com with SMTP id sc40-20020a1709078a2800b007ae024e5e82sf962972ejc.13 for ; Thu, 17 Nov 2022 03:36:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668685015; cv=pass; d=google.com; s=arc-20160816; b=bwvsGmvXT93qEPAE9Wh/1pbuOYbb3cSpWWeIn024f30YR8zBVzGleRkQu1k+NIkZ8L Sz767/rnVN4T6rMtF5CJFV+qqexzVXSubQyDTlPQSU53svQ+vaerb4ZrMmtIQETGM1nV cVt+zZkDxwP9oc7ys+sQpUEpuulZAMf4wM8BYArIvCON6EBcUfYrQw3fuRyOiFnwciDp awaA2kuOioV40YxQuY6oOrIMrDvg7M1MYyQeVdsrRqaLfKruR6AFEUTNTnYe4bnUnQ/u t830ubo+r+DmahWDP8TRHTF45llDrZNuhvb6BloCqd2JGetA7C8iIQOhAziBSFnXl/cU T+9A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZOlpcqghMK6uSLl5TQqdBYixKLmHZIj2zxFvCiGVb8w=; b=wCjxtTG+nGoDNvrkA846zV1ZFNjptmUDNeFaaeb7HfeWwNvRN2I6RmyFy594tWnIoA BsUlwDzBkAkJiq3wP2fMGIElOFqI2gRgN73AQqCWjmluVEI5iwPmpNc34rOPJPgI/fCh uOMHXGmx71HW6mndMGZwGaC0n3akJ+B3RURLKqjxnQqDimhVPcr7EgchkTgFfjr3Gxzc tPaIIVR6vCpzkUaHqoaQHdgiXKt7jteqWVyKh9TqbZBHN/Zl6EF4b85XumFqPZt6GZA5 QUJbQfnOAoK0Y2foGMHZvgo1Xqhd5gUgChZ7iJlir/Tip2n/N12dBZ0sdsJFPAbGojrB VVQQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HAScRzzT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZOlpcqghMK6uSLl5TQqdBYixKLmHZIj2zxFvCiGVb8w=; b=LRuIqiM6S0pTxEY1PIITcSmCo8fFz3uKrOLopbvKZMM2afAJpWk492YyWnKPRQtgtd Af+NFwItogZHczHIB+hOCuNGhJ7ZjLjbfgm5C7JD0VqJdWzq8xxFjenngqwPvCZ8h/bR HzIeAxjtT1GHwXdi+f0lMOYGJoJ1lxc4h3KUs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender: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=ZOlpcqghMK6uSLl5TQqdBYixKLmHZIj2zxFvCiGVb8w=; b=gANq43ybJXQQ+kaiIOXKYgxioUz2sIAJc8iKP9HpGAJk2aphZWZdVmfwSSrrGstyQh qZsmcpQFXeWUccOkyMGIBiz+5R4Wri8G76bCASuZ+upVHIyTmhCifLQ6LzUXsRHGXszW LAWbKi45I5NJ75+TdnLTWrnMt0lSoyjQYQjVf4wH65EKsr5prVVIGtUjAgraDmzdNNI+ LzrJ+I+8JzZsOvuqWfo0cZ3Uoq/TGe/oNRFJ74eaX0E5FONal+H5wpQ0wMok4Y8MA196 wNSn9RKEDb216ZZU85ZOOQXm2+i6HR/+xmdRjOUXkRnbo1Ou4NRUWTs1kDYqcWBFYD3r eQjA== X-Gm-Message-State: ANoB5pm+r7ercae/cQpWNJKXL9fFN6Zwx4BBzOIohaOHPN5izLu270/1 HIuCUCcIYrY3hcjybgBwWVq7fINF X-Google-Smtp-Source: AA0mqf7vyYZRE3M/RbSMJoleN9SrYN4s5eubORWqbC0AGfiFR1Hczo2AskucZzXd6MN97pix68SlGw== X-Received: by 2002:a17:906:c40b:b0:7ae:1e53:95b2 with SMTP id u11-20020a170906c40b00b007ae1e5395b2mr1754632ejz.333.1668685014933; Thu, 17 Nov 2022 03:36:54 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4413:b0:457:99eb:cba9 with SMTP id y19-20020a056402441300b0045799ebcba9ls85258eda.0.-pod-prod-gmail; Thu, 17 Nov 2022 03:36:54 -0800 (PST) X-Received: by 2002:a05:6402:5010:b0:467:60bd:41a1 with SMTP id p16-20020a056402501000b0046760bd41a1mr1846639eda.97.1668685013982; Thu, 17 Nov 2022 03:36:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668685013; cv=none; d=google.com; s=arc-20160816; b=FwB80tkSiDenZT9JL5HpXrcgEurQMwUC/080b8Ends21+lUvPGlWmveW95KaY2Cceg tFAkFBJYXLerDa27mGATRflavgHIkMz+tSDTN7R+W7mpn6vgCCpicsUNa6H5Ox5Nkfoh 4aSHCmBN5crz+ySaJJMneXC28F/NrvC1AXOGkqLy13XfVXUXdVyBO0cy2xv5zgklvUjp EMc1bMKlRUUC5kcmVsyIH7GjXlb5swBevfK8qPNl1zZUJ0tIGx9s/AUBZdIYXonVLZ+x MXvxvpRXzJhFMm0HkSCBlDdyHS1iNE352az569ntG9XZA0pyXNv76OGRSi7ssbiUD3RB drAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=1SFs+QuCEjvSeA5k7rG5hAilinvi7WiyttbklMW+zRY=; b=Pd+stCBnQnlCyodI0SaWBSeBUaqQ/YxcNoJy6FFZmD/bmKotnKjgatMwLy4HdDImUN ah0uh0Q1ak+xw2mdNskYP0R2Qoq5uQUKJrl1MxUaT+m32L1Co4mDLxp1K6MrPiypxPaA HoOR8j7V1877GYuJpOdgRufSmp1D/xZEGJb9FBCx1YiF9DUiiODwqydwV7sfYS5wi5k/ PVTwXkPnEWMZzUotcVGEAuZeNRF2geZMCbr1nSqV1c8kFG3BFPewkEHvyo1NwUijAb/Y tCH/BcmE78c/aXwlJozxrk/cpmeqPdPstNs3ah7BPtYv6UzrFdiaUmWwJevsigMZ/NR2 7Fug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HAScRzzT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id z3-20020a170906240300b007b2a0a61cc7sor268509eja.91.2022.11.17.03.36.53 for (Google Transport Security); Thu, 17 Nov 2022 03:36:53 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:15ca:b0:7a5:7c1c:cc5c with SMTP id l10-20020a17090615ca00b007a57c1ccc5cmr1779224ejd.644.1668685013753; Thu, 17 Nov 2022 03:36:53 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (mob-5-90-137-239.net.vodafone.it. [5.90.137.239]) by smtp.gmail.com with ESMTPSA id g3-20020aa7c843000000b0043bbb3535d6sm413897edt.66.2022.11.17.03.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 03:36:53 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , Abel Vesa , Anson Huang , Fabio Estevam , Michael Turquette , NXP Linux Team , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH v2 4/5] clk: imx8mn: fix imx8mn_sai2_sels clocks list Date: Thu, 17 Nov 2022 12:36:36 +0100 Message-Id: <20221117113637.1978703-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> References: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HAScRzzT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022): Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX]) ... ... ... SAI2_CLK_ROOT 0xA600 000 - 24M_REF_CLK 001 - AUDIO_PLL1_CLK 010 - AUDIO_PLL2_CLK 011 - VIDEO_PLL_CLK 100 - SYSTEM_PLL1_DIV6 110 - EXT_CLK_2 111 - EXT_CLK_3 ... ... ... while the imx8mn_sai2_sels list contained clk_ext3 and clk_ext4 for source select bits 110b and 111b. Fixes: 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver") Signed-off-by: Dario Binacchi Reviewed-by: Abel Vesa --- (no changes since v1) drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index b80af5d1ef46..37128c35198d 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -109,7 +109,7 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll_out" static const char * const imx8mn_sai2_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", "video_pll_out", "sys_pll1_133m", "dummy", - "clk_ext3", "clk_ext4", }; + "clk_ext2", "clk_ext3", }; static const char * const imx8mn_sai3_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", "video_pll_out", "sys_pll1_133m", "dummy", From patchwork Thu Nov 17 11:36:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2501 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id EED994211D for ; Thu, 17 Nov 2022 12:36:56 +0100 (CET) Received: by mail-ej1-f72.google.com with SMTP id sg37-20020a170907a42500b007adaedb5ba2sf950801ejc.18 for ; Thu, 17 Nov 2022 03:36:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668685016; cv=pass; d=google.com; s=arc-20160816; b=kbDRGhKVySIOX2MenT/oSiks297vvd7MtlU7BYFWK9kWMHd3gDYVQvI3NtDePM5Z2Z mPsRHL6qZhoMB5iG/llDq/s3m9jtTFH/hxo7+RtAZlF3K6WWTEu3mGXMOAI1BWv3ZmZZ CLbBRLt8u6JAGcGk08oWbMJEEv0DyC6HPsVMFSw7jtSv0LCI/HQQ9OaIru3dI/wz/BN8 0bDcCHtg78FOYwT1GGD03LfLjp0zknvJrE9bcpLiELNTx9oaeAmfeFIj7AI3KMsdo+Xr GKIir5qHYyU9Jd8NOEnxuAU7Z1fiWv3GOunY1tSIrD2NpDlXpAJktZCYMW4prvo0IoSP 5I+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=iE3nrm1jYotozeriRF9iWLztvjKPrULJjTfUl8FxtUM=; b=Aaehvz8sqPxzTAoEatZU1uWzIOJfdF2pBYJIJB5bXYQ1387aIVKrgSpaInd9odgGe2 35AZdkA3Ns8e54DR7NkBgxE8YQapLHf84vWSQ1WD6phODD0mNj7nCIWDoQAXGpSp3IgD cqf8TR3zhUpCu2NP9HpIbOVlbDvlOXrKcFVsDsO7SyxL3Rfj7NSEF8NgAdO9Iqp6RSX+ U45/QLZWmnqZR5zGqnkRMUa+K/oEhsbwTe0okUJNJBEzp0z5khPlgjJNonDoDnW+Ezjm KIJRCnDMQd0DMzJJAck4mexHH02JMXZuC21oP1OhTZ44L6m253qjf65joi3nVYlPBcEA NzMw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nghdVoej; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=iE3nrm1jYotozeriRF9iWLztvjKPrULJjTfUl8FxtUM=; b=M5VHuqyk3Awpm+bt00gNlKkrd0KIflUBWwowd4ZCEt+1MdlQdj0sUl+AG6bMV9GvaC xeXF5ceoMuFvemAGD7pECc9Ic/yaCww0dlbtXar54Zfe94A5uKATwtUYVDcrwRUhsa2t c4jBrp8yEUyJ3CWONJ83lu6ox7eAqSWQAezwY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender: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=iE3nrm1jYotozeriRF9iWLztvjKPrULJjTfUl8FxtUM=; b=Z6f550a8f9pHabPZsd72vchNrzekY5Zh8e5aJBen+0JmTRR49zTdWyeVegUxVMgwDV 2IHK5uOtzYE1yZNnO8ip+tMzl3jucvGOos8XvoHhxPC+6R14Z2ae1pwZQd83JK/Sun1j czD8HhsQv6eNR+JUl2dHAxgg9LMQa1y3xwhIYHEsK0Nf4mDvXPUDLCR9ScQJzYt3RTc9 CZLasnPUvyuWmSMgh4ED98wLV5++BUYfiXae7x9Rz7kkHu0y07vGEKa49CgvhSu355/X SxRi2gqbZyXsqmGR9Hnf2tqpb5MiNKJ/Km7stv2xl1G78iOKAdAFXNworUwHMkavMTtt MPHw== X-Gm-Message-State: ANoB5pm2aHpj8zjUmqE0H/5bj8zbFGR/XezdihYSjgVqYKrOgR+QErIT 3ir/e6ZosiFddipxduRM3TXKhax6 X-Google-Smtp-Source: AA0mqf4S/7S8+GElYsBP6N1oIgVM+Sdy81H9n4bz7ETCFu4ALAp2GpKMEXaX2LrnCtQXkSNzuS2SNQ== X-Received: by 2002:a17:906:4997:b0:7ae:ec5c:a99e with SMTP id p23-20020a170906499700b007aeec5ca99emr1753011eju.219.1668685016807; Thu, 17 Nov 2022 03:36:56 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4413:b0:457:99eb:cba9 with SMTP id y19-20020a056402441300b0045799ebcba9ls85324eda.0.-pod-prod-gmail; Thu, 17 Nov 2022 03:36:56 -0800 (PST) X-Received: by 2002:aa7:d056:0:b0:464:4aa1:289 with SMTP id n22-20020aa7d056000000b004644aa10289mr1797084edo.423.1668685015792; Thu, 17 Nov 2022 03:36:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668685015; cv=none; d=google.com; s=arc-20160816; b=m419/sCZ51dv+R+UugBrW6ttqx6KMKFkgNivk8OY2rEsTWFp/UXj5pdowLzyN4z5Hw 0iqCUwXcZPqVbT9Mje6se0l5RZz1w9dshLsrG43kcxN55B1c8xVk/OK5lfDHxV78+JuR ZMRcZCushF32IeuKkd0lwxXkeq/mBK2NQoW/+04KPWsg5RB7dbE0KiemUMYh7bzogbbJ /KOH4dq3LLaABvVfF/bYPUicezHiEK0xkX+38l+EzfV60pWwnM4F3ICbZeqrsbUMOnNh Rtzriv4+a0Mfh6tjDc/q8W4p61nPb9lVl92niLMEluGx+7ntAU8pXKbDxylBX350Mbx5 tvjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=V3uDGf6nFwfo97/RpmImJcIh+Hx1nK4UXLWDjOMYdaw=; b=AAoMyMxj99s9MaalKD3DHUj93fR9cRrq+mwV5RBkVxteZsCOt13I2Ih63lSp3fDrfI V1weddSA/XsHWOIs4eLl17u8IB43PuPKcKn7DzaBait8Iqsquglh92IHjrusJSPG6Hme 1WEIycmwnLzQtyGl4b2xk1XCcMJYPXbQkYZ+PGIJ3Dj4Zli4RVqVzP9SNJb3mQUwPOxB /9Tl6V/nLNxAKAJyN6JL80Y49LoT6DTvnu97kzW75DheLoqUdG82wSO0bHQUkppx6mvk hXsDWgh/BmUs2x8OWHYgQdZo/EQe+CkYoiaL4W7AysqXcHAUP+ekMJYGnr+/G4Sg0TyL Hidw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nghdVoej; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id bg18-20020a170906a05200b00799d9d785edsor281699ejb.67.2022.11.17.03.36.55 for (Google Transport Security); Thu, 17 Nov 2022 03:36:55 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:49c2:b0:7aa:23ac:608e with SMTP id w2-20020a17090649c200b007aa23ac608emr1738874ejv.450.1668685015577; Thu, 17 Nov 2022 03:36:55 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (mob-5-90-137-239.net.vodafone.it. [5.90.137.239]) by smtp.gmail.com with ESMTPSA id g3-20020aa7c843000000b0043bbb3535d6sm413897edt.66.2022.11.17.03.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 03:36:55 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi , Abel Vesa , Anson Huang , Fabio Estevam , Michael Turquette , NXP Linux Team , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH v2 5/5] clk: imx8mn: fix imx8mn_enet_phy_sels clocks list Date: Thu, 17 Nov 2022 12:36:37 +0100 Message-Id: <20221117113637.1978703-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> References: <20221117113637.1978703-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nghdVoej; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022): Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX]) ... ... ... ENET_PHY_REF_CLK_ROOT 0xAA80 000 - 24M_REF_CLK 001 - SYSTEM_PLL2_DIV20 010 - SYSTEM_PLL2_DIV8 011 - SYSTEM_PLL2_DIV5 100 - SYSTEM_PLL2_DIV2 101 - AUDIO_PLL1_CLK 110 - VIDEO_PLL_CLK 111 - AUDIO_PLL2_CLK ... ... ... while the imx8mn_enet_phy_sels list didn't contained audio_pll1_out for source select bits 101b. Fixes: 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver") Signed-off-by: Dario Binacchi Reviewed-by: Abel Vesa --- (no changes since v1) drivers/clk/imx/clk-imx8mn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 37128c35198d..2afea905f7f3 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -140,8 +140,8 @@ static const char * const imx8mn_enet_timer_sels[] = {"osc_24m", "sys_pll2_100m" "clk_ext4", "video_pll_out", }; static const char * const imx8mn_enet_phy_sels[] = {"osc_24m", "sys_pll2_50m", "sys_pll2_125m", - "sys_pll2_200m", "sys_pll2_500m", "video_pll_out", - "audio_pll2_out", }; + "sys_pll2_200m", "sys_pll2_500m", "audio_pll1_out", + "video_pll_out", "audio_pll2_out", }; static const char * const imx8mn_nand_sels[] = {"osc_24m", "sys_pll2_500m", "audio_pll1_out", "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out",