From patchwork Tue Mar 28 10:05:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 75956 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2098574vqo; Tue, 28 Mar 2023 03:08:52 -0700 (PDT) X-Google-Smtp-Source: AKy350bfSU4B68n6yLvWO0B4TZO9sGhm7aAvPcRSH1Ud0Wgwx05NCFRWX8OVz2eMcOv9++T6VE99 X-Received: by 2002:a17:907:205b:b0:931:cac0:60ec with SMTP id pg27-20020a170907205b00b00931cac060ecmr14136688ejb.48.1679998132660; Tue, 28 Mar 2023 03:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679998132; cv=none; d=google.com; s=arc-20160816; b=eD0fLC2YV5420Kst8EbHZYerwhGI3PQrTaFaBMKRMkejgzT/Dof2oZ+WQKf86TEMG6 7OB2FKY5NAsNUUAgCIlEhNa5VDWyq+NpdNjQlMHxxYOn0+jTt1PfnIZ7lfDMNOK6Wo0B GC2RGzER7YzRM91oMiZVQmggVEpzwBqP7BAhtTnkgk9CSbcMexw4jz1WlGB5ZW7sMCu1 xnCQomZuZxFTJrx3frh5gDDDbkzJEzzUkewO7Iq8AHYASGFoID4gX9zRc8ZdmWCiBqCw Uaao2Wn0rW/8JCGR1aqUNKVHZLKyN+JOzeLVJ4vhzJPqMtj2cnD8jSZIz3D243sNiGK7 amgQ== 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 :message-id:date:subject:cc:to:from; bh=DBtoZid57M1grvo0ZPijFVsGeN6q8eW8bRhpPRaE1V8=; b=E/R+vHWl15sHv2f7+fmstUKFF1MUiNymqyH08nsXd6QX0A0dIKNPbXGKJVNwl8NoDJ wvHWYZLS7zHCM7BHELmlsAlHFSOG/uD2WEIeGUnefghFSMLSIukRn3L2pEFXTTLtUHoX ByWFreoxyZqzXRF/lb6OgeMf9q+8kR/8hXAgbEgz2KZeqyAdVzaQxGISqqXz9KTUCrgq cp8qcIzJ2fwnZuaFH1Q7oifIvig14rqITF1MCMUCxk1AjjzYnH1jiwEhulws+hOtXUhT WT2jqcHKDtdOx6TgD9qMTWZZtLxnEr4Q9xt3dChqk60KA9gkiURConsJmYj6f/0CgX5m Uchg== 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 i20-20020a17090685d400b008b17e994edbsi27154959ejy.543.2023.03.28.03.08.29; Tue, 28 Mar 2023 03:08:52 -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 S232943AbjC1KG7 (ORCPT + 99 others); Tue, 28 Mar 2023 06:06:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232624AbjC1KGw (ORCPT ); Tue, 28 Mar 2023 06:06:52 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C91C872B8 for ; Tue, 28 Mar 2023 03:06:28 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ph6DW-0005iJ-PL; Tue, 28 Mar 2023 12:06:14 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ph6DV-007Hcx-Jf; Tue, 28 Mar 2023 12:06:13 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ph6DU-008eq6-UT; Tue, 28 Mar 2023 12:06:12 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Daniel Lezcano , Thomas Gleixner , Shawn Guo , Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org, Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init() Date: Tue, 28 Mar 2023 12:05:29 +0200 Message-Id: <20230328100531.879485-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1912; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=MNiFfnPjNelQGtWmkJxxEiSBIxcpNj1d/YkHfhNwz1A=; b=owGbwMvMwMXY3/A7olbonx/jabUkhhSl3S8CpKZrFCjuEXsWmNguofRxdRurwiajKp0Lt10e/ lVds8euk9GYhYGRi0FWTJHFvnFNplWVXGTn2n+XYQaxMoFMYeDiFICJfFLnYFgX4rvDwlVR44L+ RffFVpO0ngut3dZjdWirv2fPk7PFC37br1d71iyqe4Nv0cLN/T4hFoGeRbbup3gCd0s1T/20IyH k0x/3sC4BmV0xInXflOUzOHJ9SrhluGylva4sWN2x/8E8uTOmLNaFW/bzP+X5tWGZyYLEzEXuFr yHs0/nbrBe6O0l8enC07qIqcmtTnIXZCfGhQnm3w3IeSMssvJBTcFhh/Y9x8u/fMr/pHd2io2Pd I3F3gtszLzuZW6Hd20XXRr6oPJfRNHENFtT30a9EJUrvapnDXfsKOhb/7bCWL/mGX8N15kFMmeT P87TizZbkiU1X8T3JZe9GM/HG64bJJi97neI7P+vtjkQAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761605721582437246?= X-GMAIL-MSGID: =?utf-8?q?1761605721582437246?= The last caller is gone since v5.10-rc1~28. Signed-off-by: Uwe Kleine-König --- drivers/clocksource/timer-imx-gpt.c | 19 ------------------- include/soc/imx/timer.h | 7 ------- 2 files changed, 26 deletions(-) base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6 prerequisite-patch-id: 016070a969cd4648b6a1dfffaa1bf334acc984ea diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 8ad0bda42029..83cefff2bec1 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -414,25 +414,6 @@ static int __init _mxc_timer_init(struct imx_timer *imxtm) return mxc_clockevent_init(imxtm); } -void __init mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type) -{ - struct imx_timer *imxtm; - - imxtm = kzalloc(sizeof(*imxtm), GFP_KERNEL); - BUG_ON(!imxtm); - - imxtm->clk_per = clk_get_sys("imx-gpt.0", "per"); - imxtm->clk_ipg = clk_get_sys("imx-gpt.0", "ipg"); - - imxtm->base = ioremap(pbase, SZ_4K); - BUG_ON(!imxtm->base); - - imxtm->type = type; - imxtm->irq = irq; - - _mxc_timer_init(imxtm); -} - static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type type) { struct imx_timer *imxtm; diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h index b888d5076b4d..25f29c6bbd0b 100644 --- a/include/soc/imx/timer.h +++ b/include/soc/imx/timer.h @@ -13,11 +13,4 @@ enum imx_gpt_type { GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */ }; -/* - * This is a stop-gap solution for clock drivers like imx1/imx21 which call - * mxc_timer_init() to initialize timer for non-DT boot. It can be removed - * when these legacy non-DT support is converted or dropped. - */ -void mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type); - #endif /* __SOC_IMX_TIMER_H__ */ From patchwork Tue Mar 28 10:05:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 75954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2098398vqo; Tue, 28 Mar 2023 03:08:33 -0700 (PDT) X-Google-Smtp-Source: AKy350YojUc4Bppcmw8hi/G0AVT3N43cOmmJgwPQscTtblq1BsbMxaj8RSAnFB7+8DoPQ288mNy2 X-Received: by 2002:aa7:cd8d:0:b0:4fe:1b62:4741 with SMTP id x13-20020aa7cd8d000000b004fe1b624741mr14602115edv.28.1679998113368; Tue, 28 Mar 2023 03:08:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679998113; cv=none; d=google.com; s=arc-20160816; b=XDPsfcFkeTF4fGsD+j+Tm0evCYSk1AcHG9K7VhwVNVLX4LlYVq+53sMlGHfrQWEEo+ VOD4vxX4lzDS0z7L63ZNcXGxAqta6S9UzWQQVwJxP/RjOluZC/NHzjf8lLgwPnC1ihui AVAspqMyJDLRYEnt32O0aLrF0ucucpwoTWTtwR5Y5pe9EBheIHJUiAFAiirTOH1QX2WN WE6WzOrIY5bAMdS2HCl6KKGJyX313NhkWs+kZuXc8YTAev+NqfMNALByi4q10PVFcOZb MzE4qAYmOgeBYJi3uNWtZyJ/3jGS79u0Ke5Pk8VZQJ4Ev59i2RPIEpnoxmsblufnYh/9 /XlA== 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=7sf4D+frDvSBD/YvhDHwVRY0fHb76RSEPM916Q6bInw=; b=zSkKtQXpojnJ5lK8Kpso0E2hEyeYTMehll0BZ1m6mOoI16BdYh2qu+duvhfq2v27FL JhmdzL9Pctxv0k8ry8A7CobJ/zZVbUmfLmgH2DS222KrznP31k16uJ5QlkxtpP0jhcwJ 2cl5C8py7vaK8kBMKS3BKNvuQmg2/s8L1ZF7Jd86C9aTW7eeTlK+zCLaevt13mhtCKUb koO3X/IZdIjUuBmKeGIcXpab4xICT4Uh6l8k+5mUXpDcWgvCWR5zLzNlvOVACMp9Im/3 VTa+Mqa2lNyHV5uV9H6PY0boNqsYnJHSrl1mkbU1osyDdMIKR5zYrak5CF3sZnzURgyF C1PA== 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 b23-20020aa7cd17000000b004bc099efbc4si33541881edw.630.2023.03.28.03.08.09; Tue, 28 Mar 2023 03:08:33 -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 S229848AbjC1KGx (ORCPT + 99 others); Tue, 28 Mar 2023 06:06:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230128AbjC1KGt (ORCPT ); Tue, 28 Mar 2023 06:06:49 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD8E27D8C for ; Tue, 28 Mar 2023 03:06:21 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ph6DW-0005iK-PO; Tue, 28 Mar 2023 12:06:14 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ph6DV-007Hd1-Ue; Tue, 28 Mar 2023 12:06:13 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ph6DV-008eq9-4b; Tue, 28 Mar 2023 12:06:13 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Daniel Lezcano , Thomas Gleixner , Shawn Guo , Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org, Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] clk: imx: Drop inclustion of unused header Date: Tue, 28 Mar 2023 12:05:30 +0200 Message-Id: <20230328100531.879485-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328100531.879485-1-u.kleine-koenig@pengutronix.de> References: <20230328100531.879485-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1814; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=uXRQfFQp+F1M7S5Rm4xzM2YMPoddvEE/MywZUAEyot8=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkIrvp97+qKATUOb/7e3tgwXpLodHp9mRmDCezx akiJyZYV0eJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZCK76QAKCRCPgPtYfRL+ ThazB/0cZkwVjmAR2a1bQmL55xhdU0ulkeQa9snh5S8dBmSw+EGVqCgGzjWgIjWpSm4rjCJ8QG7 7xY4il43AQlzsNzDBaJ3fxykVSqdymlAoIX5bqrdnsOn7vl53LUBlMwFwC+v1n8E4NPzxEw4UAP TYtvmsvB1v0LB02IjyKqTzpl6xjPMo5Y5UidEjWhlQ8ScD3Mxs2Boj+1JKJARcTx/151oQW/IQ1 bNeDZSuSvH0M3xhVjwrXdtWu5e8bFQtl0iu6p89XB8boj1geSRE3ej07TfkkKpRRH/9299AtXy4 dE+Efx5sNFsuBsFSZXg86iSA39vO1CgsBz8tZtTwi/p7tf8F X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761605701857192016?= X-GMAIL-MSGID: =?utf-8?q?1761605701857192016?= The clk drivers use none of the symbols defined in . Signed-off-by: Uwe Kleine-König --- drivers/clk/imx/clk-imx1.c | 1 - drivers/clk/imx/clk-imx27.c | 1 - drivers/clk/imx/clk-imx31.c | 1 - drivers/clk/imx/clk-imx35.c | 1 - 4 files changed, 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx1.c b/drivers/clk/imx/clk-imx1.c index 22fc7491ba00..f6ea7e5052d5 100644 --- a/drivers/clk/imx/clk-imx1.c +++ b/drivers/clk/imx/clk-imx1.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include "clk.h" diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c index 5d177125728d..99618ded0939 100644 --- a/drivers/clk/imx/clk-imx27.c +++ b/drivers/clk/imx/clk-imx27.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include "clk.h" diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c index c44e18c6f63f..4c8d9ff0b2ad 100644 --- a/drivers/clk/imx/clk-imx31.c +++ b/drivers/clk/imx/clk-imx31.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include "clk.h" diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c index 7dcbaea3fea3..3b6fdb4e0be7 100644 --- a/drivers/clk/imx/clk-imx35.c +++ b/drivers/clk/imx/clk-imx35.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include "clk.h" From patchwork Tue Mar 28 10:05:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 75960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2100933vqo; Tue, 28 Mar 2023 03:13:47 -0700 (PDT) X-Google-Smtp-Source: AKy350alSn+GdgL6Hck44FfYmUcrr8GMH3RzWJyrQH8W42Z8/xiW4LQA8ODl0A++Wn9LBhfHYGyu X-Received: by 2002:aa7:9423:0:b0:626:41d:db30 with SMTP id y3-20020aa79423000000b00626041ddb30mr14775512pfo.25.1679998426895; Tue, 28 Mar 2023 03:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679998426; cv=none; d=google.com; s=arc-20160816; b=zrzHkP0SSs0X8tEeQ7DYsE/5M9iWix2NomIedjlKhn0CWhKRSnxBC3Ebc8OXXWxjEy VcfazUhoNujEyFAhiPxDXr8sf8E6GJU0jw38ddHSdwMMXN81XO2tkQPNazT22zNjcD+G HutRSzzLIbyHD051rvCKzPrUeu9+HaNUGaIbnVg90SBfwh21R4CLyafDYZrHBtHLi9qI etyr8wnTEENv0tNCUpu8i0qMAceQnFK47GKgf/YHISqiX7pO8j0UW5BgcpoJv61xAPJ8 Y5+dJL0IzXkMapFsTGKuTjvUQRSIV92ZX7MF/Vx85+iv28en9TwMA+Ilj7Bl2t60A2sN 21zw== 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=0p0Yjs8sTRCKDX8z8B4hN4ZRs+GersTE3acH9jOa/7E=; b=ZmuKEL+VRmCvG5lS6eDXp+CqztRaWKbpqEkL4cnTQbmU1u4soNqRjWUaHzmRrEOHZY YT6D7VHldVk7pn/IV4qhXNaw+/Vrsju1Ewy3yLLzxM09qP9lq6mHFPMYJiMwoR6l28I1 xjAOkdNePSQ2TLujg4u+Q8HVz+/WqYUnIu3MMNiTJF6Sn5gf0BKccsFfk+j4g2X7oRtO ouFsgLQf79wQcwf1z53uT1yXY8+7994wCd+0EjBtsCQKmjCxHruft0e6gyhcc4yoCUCL KTzQtbpJNsT9RqKKdKcfaDGVivNNZ6XiRcv1LdqTQrOoOg5yK3OqdL4Yi9U0Ja46kQU2 5M9A== 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 fd21-20020a056a002e9500b00608f52c3f20si30669317pfb.302.2023.03.28.03.13.34; Tue, 28 Mar 2023 03:13:46 -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 S232795AbjC1KG5 (ORCPT + 99 others); Tue, 28 Mar 2023 06:06:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjC1KGt (ORCPT ); Tue, 28 Mar 2023 06:06:49 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC9A77D8B for ; Tue, 28 Mar 2023 03:06:21 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ph6DW-0005iL-QO; Tue, 28 Mar 2023 12:06:14 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ph6DW-007Hd4-3G; Tue, 28 Mar 2023 12:06:14 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ph6DV-008eqC-DX; Tue, 28 Mar 2023 12:06:13 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Daniel Lezcano , Thomas Gleixner , Shawn Guo , Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org, Fabio Estevam , NXP Linux Team , Pengutronix Kernel Team , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] clocksource/drivers/imx-gpt: Fold into its only user Date: Tue, 28 Mar 2023 12:05:31 +0200 Message-Id: <20230328100531.879485-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328100531.879485-1-u.kleine-koenig@pengutronix.de> References: <20230328100531.879485-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1790; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=4FtKZGWE7QEs+SiwKtlTDYTMbd0vZfDdvhQ65J0qa1o=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkIrvqaD5udDZuqv55KVpmanjLuFTnZXggqT1/C ttOvyfatzKJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZCK76gAKCRCPgPtYfRL+ TnSlB/0TCSm28OvliqaBh9+V1ig+6sD4JbkmveYJkW6Rx750KHS0p/gthePMZDds5w8j+M2Zu94 pLTyoZ9tXfsEAkZ0gQEHXdm7U3hAGXvcmS+JGJujEEaO4J9PLZArEDESXLfa9AH7TQ9HbDpn3Q1 5Je6Usfg3fJpe02hF8kfpxDKWO3euePsDk8bPE/6frCRMhEjGcxG6sfswilk/T6ZvqBck3h31+v 4lCkBIXkuQCepaApaA+tTV9xHNKHw33/qN4/IjZtanpykukp9i0zyz2NDiZ1Nojz7TWk/X2mr+D i7hxMixdqLLncgwf5pjKWj3MScSSee6MoB3RZxK1NoBxxPmq X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761606030616824466?= X-GMAIL-MSGID: =?utf-8?q?1761606030616824466?= Only the imx-gpt timer driver makes use of enum imx_gpt_type that is otherwise unused. Move its definition into the timer-imx-gpt driver. Signed-off-by: Uwe Kleine-König --- drivers/clocksource/timer-imx-gpt.c | 7 ++++++- include/soc/imx/timer.h | 16 ---------------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 include/soc/imx/timer.h diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 83cefff2bec1..28ab4f1a7c71 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -16,7 +16,6 @@ #include #include #include -#include /* * There are 4 versions of the timer hardware on Freescale MXC hardware. @@ -25,6 +24,12 @@ * - MX25, MX31, MX35, MX37, MX51, MX6Q(rev1.0) * - MX6DL, MX6SX, MX6Q(rev1.1+) */ +enum imx_gpt_type { + GPT_TYPE_IMX1, /* i.MX1 */ + GPT_TYPE_IMX21, /* i.MX21/27 */ + GPT_TYPE_IMX31, /* i.MX31/35/25/37/51/6Q */ + GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */ +}; /* defines common for all i.MX */ #define MXC_TCTL 0x00 diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h deleted file mode 100644 index 25f29c6bbd0b..000000000000 --- a/include/soc/imx/timer.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright 2015 Linaro Ltd. - */ - -#ifndef __SOC_IMX_TIMER_H__ -#define __SOC_IMX_TIMER_H__ - -enum imx_gpt_type { - GPT_TYPE_IMX1, /* i.MX1 */ - GPT_TYPE_IMX21, /* i.MX21/27 */ - GPT_TYPE_IMX31, /* i.MX31/35/25/37/51/6Q */ - GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */ -}; - -#endif /* __SOC_IMX_TIMER_H__ */