From patchwork Tue Feb 11 03:08:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 11374725 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B474E924 for ; Tue, 11 Feb 2020 03:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94DCD2080C for ; Tue, 11 Feb 2020 03:08:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DKXZv/7y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727632AbgBKDIp (ORCPT ); Mon, 10 Feb 2020 22:08:45 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:34212 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727612AbgBKDIp (ORCPT ); Mon, 10 Feb 2020 22:08:45 -0500 Received: by mail-qk1-f194.google.com with SMTP id c20so2803696qkm.1 for ; Mon, 10 Feb 2020 19:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bg8WGWFiNlP/c2kLxlwNG4J49V1wsso+2muB3C1AW9c=; b=DKXZv/7ymzCe7lWR2nuYKaFhN0CvQPiBVLKdywBkaD9Mc8y06uZ7LJzBYeHcdwzRVu iTi/CblpfuDt4yDEOdzC25FAjjiBEzXy4ZGxj5vgZnFmr0ceomoPDDbRYxu8+ajFQJhN c/8n6HNrrCGpAhH12+/b592OXEtADYWx1nb6h9NEffFfGQLo1t4TdrQb1XFU0R/43cy1 bqtTEWrP6gHNdCTqw78gtDKeTnPMKV8K0K7mD2ovYgzyLlYrLc2Oajazt7v3ZqRIHiD2 50Z9w7Nks/TahzrHzejURNxveDbSQjFCzqa4zFD672Ks1pxdQj4uhoDM3YP1lRenHV9i pVVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bg8WGWFiNlP/c2kLxlwNG4J49V1wsso+2muB3C1AW9c=; b=T5SAhjklNakQvLJFNeEdK82fmpniPK/Bw9ZW4E4OOPNid0m7HBX6RojWHc0YJ8O5vD 4S3LLE8wVkVKIWrSsh6UD36xyLHUCudqGML4n/skNMhEcoJOdEJswGHQMPKCk/i1piSI 8jpex4Slbj8vEV5Sp+uc9ZW0EXWCWlPt18QzdBK/0T2bpuW7gA3jqhkms6ryt6xj7dn1 LeBiCQ56KdgXE9sdBat7AAMJmlSY7LXXJQj4fRaytR56ynLAuqpj2Lqlvk51P8ajpEPI Y/ab6LwF5LjaKEePrQkwIqidSnASc84qZ7468Y+CqYjon8E93FBNoMBHz8ogPWYujzHb XUJg== X-Gm-Message-State: APjAAAViauzFoM1D/RRg7YBdoNVP0rUMZz/amCsVLKGLHQdEYikBRWC/ IqeBIPn6a6va023CaX8AP04= X-Google-Smtp-Source: APXvYqxmeoHuS2wt0ms22icYBK4flqPZxbg5eqglY/c3VTu6tZNOcrevbp3eEvJ/BLCsdPxpr0bzfg== X-Received: by 2002:a37:4808:: with SMTP id v8mr4031673qka.263.1581390523759; Mon, 10 Feb 2020 19:08:43 -0800 (PST) Received: from localhost.localdomain ([2804:14c:482:5bb::1]) by smtp.gmail.com with ESMTPSA id x41sm1345893qtj.52.2020.02.10.19.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2020 19:08:42 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Cc: kernel@pengutronix.de, linux-imx@nxp.com, linux-clk@vger.kernel.org, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, Fabio Estevam Subject: [PATCH 1/2] clk: imx8mm: Fix the CLKO1 source select list Date: Tue, 11 Feb 2020 00:08:12 -0300 Message-Id: <20200211030813.13992-1-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org The CLKO1 clock source select list is the following as per the i.MX8MM Reference Manual (put in increasing order): 000 - 24M_REF_CLK 001 - SYSTEM_PLL1_CLK 010 - None 011 - SYSTEM_PLL1_DIV4 100 - AUDIO_PLL2_CLK 101 - SYSTEM_PLL2_DIV2 110 - VPU_PLL_CLK 111 - SYSTEM_PLL1_DIV10 Fix it accordingly. Fixes: ba5625c3e272 ("clk: imx: Add clock driver support for imx8mm") Signed-off-by: Fabio Estevam Reviewed-by: Abel Vesa --- drivers/clk/imx/clk-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 2ed93fc25087..770cf2ae58aa 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -283,8 +283,8 @@ static const char *imx8mm_vpu_h1_sels[] = {"osc_24m", "vpu_pll_out", "sys_pll1_8 static const char *imx8mm_dram_core_sels[] = {"dram_pll_out", "dram_alt_root", }; -static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "osc_27m", "sys_pll1_200m", "audio_pll2_out", - "vpu_pll", "sys_pll1_80m", }; +static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "dummy", "sys_pll1_200m", + "audio_pll2_out", "sys_pll2_500m", "vpu_pll", "sys_pll1_80m", }; static struct clk_hw_onecell_data *clk_hw_data; static struct clk_hw **hws; From patchwork Tue Feb 11 03:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 11374727 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EBC1814E3 for ; Tue, 11 Feb 2020 03:08:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCF5C2080C for ; Tue, 11 Feb 2020 03:08:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PSR5Znb7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727668AbgBKDIt (ORCPT ); Mon, 10 Feb 2020 22:08:49 -0500 Received: from mail-qv1-f65.google.com ([209.85.219.65]:45720 "EHLO mail-qv1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727612AbgBKDIt (ORCPT ); Mon, 10 Feb 2020 22:08:49 -0500 Received: by mail-qv1-f65.google.com with SMTP id l14so4305703qvu.12 for ; Mon, 10 Feb 2020 19:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wgGKUnlzEJ2a8qSB0a2zn1fdYwV5ER4chdWO8Q08nVo=; b=PSR5Znb7L+upKokNQwWbVpknxT3Muaf31/mEXb+pBcRSQ6PHXgARO708mWit9QHUr0 ibmiPgIRciGUkP7kgjuB4u3d062JEQ4R0WMOryHxUmzaWrd9GpFCT9AxdYiyleWPlkG7 HWVFF6zhh3NJ+deD+r2JbV2xEl3RckLT7CBp7HMwEkZwDBbJZGI+WY22IHAVbQaGVjCN fF+svijn84gQ2Fa6mbkxdCD5YvzW43XRRvREH3sEmztj+VlzyTPoS90+dmO4A9XqCX/5 MRvgCpSg7RsSDKfrjFq8PfQ5p3l2QMXlFDg0+qHYnvt+IyBo3zEmcuMlusTPBYM3oekU kolg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wgGKUnlzEJ2a8qSB0a2zn1fdYwV5ER4chdWO8Q08nVo=; b=fuxHNgPwLGFcaryUfSsHTL2mzGj79aNyY++pG41hj971iUcEguNrTwxPlcxtM/8cE8 eeTsV8kx2ta98NvulJ1MXEGlTO4Bvk+0Ne6QQywp/pb13UMNe7emp84A904fJvk3Ytje yxtL0JViXk+ZVnjgzH5ZYJfbSDh8Zpu81ygKICfNKmkCe2fgwsoHVGz9xTTjF/9FdUAq KiqL5w/OKpb+3QKwzdfW3ZQEEILf05QPWfc61UMrvGQf3QKQCRKiIjazrJHPiBayn7ix R4LirSGurmdN0BG8mDbR9EbOBmlEio7Zk2wHhj+mmc8j68NA1y7Pw5qIxi/F6+VHdRW9 QPOQ== X-Gm-Message-State: APjAAAU5EWhBUd/aao0CB78ivCgd8T+d0/DjpQNtZa6Uyg6EJUzQr88e ivP9aPnJD9lU45PSefJxN/o= X-Google-Smtp-Source: APXvYqyU9BnAd2BjDUkGBCIDNLhVOK8D8+Rp69IBo3DmZk4YQW+LtfWdj69yMYVM//AurEd+uNrq3Q== X-Received: by 2002:ad4:5429:: with SMTP id g9mr1100800qvt.134.1581390527001; Mon, 10 Feb 2020 19:08:47 -0800 (PST) Received: from localhost.localdomain ([2804:14c:482:5bb::1]) by smtp.gmail.com with ESMTPSA id x41sm1345893qtj.52.2020.02.10.19.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2020 19:08:46 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Cc: kernel@pengutronix.de, linux-imx@nxp.com, linux-clk@vger.kernel.org, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, Fabio Estevam Subject: [PATCH 2/2] clk: imx8mm: Add CLKO2 support Date: Tue, 11 Feb 2020 00:08:13 -0300 Message-Id: <20200211030813.13992-2-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200211030813.13992-1-festevam@gmail.com> References: <20200211030813.13992-1-festevam@gmail.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Add CLKO2 support, which is useful for debugging purposes. Signed-off-by: Fabio Estevam --- drivers/clk/imx/clk-imx8mm.c | 3 +++ include/dt-bindings/clock/imx8mm-clock.h | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 770cf2ae58aa..2ea91ba5e63e 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -285,6 +285,8 @@ static const char *imx8mm_dram_core_sels[] = {"dram_pll_out", "dram_alt_root", } static const char *imx8mm_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "dummy", "sys_pll1_200m", "audio_pll2_out","sys_pll2_500m", "vpu_pll", "sys_pll1_80m", }; +static const char *imx8mm_clko2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_400m", "sys_pll2_166m", + "sys_pll3_out", "audio_pll1_out", "video_pll1_out", "osc_32k", }; static struct clk_hw_onecell_data *clk_hw_data; static struct clk_hw **hws; @@ -504,6 +506,7 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_CLK_WDOG] = imx8m_clk_hw_composite("wdog", imx8mm_wdog_sels, base + 0xb900); hws[IMX8MM_CLK_WRCLK] = imx8m_clk_hw_composite("wrclk", imx8mm_wrclk_sels, base + 0xb980); hws[IMX8MM_CLK_CLKO1] = imx8m_clk_hw_composite("clko1", imx8mm_clko1_sels, base + 0xba00); + hws[IMX8MM_CLK_CLKO2] = imx8m_clk_hw_composite("clko2", imx8mm_clko2_sels, base + 0xba80); hws[IMX8MM_CLK_DSI_CORE] = imx8m_clk_hw_composite("dsi_core", imx8mm_dsi_core_sels, base + 0xbb00); hws[IMX8MM_CLK_DSI_PHY_REF] = imx8m_clk_hw_composite("dsi_phy_ref", imx8mm_dsi_phy_sels, base + 0xbb80); hws[IMX8MM_CLK_DSI_DBI] = imx8m_clk_hw_composite("dsi_dbi", imx8mm_dsi_dbi_sels, base + 0xbc00); diff --git a/include/dt-bindings/clock/imx8mm-clock.h b/include/dt-bindings/clock/imx8mm-clock.h index edeece2289f0..37f523cec390 100644 --- a/include/dt-bindings/clock/imx8mm-clock.h +++ b/include/dt-bindings/clock/imx8mm-clock.h @@ -265,6 +265,8 @@ #define IMX8MM_SYS_PLL2_333M_CG 244 #define IMX8MM_SYS_PLL2_500M_CG 245 -#define IMX8MM_CLK_END 246 +#define IMX8MM_CLK_CLKO2 246 + +#define IMX8MM_CLK_END 247 #endif