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__ */