From patchwork Wed Apr 26 09:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 87767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp109196vqo; Wed, 26 Apr 2023 02:22:58 -0700 (PDT) X-Google-Smtp-Source: AKy350b/ZPjhE/94wMK92KhRuG1A7k6ljdIkYbLv3D4omJe7V2oNJAl7YTubsyVszGWRV8r88nEu X-Received: by 2002:a05:6a20:3952:b0:f0:1d03:5fe7 with SMTP id r18-20020a056a20395200b000f01d035fe7mr27941100pzg.38.1682500978359; Wed, 26 Apr 2023 02:22:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682500978; cv=none; d=google.com; s=arc-20160816; b=fKABB6qsmvSgsqdpmQ6OD/9saSoNBFI6RPT3PzvyiEjYZr7CF4Tw93EjfeAOjchHWj QSFHisJfUs1AUr9Zc/DbK8B8k1eixeSwAgGJ+2XcKdzNhyaieFAjjIcm9hU1faOkXVQO O7Nc9P3Ot4Rfw+tB6ujMkZQnqWCQLuUnkgEWrozWPjdV4UEo05ZUlj9BN+d527YNFqV0 q8wpFY+eoVcmH31eiAAyysSfqK8TJVLdRB+v1Ji7F2nlA+Z7mUkFcTKpBUFzunjUAX3/ TZpnk3LClJkSNRpYmcfZzs9fCC7K8aEHyv1IPO2Ulo32rJZiB6vxj4F3RgQ+C4IKIL1r AUDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=AD++uZqsO1TQvdELJ+jJo+eoOluJlmJJrrN46Beilj4=; b=bDtKKVzCy4qUIQ6MizEOOisaTTXy6bN0o1Y6YUnyjXPHVXThSasG3RgPeuPJvZHHIn LPGWpblsHa0zMbAzFnIrSBRQJIPlGFq74Ai2cyjYtKM7qZMojUT9Nz4FFJJexyx5LFVd jLGcqenZK47X8L+FPU6u6E07SFdVEmmeSZaFV9vLiZzoEAwUaR55Cw3NB4php9l63AGr IixSD/NEoCzq/MG6y7zzuHLlN+tIFIpPm4l2YY0LU8DMIKXSjq+2Zibt5UWrJB7JEiHz 8y1sRal7jtcecctlw5VXLCCRIhtEibgsL05IWHau91wSCu5F6Px0VZbEBIEeTrXMMda9 Ygow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="uX/N76n0"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=12Ef82nX; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j4-20020a634a44000000b0051b280be4a2si15158121pgl.486.2023.04.26.02.22.45; Wed, 26 Apr 2023 02:22:58 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b="uX/N76n0"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=12Ef82nX; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240095AbjDZJO3 (ORCPT + 99 others); Wed, 26 Apr 2023 05:14:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240089AbjDZJMj (ORCPT ); Wed, 26 Apr 2023 05:12:39 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6A134495; Wed, 26 Apr 2023 02:12:35 -0700 (PDT) Date: Wed, 26 Apr 2023 09:12:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1682500353; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD++uZqsO1TQvdELJ+jJo+eoOluJlmJJrrN46Beilj4=; b=uX/N76n0Pm/oJBlhoLXcuQuEUymv1seEjg6ExkoUq0DTrVesMdomD7iTKHf507Z1COMryY bFaN0KZ3UBkiQ1AGkSocY9bR2fWw26QeyKn2BgECXtty0wKLZQV6mTAA820ZCs9qlGnxnI zxELjtmAtBujYt2dYthwgn0CWpqueuEV5vLAge1ijEOU1LsoWaGvH2sxFIOXrVZi0J2oF8 Un2YajMYMtV2YPQs6YTWWoPDOLic2MBMnesWYJmPEAEYiBOJFKZ3UsPhlhFdEfydGV+rvZ LCGy+RZbXfWeUgmUlmjmDHLqIpY/KFxNcu4S7uI8jvZagV+XwisWjvT9pbqVgQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1682500353; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AD++uZqsO1TQvdELJ+jJo+eoOluJlmJJrrN46Beilj4=; b=12Ef82nXAyJkxsuwWwonCcTPWH9g5OxLJc+4WbdBNovK59W1D30QN4purxWFWm0poONSCc zKV70F6F8MM1gqAA== From: "tip-bot2 for Fabio Estevam" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/timer-imx-gpt: Remove non-DT function Cc: Fabio Estevam , u.kleine-koenig@pengutronix.de, Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230307124313.708255-1-festevam@denx.de> References: <20230307124313.708255-1-festevam@denx.de> MIME-Version: 1.0 Message-ID: <168250035320.404.1746468610150984093.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759714143778707842?= X-GMAIL-MSGID: =?utf-8?q?1764230145879343980?= The following commit has been merged into the timers/core branch of tip: Commit-ID: f68a40ee4732731f149961abab27a45b6c11f413 Gitweb: https://git.kernel.org/tip/f68a40ee4732731f149961abab27a45b6c11f413 Author: Fabio Estevam AuthorDate: Tue, 07 Mar 2023 09:43:13 -03:00 Committer: Daniel Lezcano CommitterDate: Mon, 24 Apr 2023 16:56:13 +02:00 clocksource/drivers/timer-imx-gpt: Remove non-DT function mxc_timer_init() was originally only used by non-DT i.MX platforms. i.MX has already been converted to be a DT-only platform. Remove the unused mxc_timer_init() function. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20230307124313.708255-1-festevam@denx.de --- drivers/clocksource/timer-imx-gpt.c | 19 ------------------- include/soc/imx/timer.h | 7 ------- 2 files changed, 26 deletions(-) diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 7b2c70f..ca3e4cb 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -420,25 +420,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 b888d50..25f29c6 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__ */