From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26025C433DB for ; Wed, 20 Jan 2021 13:26:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB77C23359 for ; Wed, 20 Jan 2021 13:26:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388623AbhATNZb (ORCPT ); Wed, 20 Jan 2021 08:25:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:53918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730131AbhATNRT (ORCPT ); Wed, 20 Jan 2021 08:17:19 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FD462339D; Wed, 20 Jan 2021 13:16:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611148573; bh=Jdpl5KFdkR/9KAmD8YJewd6d0wpTmXMLG20c3vcQFS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jwcp0Hb4rOaEuoH1DbiiZumYE5REdhKjaKlKh3CfpWQfj0OHGQfi8ETodBpnVVxWY SGUELJ99ARv08b0PVvRfP/TcsJKZl0+RWewofOtXey/EWkPrlmNMVsgjI7KeMW2iW+ jRAJeEoslxjvHZm7YCbM2CTYPIh5W032kwuwk1y8PwTqHYve00fZrT27B1b3jMSt84 llmufNMxMdgLrv41BOFbV2/OgPivJJgCSnQcJWxbNFzdI23JDkQBx31kQa15TjdP/b dqYSLfIKvYvdbz1T6ffognTkQWhi7RMzAmN3VJ8ohGG5M4C1Lx3HXao2uwVIpobh2g 7PjDqccPAhVHQ== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Lezcano , Thomas Gleixner Cc: Arnd Bergmann , Marc Gonzalez , Mans Rullgard Subject: [PATCH 2/4] timer: remove tango driver Date: Wed, 20 Jan 2021 14:15:57 +0100 Message-Id: <20210120131559.1971359-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120131559.1971359-1-arnd@kernel.org> References: <20210120131559.1971359-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann The tango platform is getting removed, so the driver is no longer needed. Cc: Marc Gonzalez Cc: Mans Rullgard Signed-off-by: Arnd Bergmann --- drivers/clocksource/Kconfig | 8 ---- drivers/clocksource/Makefile | 1 - drivers/clocksource/timer-tango-xtal.c | 57 -------------------------- 3 files changed, 66 deletions(-) delete mode 100644 drivers/clocksource/timer-tango-xtal.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 824a0f6b77d4..1feadd067677 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -560,14 +560,6 @@ config CLKSRC_MIPS_GIC select CLOCKSOURCE_WATCHDOG select TIMER_OF -config CLKSRC_TANGO_XTAL - bool "Clocksource for Tango SoC" if COMPILE_TEST - depends on ARM - select TIMER_OF - select CLKSRC_MMIO - help - This enables the clocksource for Tango SoC. - config CLKSRC_PXA bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST depends on HAS_IOMEM diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 41c154478a1a..1089f2ed8560 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -72,7 +72,6 @@ obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += timer-versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o -obj-$(CONFIG_CLKSRC_TANGO_XTAL) += timer-tango-xtal.o obj-$(CONFIG_CLKSRC_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLKSRC_IMX_TPM) += timer-imx-tpm.o obj-$(CONFIG_TIMER_IMX_SYS_CTR) += timer-imx-sysctr.o diff --git a/drivers/clocksource/timer-tango-xtal.c b/drivers/clocksource/timer-tango-xtal.c deleted file mode 100644 index 3f94e454ef99..000000000000 --- a/drivers/clocksource/timer-tango-xtal.c +++ /dev/null @@ -1,57 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include - -static void __iomem *xtal_in_cnt; -static struct delay_timer delay_timer; - -static unsigned long notrace read_xtal_counter(void) -{ - return readl_relaxed(xtal_in_cnt); -} - -static u64 notrace read_sched_clock(void) -{ - return read_xtal_counter(); -} - -static int __init tango_clocksource_init(struct device_node *np) -{ - struct clk *clk; - int xtal_freq, ret; - - xtal_in_cnt = of_iomap(np, 0); - if (xtal_in_cnt == NULL) { - pr_err("%pOF: invalid address\n", np); - return -ENXIO; - } - - clk = of_clk_get(np, 0); - if (IS_ERR(clk)) { - pr_err("%pOF: invalid clock\n", np); - return PTR_ERR(clk); - } - - xtal_freq = clk_get_rate(clk); - delay_timer.freq = xtal_freq; - delay_timer.read_current_timer = read_xtal_counter; - - ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, - 32, clocksource_mmio_readl_up); - if (ret) { - pr_err("%pOF: registration failed\n", np); - return ret; - } - - sched_clock_register(read_sched_clock, 32, xtal_freq); - register_current_timer_delay(&delay_timer); - - return 0; -} - -TIMER_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); -- 2.29.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C53D0C433E0 for ; Wed, 20 Jan 2021 13:18:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 623282245C for ; Wed, 20 Jan 2021 13:18:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 623282245C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Vo6YL9Fn1n9ygmW+PRZwvhBiwqsdEZropJwVr/YGeS0=; b=SV2Gzkf8yRm4rn5B5Ri/EHDwY 9boV2flzcnB+L33hFjVKacEgr1gOkBo+5nHkEkht8pgQIdZrJ9VBV8/h8aEaXvcSYoTBAiH8Yme+4 YGMHOCTsr7Gt+cU8pHN6Ut0Ku+axJZudt896+snZXNlKErtOMPbIymfG+sJf49i5Pe2V9f9h30BwU K2NZ+0njB08LMLFFiGBSmB0f9y5fRl8uDttsiJZ7/1nA904CCcBwTwjzTvsmZisAXOxA6Yj4O1h5u oQk+JaL8YEGGO2Jz2ABrpRLQk25mybof+MIkiu2q/09J47mb46ZHCSsj5QGouGIz3XDlTAmgBKp2r 7X4ryWEBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2DLX-0008CW-7H; Wed, 20 Jan 2021 13:16:27 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2DLK-00089Q-HD for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 13:16:15 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FD462339D; Wed, 20 Jan 2021 13:16:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611148573; bh=Jdpl5KFdkR/9KAmD8YJewd6d0wpTmXMLG20c3vcQFS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jwcp0Hb4rOaEuoH1DbiiZumYE5REdhKjaKlKh3CfpWQfj0OHGQfi8ETodBpnVVxWY SGUELJ99ARv08b0PVvRfP/TcsJKZl0+RWewofOtXey/EWkPrlmNMVsgjI7KeMW2iW+ jRAJeEoslxjvHZm7YCbM2CTYPIh5W032kwuwk1y8PwTqHYve00fZrT27B1b3jMSt84 llmufNMxMdgLrv41BOFbV2/OgPivJJgCSnQcJWxbNFzdI23JDkQBx31kQa15TjdP/b dqYSLfIKvYvdbz1T6ffognTkQWhi7RMzAmN3VJ8ohGG5M4C1Lx3HXao2uwVIpobh2g 7PjDqccPAhVHQ== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Lezcano , Thomas Gleixner Subject: [PATCH 2/4] timer: remove tango driver Date: Wed, 20 Jan 2021 14:15:57 +0100 Message-Id: <20210120131559.1971359-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120131559.1971359-1-arnd@kernel.org> References: <20210120131559.1971359-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_081614_772311_B9E785D4 X-CRM114-Status: GOOD ( 15.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mans Rullgard , Arnd Bergmann , Marc Gonzalez Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The tango platform is getting removed, so the driver is no longer needed. Cc: Marc Gonzalez Cc: Mans Rullgard Signed-off-by: Arnd Bergmann --- drivers/clocksource/Kconfig | 8 ---- drivers/clocksource/Makefile | 1 - drivers/clocksource/timer-tango-xtal.c | 57 -------------------------- 3 files changed, 66 deletions(-) delete mode 100644 drivers/clocksource/timer-tango-xtal.c diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 824a0f6b77d4..1feadd067677 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -560,14 +560,6 @@ config CLKSRC_MIPS_GIC select CLOCKSOURCE_WATCHDOG select TIMER_OF -config CLKSRC_TANGO_XTAL - bool "Clocksource for Tango SoC" if COMPILE_TEST - depends on ARM - select TIMER_OF - select CLKSRC_MMIO - help - This enables the clocksource for Tango SoC. - config CLKSRC_PXA bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST depends on HAS_IOMEM diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 41c154478a1a..1089f2ed8560 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -72,7 +72,6 @@ obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o obj-$(CONFIG_CLKSRC_VERSATILE) += timer-versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o -obj-$(CONFIG_CLKSRC_TANGO_XTAL) += timer-tango-xtal.o obj-$(CONFIG_CLKSRC_IMX_GPT) += timer-imx-gpt.o obj-$(CONFIG_CLKSRC_IMX_TPM) += timer-imx-tpm.o obj-$(CONFIG_TIMER_IMX_SYS_CTR) += timer-imx-sysctr.o diff --git a/drivers/clocksource/timer-tango-xtal.c b/drivers/clocksource/timer-tango-xtal.c deleted file mode 100644 index 3f94e454ef99..000000000000 --- a/drivers/clocksource/timer-tango-xtal.c +++ /dev/null @@ -1,57 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include - -static void __iomem *xtal_in_cnt; -static struct delay_timer delay_timer; - -static unsigned long notrace read_xtal_counter(void) -{ - return readl_relaxed(xtal_in_cnt); -} - -static u64 notrace read_sched_clock(void) -{ - return read_xtal_counter(); -} - -static int __init tango_clocksource_init(struct device_node *np) -{ - struct clk *clk; - int xtal_freq, ret; - - xtal_in_cnt = of_iomap(np, 0); - if (xtal_in_cnt == NULL) { - pr_err("%pOF: invalid address\n", np); - return -ENXIO; - } - - clk = of_clk_get(np, 0); - if (IS_ERR(clk)) { - pr_err("%pOF: invalid clock\n", np); - return PTR_ERR(clk); - } - - xtal_freq = clk_get_rate(clk); - delay_timer.freq = xtal_freq; - delay_timer.read_current_timer = read_xtal_counter; - - ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, - 32, clocksource_mmio_readl_up); - if (ret) { - pr_err("%pOF: registration failed\n", np); - return ret; - } - - sched_clock_register(read_sched_clock, 32, xtal_freq); - register_current_timer_delay(&delay_timer); - - return 0; -} - -TIMER_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel