From patchwork Thu Jun 23 07:51:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 12891900 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 E47A7C43334 for ; Thu, 23 Jun 2022 07:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dgRJFBHgEdic3s0d0afuru/4Cj+ZJp6zHsd29/hjntw=; b=I2/5QJdUK/pHTz BN8letOnwxOoRow3vFlHwYwe+Md2P3PGWD9y/wUL2KIFdy82HpujnByvyR8wCMBE5qHaivObc1JE0 M8IWQagRNLlTyy9AwtAXqMtH5PhVYWpMZCgyGaFmxNWwf6wtdMck+pFnvgKLVuyoOK6Q/S1YLcr41 52AdHhTewXpFwKTsXjhGTOlJODBTufZXFIXsxDhRF7ljAt0gj2XeNXKoGlJvmdBllkEGatlNpfOl9 kQhXZn3N8Oxnk3xnv4QkRwxPoc6L4yGc/XgvIxwekStRfOX2CPYV+0OyxkpY7Mr3jX+AVrw+5Ad3B oc+ZARxdzMx5gIHyoDoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4HdI-00DxEF-HG; Thu, 23 Jun 2022 07:52:08 +0000 Received: from viti.kaiser.cx ([2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4Hcv-00Dx4U-4B for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2022 07:51:46 +0000 Received: from dslb-188-096-142-050.188.096.pools.vodafone-ip.de ([188.96.142.50] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1o4Hcr-0006sS-JZ; Thu, 23 Jun 2022 09:51:41 +0200 From: Martin Kaiser To: Abel Vesa , Stephen Boyd Cc: Shawn Guo , Pengutronix Kernel Team , Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 1/2] clk: imx25: print silicon revision during init Date: Thu, 23 Jun 2022 09:51:03 +0200 Message-Id: <20220623075104.166529-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220623075104.166529-1-martin@kaiser.cx> References: <20220602080344.208702-1-martin@kaiser.cx> <20220623075104.166529-1-martin@kaiser.cx> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220623_005145_380721_A898C3B0 X-CRM114-Status: GOOD ( 12.48 ) 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 Print the imx25 silicon revision when the clocks are initialised. Use the same mechanism as for imx27, i.e. call mx25_revision. This function is unused at the moment. Signed-off-by: Martin Kaiser --- changes in v2: - send the patch to the clk maintainers drivers/clk/imx/clk-imx25.c | 3 +++ include/soc/imx/revision.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c index 66192fe0a898..263409fca1eb 100644 --- a/drivers/clk/imx/clk-imx25.c +++ b/drivers/clk/imx/clk-imx25.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "clk.h" @@ -220,6 +221,8 @@ static int __init __mx25_clocks_init(void __iomem *ccm_base) imx_register_uart_clocks(6); + imx_print_silicon_rev("i.MX25", mx25_revision()); + return 0; } diff --git a/include/soc/imx/revision.h b/include/soc/imx/revision.h index b2a55dafaf0a..b122d2fc8881 100644 --- a/include/soc/imx/revision.h +++ b/include/soc/imx/revision.h @@ -22,6 +22,7 @@ #define IMX_CHIP_REVISION_3_3 0x33 #define IMX_CHIP_REVISION_UNKNOWN 0xff +int mx25_revision(void); int mx27_revision(void); int mx31_revision(void); int mx35_revision(void); From patchwork Thu Jun 23 07:51:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 12891901 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 5DA25C43334 for ; Thu, 23 Jun 2022 07:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gk9CcKdCB1ttE9wHv1pGQGF9GBydwq750kiWWPDB4vA=; b=FVfzzDXtSx1l9R af6pgNxzz58zF2rABPfQxeoGQxu8w94jeRR23VyPFMKWHgHDcvJ5mxmork4yALAoXPfQBtL+iGOEV CT5rU5u04kPjnZVx1OYLyX/DoPxQRYPP/R5XRREmQVOZeJZo1IMeQGoBYAoEKGNQskGGUVrqd+loE 8YFswRqea7uWf4wATG5PD5WoirxPsZ+9dbJMsyVr1xTEb2r5t+YJsV7X0Hzvme8Gjr/L1zVfqo4h0 75aKIYYh8t8h+ME4UglWUg4Rtx4d3CGPhIJIk75psw5vzX0c5kmWVY4SeneykHT5dK4rvrwIefmXS u6Vv52kpR23KLA+lR9mg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4HdT-00DxI5-9N; Thu, 23 Jun 2022 07:52:19 +0000 Received: from viti.kaiser.cx ([2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4Hd1-00Dx7a-3z for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2022 07:51:52 +0000 Received: from dslb-188-096-142-050.188.096.pools.vodafone-ip.de ([188.96.142.50] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1o4Hcx-0006sS-BK; Thu, 23 Jun 2022 09:51:47 +0200 From: Martin Kaiser To: Abel Vesa , Stephen Boyd Cc: Shawn Guo , Pengutronix Kernel Team , Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 2/2] clk: imx25: make __mx25_clocks_init return void Date: Thu, 23 Jun 2022 09:51:04 +0200 Message-Id: <20220623075104.166529-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220623075104.166529-1-martin@kaiser.cx> References: <20220602080344.208702-1-martin@kaiser.cx> <20220623075104.166529-1-martin@kaiser.cx> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220623_005151_387923_18E78272 X-CRM114-Status: GOOD ( 10.97 ) 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 __mx25_clocks_init function always returns 0 and its only caller does not check the return value. Let's remove it. Signed-off-by: Martin Kaiser --- changes in v2: - send the patch to the clk maintainers drivers/clk/imx/clk-imx25.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c index 263409fca1eb..72b30dd7f05f 100644 --- a/drivers/clk/imx/clk-imx25.c +++ b/drivers/clk/imx/clk-imx25.c @@ -74,7 +74,7 @@ enum mx25_clks { static struct clk *clk[clk_max]; -static int __init __mx25_clocks_init(void __iomem *ccm_base) +static void __init __mx25_clocks_init(void __iomem *ccm_base) { BUG_ON(!ccm_base); @@ -222,8 +222,6 @@ static int __init __mx25_clocks_init(void __iomem *ccm_base) imx_register_uart_clocks(6); imx_print_silicon_rev("i.MX25", mx25_revision()); - - return 0; } static void __init mx25_clocks_init_dt(struct device_node *np)