From patchwork Mon Aug 15 19:07:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 12943986 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 D6662C00140 for ; Mon, 15 Aug 2022 19:10:01 +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=vwQCepOFTcdphspTF8dbifzLZC9EyhRa/3xNISF2dtw=; b=q+tqkVpGewTjKQ h9+AoDDsJON2YrefMaD0H9NcbMDH+J0zWGhjZqW9QZpnjENoXzR+R5SdCZPkJAvL5Mo23syMiBZQP j1B30UjVFaKi5LQCyvzwocwn6Wcfk8OBsgdnVamFYPOeG865CG1WgS8TprKZuJk28t9I3BPBRpXH4 zysGVI8vq4+EqTAXimxERC3W0Xqa7yIqFOd64Zz/O7VmMmh0dkfqoeSbj5F+qhKTmq7xqWaToDuVL 7Gxyl8r3EXQRHbuIFHpJ9w2bhJGeVo9LpQGiYjOxveNpPvaSONo1kHwkxSifngkAXpIg3ppy0kKFW 3g1vFy0o1y2VywAyZTBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNfSS-003ju6-Vc; Mon, 15 Aug 2022 19:09:05 +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 1oNfS4-003jYE-JG for linux-arm-kernel@lists.infradead.org; Mon, 15 Aug 2022 19:08:42 +0000 Received: from dslb-188-096-143-237.188.096.pools.vodafone-ip.de ([188.96.143.237] 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 1oNfRx-0003rX-0N; Mon, 15 Aug 2022 21:08:33 +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 v4 1/2] clk: imx25: print silicon revision during init Date: Mon, 15 Aug 2022 21:07:47 +0200 Message-Id: <20220815190748.102664-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220815190748.102664-1-martin@kaiser.cx> References: <20220602080344.208702-1-martin@kaiser.cx> <20220815190748.102664-1-martin@kaiser.cx> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220815_120840_862390_FEFC1D16 X-CRM114-Status: GOOD ( 12.65 ) 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 Reviewed-by: Fabio Estevam --- changes in v4: - rebase against today's linux-next - add Fabio's Reviewed-by tag changes in v3: - rebase against today's linux-next 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 Mon Aug 15 19:07:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 12943985 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 9306FC00140 for ; Mon, 15 Aug 2022 19:09:55 +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=eWzOs3xzJSb4cok6JyRWYvM38afQNo46cOvLGY5U9RU=; b=NFPTv0K5RgM5Hk GntrpA059T5ZPka9+ksEOH87khbdQA65Jg1tLMgDOh3E5qQ+s3qgoUsctwa+sufFFB5oEj4zF4icU uhQ5KlNdqUOIaMCVjl25Ur1accgX98m8kwlH7Wlz4XW0sfUgzM3Eb1FlME/BWZFOwgaSZ4MLB3MDQ fD6HaJHZVf7ZhDdo4654Re9MMgH1NzC2hzhkqHYNuLp5gx15LZ/WeZyIhekJAyvmOjgwcmxdXUEjB PAzOAsr2G29G0TrQjHJnYi1kx0MPLO8huWFINnQwHed4WQSQ48eLMkD3wr6939QKE0lkJZiOASIzV U+iS+oQ6XFh7QI/cd4xA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNfS8-003jhj-Qp; Mon, 15 Aug 2022 19:08:44 +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 1oNfS4-003jc0-K2 for linux-arm-kernel@lists.infradead.org; Mon, 15 Aug 2022 19:08:42 +0000 Received: from dslb-188-096-143-237.188.096.pools.vodafone-ip.de ([188.96.143.237] 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 1oNfRz-0003rX-BR; Mon, 15 Aug 2022 21:08:35 +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 v4 2/2] clk: imx25: make __mx25_clocks_init return void Date: Mon, 15 Aug 2022 21:07:48 +0200 Message-Id: <20220815190748.102664-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220815190748.102664-1-martin@kaiser.cx> References: <20220602080344.208702-1-martin@kaiser.cx> <20220815190748.102664-1-martin@kaiser.cx> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220815_120840_891558_D84CABD6 X-CRM114-Status: GOOD ( 11.14 ) 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 Reviewed-by: Fabio Estevam --- changes in v4: - rebase against today's linux-next - add Fabio's Reviewed-by tag changes in v3: - rebase against today's linux-next 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)