From patchwork Wed Aug 2 18:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 130088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp671942vqx; Wed, 2 Aug 2023 12:14:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlHMhbcO12KV+KpS8q8q4a+pnatQjshKEfUe/KnUBLYD/ELIW3xqEyfPZ/AVDnFde2ATsXBf X-Received: by 2002:a17:906:10c9:b0:997:e7ce:1e8e with SMTP id v9-20020a17090610c900b00997e7ce1e8emr5918652ejv.55.1691003682361; Wed, 02 Aug 2023 12:14:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691003682; cv=none; d=google.com; s=arc-20160816; b=I6cYkZ7ta+4f6VXOf0kPTCWJiCXB/lqpRlQHExZRKRZqB9YOVe8/vaykSex0N+weuC lStmO5C6gFOnkuFXftO56hKpyPQWsge270qON99UNJuDQvTZ8GD5X6qHa6yyaAd++FGH bXo3XhEM3EDE77Zmo8EBrzGqcYobkJwg9JlNfDof4OTzcGFkUMrV1t6qaCZ09X6ezlge Noy8UF7Jj6NgB3Ze6RvnkzvHBBi+jrgUUzyvzgyUakFDBJBQehc75By/NdJtnVfGUjyL Nv4vv1krsJlmmE0+uUJ0PhvAwASoZMRgkZXGrfibmmQEKxPop0nklBq+moHyWKJc/pcu ocRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=I90LJo0Qvr0m8Tixppw/bWGpHsIXXjsTyEab2KhJc7o=; fh=JPZv9Z+p5Faf1JjpYqTkHdhcUHXxCguhgPx2Rny6gR0=; b=aUFgIXjBUjEafhNCSKeAjgXeZ4ZZtmtG7HiEnay5jddOhSKN7Km1B6Q0I/vehzDAph 6i3Qvel0uHgFJ5UTcCHPsWCm2zVvGvZgiOVSbKSjQ+AgfXmFjo4Qcs5/d0kd1ojziAR/ Nxscp1+B1EPfaG4dEr+Cv3PLp9GAJjyRiYRuUiArONeL1LFWYH8b+AlV+/gmlsIfRkfR 9U7d3o2VG3qs2+CP6vKJ+2Y5XSgTAUbWCgz0GDO9cqEhwOUnQQ2S3EBRUbQeTCzEZ+o4 RgdjecPHr8y5JS4Yo4VnnGDJE7Jz0XYFsx+Is8nf9qqlrgIFRZqPNB6TZJWFxXMEgL58 Osew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m21-20020a1709066d1500b00992d6fae2bfsi11188850ejr.953.2023.08.02.12.14.18; Wed, 02 Aug 2023 12:14:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbjHBSnj (ORCPT + 99 others); Wed, 2 Aug 2023 14:43:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231228AbjHBSng (ORCPT ); Wed, 2 Aug 2023 14:43:36 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBF1E1BC1; Wed, 2 Aug 2023 11:43:35 -0700 (PDT) Received: from dslb-094-219-037-101.094.219.pools.vodafone-ip.de ([94.219.37.101] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1qRGoh-0003Eh-8u; Wed, 02 Aug 2023 20:43:27 +0200 From: Martin Kaiser To: Arnd Bergmann , Abel Vesa , Stephen Boyd Cc: Shawn Guo , linux-imx@nxp.com, Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v7 1/2] clk: imx25: print silicon revision during init Date: Wed, 2 Aug 2023 20:40:45 +0200 Message-Id: <20230802184046.153394-2-martin@kaiser.cx> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802184046.153394-1-martin@kaiser.cx> References: <20230802184046.153394-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773145877262481116 X-GMAIL-MSGID: 1773145877262481116 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 Acked-by: Arnd Bergmann Acked-by: Stephen Boyd --- 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 cc013b343e62..bee3da2e21e1 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(); + 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 Wed Aug 2 18:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 130087 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp671806vqx; Wed, 2 Aug 2023 12:14:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFfXD7Na16li6FGI2c/1T02zUi/KiKyWUdT2v3jC91EkGK4606S98e2WC3hCph9XSAGwmRi X-Received: by 2002:ac2:5e73:0:b0:4fe:c55:4861 with SMTP id a19-20020ac25e73000000b004fe0c554861mr5015034lfr.53.1691003667901; Wed, 02 Aug 2023 12:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691003667; cv=none; d=google.com; s=arc-20160816; b=OxetUGLyITVfbeL5ls57SmCxUsTlJAbepzZPNu14answQYdeOWW1PuR1C+pCEoz73d f1WxFdqasG89yZ4gj5ePaj/6g4FA8M/li/hKoFkHXjKoiWuIAvk4v1mu7VXlJcMUfPPB rcfnmpSzk0eeIxRbBHLVI+wvk7ZibgCk0V5bpgWlU8tJKOO3g+xl6Ps7DQCWN0z0ULi4 mwqUkgd6A9IFAmcMnjIxAYkngbGXVo56JtFBGDUFQzXAPqfqdOtA/dRGpQjRJnsDckn/ KtE4e7oWonz9wdqNlpRCgC9C0gO5GcvCImooyia1WlBIngyCt+9SZvj5KfpSaFlmNli2 1/YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QU7Wim/mfiwEFfxoRhzLoXoodokF8WX0nyldmlknDe4=; fh=JPZv9Z+p5Faf1JjpYqTkHdhcUHXxCguhgPx2Rny6gR0=; b=izaP5TJNjGKQhDKerQPB3k2wtjyBJ7FXJSBHssK45979+XjoenQq/t97PsXQdV13JG aInOvsHXOYSm4Z1PefaugZuFjr32EWhSEshh3Zf3LRaM7VIXKrCx+qpGKCFbt1XEEg74 uf6AfyH4tY2e/5vK6eQboHn7pL1YzCrtUkHm6RZ/aTRgA55TMoF9Yuut6S838hwoDIoK zGDlpsvxcs0OWo9M15/yGhJk0Cc1rCLzbSDdiLFSNiHzPPJeKClU4oiQ8AOx6p2P7GAv D+xuppdYSf+GZ95ctrnmI1B4e72vaXcd9SMXJq0Jt0Lb81Tor9oDaJGlXEmNpDf9OJFN z6/Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v26-20020aa7d81a000000b005222c01e30dsi10569541edq.499.2023.08.02.12.14.03; Wed, 02 Aug 2023 12:14:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230491AbjHBSnh (ORCPT + 99 others); Wed, 2 Aug 2023 14:43:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230404AbjHBSnf (ORCPT ); Wed, 2 Aug 2023 14:43:35 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C7B71BC1; Wed, 2 Aug 2023 11:43:34 -0700 (PDT) Received: from dslb-094-219-037-101.094.219.pools.vodafone-ip.de ([94.219.37.101] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1qRGoj-0003Eh-48; Wed, 02 Aug 2023 20:43:29 +0200 From: Martin Kaiser To: Arnd Bergmann , Abel Vesa , Stephen Boyd Cc: Shawn Guo , linux-imx@nxp.com, Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v7 2/2] clk: imx25: make __mx25_clocks_init return void Date: Wed, 2 Aug 2023 20:40:46 +0200 Message-Id: <20230802184046.153394-3-martin@kaiser.cx> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230802184046.153394-1-martin@kaiser.cx> References: <20230802184046.153394-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773145861900398648 X-GMAIL-MSGID: 1773145861900398648 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 Acked-by: Arnd Bergmann Acked-by: Stephen Boyd --- 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 bee3da2e21e1..c566be848c2d 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(); imx_print_silicon_rev("i.MX25", mx25_revision()); - - return 0; } static void __init mx25_clocks_init_dt(struct device_node *np)