From patchwork Sat May 27 09:58:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100596 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622046qge; Sat, 27 May 2017 02:59:33 -0700 (PDT) X-Received: by 10.84.178.129 with SMTP id z1mr17608643plb.171.1495879173253; Sat, 27 May 2017 02:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879173; cv=none; d=google.com; s=arc-20160816; b=r/J0D0rZ2he4wbsf5bF11Rj++UMTqodEgEGoHa+5OKC/Mauptv6OUE03zPHDg4apdN iLkPQNxaHwTFXh5AcF/R6GnOoumfDLb+aI9vOFWD2dOxSfdZV0puhrgS6VxfejcKwl3Q 1imsYpZLpwBLwt22V2Be1q+bZBOa3QyJ/pK3f/1cK+cyyjg2uqHPxCBw2Lwlhm1VIsk7 bmKCR2ACG3Pm3zsnVtZbPBrFmcTl9TdKLz0omCptKhvNdD1q9m92Qs/x1QPEKweg3SPb D6fWhi0YBkvQaapR5VVEl287IaDka+p3nH67J2d8lSUf+rxL0aVlTSrcmQNlgXrMMKTX lEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=xjG/ui+tURrpwADdqUC/BRKTI94j/nXFls0pOAhH728cENC8F/9aFiBh0c5Dkcy2Tt 5M9SID7OYrvXI0Rg/RM+IrXHSsjrmziXGcdRI9DNo3kPj+goLMMF/diI9oPwPUyOAgam mRh5RGR/E+1awz5TrxQ83TqZkwvfd9U7uWM9qgrezt7NW866oKeLuX7xa4mUyU1daqdo nYriMGE0TAUtoOIf3vuQHZ9JsQkSfw5PpG/Ne+wu1zPTkLhxIuOMvBHmbfUgVwRz5XkI G71syscvZA+Ig6ZfP2X/rmjz7BSQLbIBJCN2PVYQWyQeClRP5qfe/vIlHrqeU+MJdCrC 8w/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6si3804937pfb.286.2017.05.27.02.59.32; Sat, 27 May 2017 02:59:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755245AbdE0J7I (ORCPT + 25 others); Sat, 27 May 2017 05:59:08 -0400 Received: from mail-wr0-f175.google.com ([209.85.128.175]:34324 "EHLO mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755221AbdE0J7G (ORCPT ); Sat, 27 May 2017 05:59:06 -0400 Received: by mail-wr0-f175.google.com with SMTP id j27so12805960wre.1 for ; Sat, 27 May 2017 02:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=WOaseEyKDWaOstlft1uxET/vDoE/4aWE1qP8dgwesMZoceJwERhpVh71/0OajIl1q6 nzYvNpVELFU+vMyKrUuRlakqsZxLS3RuN+zJMiHmsM31NoTgxndvcSnO6MnDPfLyyL7m kt9R6aNAZpTLaQHIfFeP1xbZFny6MCEO90P7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=58OPREnU3megszPEpxNDZzPIgA0c8SYWDEgRe5lS12Q=; b=jOceruAmsWWsi+6dmZgd6TbwKD9sVUIKZZnMkrEe5sdfR6mRiLSi+Vb4av/+k2Zo1X pCuwGjYoxMbpWTkioeTN6UPA7Z2FkoZVaowWtdVzdmrqg66IhMUxP4eBV8ZguHhNRVU0 ULF/EnswpZYxo2Ga0gqb8Ffpp9brRO3XjYO3RR3sQwtQrAKqWq80lXULp+DtlZPuVzUe ZJaqbh2PI0nxjjhCa9jsi5Paits+08+RYfItFVg7G6lym/yTLhyf4+EjCRJtN+Mg+5mS g7SMCv9w0K/wyHLVXWLUcDO85+RXmf2NoSHtIVo51VrR6e2tjMbyZNB3zWt7r2074XMm lL7A== X-Gm-Message-State: AODbwcD8kf9xYT+5BlpHnvB+xiT13TZ8wSWZwICVz/RjGihf+k02EDlq LIdEa7n916c+64xf X-Received: by 10.223.152.18 with SMTP id v18mr1097221wrb.8.1495879145082; Sat, 27 May 2017 02:59:05 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:04 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland Subject: [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Date: Sat, 27 May 2017 11:58:42 +0200 Message-Id: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After discussing it, this feature is dropped as it is not considered adequate: https://patchwork.kernel.org/patch/9639317/ There is no user of this macro yet, so there is no impact on the drivers. This reverts commit 376bc27150f180d9f5eddec6a14117780177589d. Cc: Mark Rutland Signed-off-by: Daniel Lezcano --- drivers/clocksource/Kconfig | 7 ----- drivers/clocksource/Makefile | 1 - drivers/clocksource/clkevt-probe.c | 56 -------------------------------------- include/linux/clockchips.h | 9 ------ 4 files changed, 73 deletions(-) delete mode 100644 drivers/clocksource/clkevt-probe.c -- 2.7.4 diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 1b22ade..623fcc6 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -5,10 +5,6 @@ config CLKSRC_OF bool select CLKSRC_PROBE -config CLKEVT_OF - bool - select CLKEVT_PROBE - config CLKSRC_ACPI bool select CLKSRC_PROBE @@ -16,9 +12,6 @@ config CLKSRC_ACPI config CLKSRC_PROBE bool -config CLKEVT_PROBE - bool - config CLKSRC_I8253 bool diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index cf0c30b..cad713c 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,5 +1,4 @@ obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o -obj-$(CONFIG_CLKEVT_PROBE) += clkevt-probe.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c deleted file mode 100644 index 8c30fec..0000000 --- a/drivers/clocksource/clkevt-probe.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016, Linaro Ltd. All rights reserved. - * Daniel Lezcano - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -extern struct of_device_id __clkevt_of_table[]; - -static const struct of_device_id __clkevt_of_table_sentinel - __used __section(__clkevt_of_table_end); - -int __init clockevent_probe(void) -{ - struct device_node *np; - const struct of_device_id *match; - of_init_fn_1_ret init_func; - int ret, clockevents = 0; - - for_each_matching_node_and_match(np, __clkevt_of_table, &match) { - if (!of_device_is_available(np)) - continue; - - init_func = match->data; - - ret = init_func(np); - if (ret) { - pr_warn("Failed to initialize '%s' (%d)\n", - np->name, ret); - continue; - } - - clockevents++; - } - - if (!clockevents) { - pr_crit("%s: no matching clockevent found\n", __func__); - return -ENODEV; - } - - return 0; -} diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index eef1569..a116926 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -223,13 +223,4 @@ static inline void tick_setup_hrtimer_broadcast(void) { } #endif /* !CONFIG_GENERIC_CLOCKEVENTS */ -#define CLOCKEVENT_OF_DECLARE(name, compat, fn) \ - OF_DECLARE_1_RET(clkevt, name, compat, fn) - -#ifdef CONFIG_CLKEVT_PROBE -extern int clockevent_probe(void); -#els -static inline int clockevent_probe(void) { return 0; } -#endif - #endif /* _LINUX_CLOCKCHIPS_H */ From patchwork Sat May 27 09:58:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100597 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622205qge; Sat, 27 May 2017 03:00:05 -0700 (PDT) X-Received: by 10.84.215.23 with SMTP id k23mr22183460pli.104.1495879205879; Sat, 27 May 2017 03:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879205; cv=none; d=google.com; s=arc-20160816; b=A2HIEc5tubyknNWECwceNajnNS73yzq9u8hSEOM2Mhx61VnSZtmv4H7NbV+vOlSlYh PJExeK2+yJqvPSLJRsAzWxTEHgdt4SwZZxj+i2MpDGfYSFDdbP1oZ/IIDOoc1X7ANrDc pcVfn6MClNX4vO+BG3TCTD0CXn1vYtnioLYKYZ48Qx/4cSsd56aPB6ZXDeSpk38vzswN p/wphuHZNLhg4P/ZiMzAMLdwjq8CpFXodCEIk+jHMqRp2+zDOR0N6PYIUea0Oa9Wrx0T 9Yk3Vcs+ZFKIfbJp95IwZdt31aoVSIbdg9ibKyALrxk57f1QYvzv4nXUMnZB5qEaMm+g 90pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=gKKbizj8QS4vYlGG0aEQkZmWef63LEvsXria1N2C4x8=; b=ERu/EdFr3LgXfOPysSvgHuC04RlJkSVnk5gIX9Ia+YQ4I2uyzvT4QUHhPTSDJJh3CC 5X9biCN6ahqk/6JYy6bbi2aVNg74ApU2jny8noJjrJTXEpCLxuSM4KYCMPJfCWnTbMWl vJBZoMjcDKN4jivVyWxoSJvcKpoeCTTexz/R2nKwRroyWDCM50uQiWUO4OMwP6YDFQ71 yzVkk26USTx954JlNKAU4LQTNqsWyNKrA3wl21oXfCEmI4tnCqlTFif0tsG0CVJynIdb Th8EXYAeWfdwT6gFlc6sVlo9PlTN/hmxodyFfL8PGsEuyMbqM0bZo3Xr+dYiyJxVxsSe IDTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si3677512pga.313.2017.05.27.03.00.05; Sat, 27 May 2017 03:00:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755270AbdE0J7l (ORCPT + 25 others); Sat, 27 May 2017 05:59:41 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:36675 "EHLO mail-wr0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755251AbdE0J7i (ORCPT ); Sat, 27 May 2017 05:59:38 -0400 Received: by mail-wr0-f179.google.com with SMTP id l50so12778923wrc.3 for ; Sat, 27 May 2017 02:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gKKbizj8QS4vYlGG0aEQkZmWef63LEvsXria1N2C4x8=; b=ic6pfd/zR6Sbf8d3lpQ4lIRSewpZUVUqgeTxoPRg7MEWcPKUw/AVS+eqGriK3jdMZM Eu5viyAcOgxQvbmaBYOJK3sKaqsUM21ZLu7wgWEDR4+vi3Df8vXEz1Lo9xqRQNnsV10F OF/dvib4fR54+nG8AnOYQAFTwmPNNzvAr4uhY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gKKbizj8QS4vYlGG0aEQkZmWef63LEvsXria1N2C4x8=; b=Ka7+aYupyM7AC4edoroQDxU6P9pqF3XPrXAnbo2oULgv5Eh92FzHxcbvZiU08YWrox P3XiEaNsoNSnpb2ZsKqVNnuafmX3+epdlZvnejKBmR0613//bdY7sA44M+d7YFJPsYYD TZJ+EZ33qYg6IZ5udtiCLiriJpEnIls268RUOQIl+EwHy8LyBjk5y0ivh2vEqMz2bC/J glwXUqQQ65fffNiUXB1RUrwjb7fJdTlzMJsnyyybR1YNijjeIuaKfNmpcgtX6eMkh0al z9Cc+kfOvOnPfRuHImV+PGISyLYEH/zjGdWFNV6xmXmqpVPCivm2DxWRBYMXJ6g3m0ga rGcg== X-Gm-Message-State: AODbwcCevEKVznD3BeVxPXojUl1qQPbl6t7GARVeRCB2gPwxQSulaCU4 Jmm37cg/DEw+XVah X-Received: by 10.223.133.35 with SMTP id 32mr4317912wrh.200.1495879177549; Sat, 27 May 2017 02:59:37 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:36 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Rutland , Marc Zyngier , John Stultz , Stephen Boyd Subject: [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Date: Sat, 27 May 2017 11:58:45 +0200 Message-Id: <1495879129-28109-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The macro name is now renamed to 'TIMER_ACPI_DECLARE' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano --- drivers/clocksource/arm_arch_timer.c | 2 +- include/linux/clocksource.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 Reviewed-by: Linus Walleij diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 9a41958..8d4bec9 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1516,5 +1516,5 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) return arch_timer_common_init(); } -CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); +TIMER_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); #endif diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 010bb9f..e43f37f 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -258,7 +258,7 @@ extern void timer_probe(void); static inline void timer_probe(void) {} #endif -#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \ +#define TIMER_ACPI_DECLARE(name, table_id, fn) \ ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn) #endif /* _LINUX_CLOCKSOURCE_H */ From patchwork Sat May 27 09:58:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100600 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622364qge; Sat, 27 May 2017 03:00:31 -0700 (PDT) X-Received: by 10.98.204.130 with SMTP id j2mr7217094pfk.107.1495879231325; Sat, 27 May 2017 03:00:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879231; cv=none; d=google.com; s=arc-20160816; b=hV6JxVA8wEttQC6tki3EdVTynn2/muiJU9/iIhm+Iacbl/rqxq1mhPdNpCbgqEEjoa bKiaGxQDRBb7VaFlshm9aq4ZGNeFnBJQoVS+pBkIZrdS12VgaPaT5pUJhXp2T46huQCz alzinceXoYhOvzwMw7bsikUF9ury2zqAMhese8iQWAIbu38x+znif3PwvZu7WoNKWpfN H0mr2GI/XzWjzCbker1ed2vpIRFyYRrckad/BXB1Cr1g4xE4K+kb4sAw+DNhakFYPkzL HVIlA30w4plZNTzj/ENEqsUUq7Vbf88UYktdsai1aFzQGmj0f4RoOOLwqcRa7pEqI6uM 56IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=fUv1m26v2T31z8DN+nGD33twlJgRWiwAvD74MdfEq14aYX0+TKnCmHMgQDV2gDmgti cuMbOzZpYjjsxnjiV2BjH+PXY08HslHEC+26biG7xp2p23YyPEfhluHUZEf1glJnDcnV djg+LEpJkqYW00mbuBCCpYWm9+Id9KgAFKzzPD7FAbKS7Q4rLML2zcooztaDKKylX4lU l1Un32rQJrpbI4Wyi2fCAHbezm1RU5NHJcziaiKnwnWi/gHZK6GyBoIfme/JNPXMVwiQ mLxBt70VYtMk3I0FIX+gTTHXJgYazXHWbz+MtKfslYfpdSjxK7kcK1mRrSkJi7X0cj6G /Fyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z31si5578593plb.186.2017.05.27.03.00.31; Sat, 27 May 2017 03:00:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364AbdE0KAW (ORCPT + 25 others); Sat, 27 May 2017 06:00:22 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:32959 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755134AbdE0J7k (ORCPT ); Sat, 27 May 2017 05:59:40 -0400 Received: by mail-wr0-f177.google.com with SMTP id w50so12794530wrc.0 for ; Sat, 27 May 2017 02:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=BhQ7GAKuqLxNbWa2+LCtFo2ogw9glmQDt6Wrbc0KTkxvWOQz2nkgGwdiyBTV6JG4oy wBFexQB0Lxn39Z2gxbWm2Y4Nx1DYDNzwHkFKQvjqnH15ma+1hc8E5bg3vbPtgFYAi/Cs P6xvRp6zfxUNgmHyVJg7gwuqETUAYg8Mo+mX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cAokSEZGbSc0SoGx6D6V+qIRX+mHVOcwAnFMaCn+rPc=; b=at8CCHFi/vcqqXLWcWJM9iahp3vCe0u3O9uYS1ODZ3XBrwhMzdW9iwLHt58yhSQUnk oA8W96PH7JbOyN1JpscwVOYz4tYISOerkXrfKKZgJKDJ3/mnf7aFAw/trvlW3zTcvfpl UB9FO44Vn1IdXGeKXlrCwclSBehDhIX3/xrfP7WhyubixiuqZ4sbxD0j3OtyjWS8iunJ kZDYmvwZbYXFvzW3Ws9GbyfenBS+gbSbTu8o1udciHfhGa3W0EBatUKaYUGw2/kyGj29 HD1ngYR5jB51ycumN8aXiLBlOQWb9DXS3zJdT94GDpPZqyqU3c0XVFsSwAQa2n3SSO0y NKMQ== X-Gm-Message-State: AODbwcApXBtAyb3lJUh/JtlxDcJaT6MEpGe0T1Sbfd0YZqUR5pBhu6vk eAYSeE7pQc3apCmWXeDv0baF X-Received: by 10.223.151.203 with SMTP id t11mr4959564wrb.18.1495879179060; Sat, 27 May 2017 02:59:39 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:38 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , John Stultz , Stephen Boyd , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH 5/7] clocksource: Rename clksrc Date: Sat, 27 May 2017 11:58:46 +0200 Message-Id: <1495879129-28109-5-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The table name is now renamed to 'timer' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano --- drivers/clocksource/clksrc-probe.c | 18 +++++++++--------- include/asm-generic/vmlinux.lds.h | 6 +++--- include/linux/clocksource.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) -- 2.7.4 Reviewed-by: Linus Walleij diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c index 5d549c2..da81e5d 100644 --- a/drivers/clocksource/clksrc-probe.c +++ b/drivers/clocksource/clksrc-probe.c @@ -19,20 +19,20 @@ #include #include -extern struct of_device_id __clksrc_of_table[]; +extern struct of_device_id __timer_of_table[]; -static const struct of_device_id __clksrc_of_table_sentinel - __used __section(__clksrc_of_table_end); +static const struct of_device_id __timer_of_table_sentinel + __used __section(__timer_of_table_end); void __init timer_probe(void) { struct device_node *np; const struct of_device_id *match; of_init_fn_1_ret init_func_ret; - unsigned clocksources = 0; + unsigned timers = 0; int ret; - for_each_matching_node_and_match(np, __clksrc_of_table, &match) { + for_each_matching_node_and_match(np, __timer_of_table, &match) { if (!of_device_is_available(np)) continue; @@ -45,11 +45,11 @@ void __init timer_probe(void) continue; } - clocksources++; + timers++; } - clocksources += acpi_probe_device_table(clksrc); + timers += acpi_probe_device_table(timer); - if (!clocksources) - pr_crit("%s: no matching clocksources found\n", __func__); + if (!timers) + pr_crit("%s: no matching timers found\n", __func__); } diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0968d13..ca922ae 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -172,7 +172,7 @@ KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table_end)) -#define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) +#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) @@ -558,14 +558,14 @@ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \ - CLKSRC_OF_TABLES() \ + TIMER_OF_TABLES() \ IOMMU_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \ KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ - ACPI_PROBE_TABLE(clksrc) \ + ACPI_PROBE_TABLE(timer) \ ACPI_PROBE_TABLE(iort) \ EARLYCON_TABLE() diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index e43f37f..7cd38b2 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -250,7 +250,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *, extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ - OF_DECLARE_1_RET(clksrc, name, compat, fn) + OF_DECLARE_1_RET(timer, name, compat, fn) #ifdef CONFIG_CLKSRC_PROBE extern void timer_probe(void); @@ -259,6 +259,6 @@ static inline void timer_probe(void) {} #endif #define TIMER_ACPI_DECLARE(name, table_id, fn) \ - ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn) + ACPI_DECLARE_PROBE_ENTRY(timer, name, table_id, 0, NULL, 0, fn) #endif /* _LINUX_CLOCKSOURCE_H */ From patchwork Sat May 27 09:58:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100598 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622215qge; Sat, 27 May 2017 03:00:06 -0700 (PDT) X-Received: by 10.98.89.201 with SMTP id k70mr7122452pfj.196.1495879206631; Sat, 27 May 2017 03:00:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879206; cv=none; d=google.com; s=arc-20160816; b=aq1zq4LtMydsbCRXteiQkX4TbnACqgH6OBRQ3WqskTbnlPT8r+s2JWbqtWKOX10rUq HEOVSjckj5XEP9/HSmhFiLDBlubCIEVckYzCF/Wq24c24bywH9qM4bi57Z+zkKf7YiRe WkfSFqYJ9C/P7ntex2z3WV59oKpUzGA+4a+27xtNj/ZuVJk5gZcAjJCahCZJff7d2iEi PzWkKEjcFgMgXMXbm3vLCCwTJXXjaYS5X16+HEsJGPBPYH8sjcwqWbGokq15DF7PKbaF n/ocmewqzPL7cfcnXF+gZWHGp8gz6pcKwK1wzfb5Ad+ZEfXtPC5x+b+4coayDX0iAV8I 1W/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=wJvubtSxsVMMxgPANdBvlkFOq8oPIACHX705hfsCXdo=; b=ZCQR66tHSQKvaeO1lI3nHUIeQFt+frf3mNkUOL9P/pkYlyfm6vxImj1Pg+xeRGF3ZD XpHYjc8Nxb8VueLaXTkbU25jVPJuHn3C+mFK06Rrnc+okzFWhSYlO46+2ZoE0P3SNvvg fSABozFXPQDz7Z8uMLC6gyx7oXH+3npGnb6c5+lnEla27GhI7gx/Q5b7ufBDDhqRt6Fd amktfziG9a7sWdXAHrxbYEHyMy0e4Pe0uxckwmKUZonmWydOQYea3Ca0fZ3GHKJU1Dei GTQKKUgLJO3Zm+h3BRtGx3jCO0VT/SJJFw5wT7ukMnFeiE06/L3x6PFYupO+mcy8ptxY f6JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si3677512pga.313.2017.05.27.03.00.06; Sat, 27 May 2017 03:00:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755334AbdE0J7z (ORCPT + 25 others); Sat, 27 May 2017 05:59:55 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:34417 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755275AbdE0J7s (ORCPT ); Sat, 27 May 2017 05:59:48 -0400 Received: by mail-wr0-f170.google.com with SMTP id j27so12810731wre.1 for ; Sat, 27 May 2017 02:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wJvubtSxsVMMxgPANdBvlkFOq8oPIACHX705hfsCXdo=; b=b7AuDI6jyDj7zR2zpXwANAmjgDjDY2MQomr28YvsqG1TVJLA3aWpqOIZjHtx/ZQWRz DYXz8vQgnEdaZWLzZgRz8zVv9nJeYm1crbRBrwysEe5xDv4xXK/ALubhWEjkM3vB5kyf mQVhunYDMDlWyqm59ovKVsh5VIC7wpT3+QS5c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wJvubtSxsVMMxgPANdBvlkFOq8oPIACHX705hfsCXdo=; b=OKjq3FSmlZamH6UwD4gOrkcrYl8BnI3kbGE7WKOKMoDDbFPAf/yOqJ+2g5OyWp8H+Y lheRIl6uuY6sX6OXcrNjikN9oPQids0OS3vZX47VgIWLBtb1T97y2YpoNeJX6TWkxP/V x4AnVGdFyVy8j/adxCvS/FU7fQ9kpVcnjVMA3oN4U9A1RSlf7Vkxnk8eQDg9SG/x49DT g/1lBNGKY68TqfRbltTlmjHX+zaV+Jp3wNotaCnVC2BAR1zPuzB3dFzyYWWe39AlDXHb 2mmM74cy3WUd8HiuX1Tl5pHSFM+E2Rs3w4fabc1ONRCWgBjmMLE1r+hz8qd3r8Pd+7CS bEjg== X-Gm-Message-State: AODbwcC7Yp++1dywyTaH+cLpYp7B3Kmlo1Cj7UcBrI3ALf//bW1eav+J Rh0sTnUdu194VOd0 X-Received: by 10.223.173.23 with SMTP id p23mr4851331wrc.117.1495879186261; Sat, 27 May 2017 02:59:46 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:45 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King , Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Alexander Shiyan , Shawn Guo , Sascha Hauer , Fabio Estevam , Kukjin Kim , Krzysztof Kozlowski , Javier Martinez Canillas , Catalin Marinas , Will Deacon , Yoshinori Sato , Michal Simek , John Crispin , Ralf Baechle , Ley Foon Tan , Rich Felker , Arnd Bergmann , John Stultz , Stephen Boyd , Linus Walleij , Stephen Rothwell , Olof Johansson , linux-samsung-soc@vger.kernel.org (moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES), uclinux-h8-devel@lists.sourceforge.jp (moderated list:H8/300 ARCHITECTURE), linux-mips@linux-mips.org (open list:RALINK MIPS ARCHITECTURE), nios2-dev@lists.rocketboards.org (moderated list:NIOS2 ARCHITECTURE), linux-sh@vger.kernel.org (open list:SUPERH), linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Date: Sat, 27 May 2017 11:58:47 +0200 Message-Id: <1495879129-28109-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The config option name is now renamed to 'TIMER_OF' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano --- arch/arm/Kconfig | 10 +++--- arch/arm/mach-bcm/Kconfig | 2 +- arch/arm/mach-clps711x/Kconfig | 2 +- arch/arm/mach-imx/epit.c | 2 +- arch/arm/mach-s3c24xx/Kconfig | 2 +- arch/arm/mach-s3c64xx/Kconfig | 2 +- arch/arm64/Kconfig.platforms | 4 +-- arch/h8300/Kconfig | 2 +- arch/microblaze/Kconfig | 2 +- arch/mips/ralink/Kconfig | 2 +- arch/nios2/Kconfig | 2 +- arch/sh/boards/Kconfig | 2 +- drivers/clocksource/Kconfig | 60 ++++++++++++++++----------------- drivers/clocksource/Makefile | 2 +- drivers/clocksource/clksrc-probe.c | 55 ------------------------------ drivers/clocksource/clps711x-timer.c | 2 +- drivers/clocksource/samsung_pwm_timer.c | 2 +- drivers/clocksource/timer-probe.c | 55 ++++++++++++++++++++++++++++++ include/asm-generic/vmlinux.lds.h | 2 +- include/linux/clocksource.h | 2 +- 20 files changed, 107 insertions(+), 107 deletions(-) delete mode 100644 drivers/clocksource/clksrc-probe.c create mode 100644 drivers/clocksource/timer-probe.c -- 2.7.4 Acked-by: Krzysztof Kozlowski diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0d4e71b..713dbbb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -337,7 +337,7 @@ config ARCH_MULTIPLATFORM select ARM_HAS_SG_CHAIN select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI @@ -351,7 +351,7 @@ config ARM_SINGLE_ARMV7M depends on !MMU select ARM_NVIC select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select CPU_V7M select GENERIC_CLOCKEVENTS @@ -541,7 +541,7 @@ config ARCH_PXA select CLKDEV_LOOKUP select CLKSRC_PXA select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select CPU_XSCALE if !CPU_XSC3 select GENERIC_CLOCKEVENTS select GPIO_PXA @@ -580,7 +580,7 @@ config ARCH_SA1100 select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_PXA - select CLKSRC_OF if OF + select TIMER_OF if OF select CPU_FREQ select CPU_SA1100 select GENERIC_CLOCKEVENTS @@ -1386,7 +1386,7 @@ config HAVE_ARM_ARCH_TIMER config HAVE_ARM_TWD bool - select CLKSRC_OF if OF + select TIMER_OF if OF help This options enables support for the ARM timer and watchdog unit diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index a0e66d8..d6e291b8 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -150,7 +150,7 @@ config ARCH_BCM2835 select ARM_ERRATA_411920 if ARCH_MULTI_V6 select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 - select CLKSRC_OF + select TIMER_OF select BCM2835_TIMER select PINCTRL select PINCTRL_BCM2835 diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 61284b9..f385b1f 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -2,7 +2,7 @@ menuconfig ARCH_CLPS711X bool "Cirrus Logic EP721x/EP731x-based" depends on ARCH_MULTI_V4T select AUTO_ZRELADDR - select CLKSRC_OF + select TIMER_OF select CLPS711X_TIMER select COMMON_CLK select CPU_ARM720T diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c index fb9a73a..4a4d2e2 100644 --- a/arch/arm/mach-imx/epit.c +++ b/arch/arm/mach-imx/epit.c @@ -39,7 +39,7 @@ #define EPITCR_OM_TOGGLE (1 << 22) #define EPITCR_OM_CLEAR (2 << 22) #define EPITCR_OM_SET (3 << 22) -#define EPITCR_CLKSRC_OFF (0 << 24) +#define EPITCR_TIMER_OFF (0 << 24) #define EPITCR_CLKSRC_PERIPHERAL (1 << 24) #define EPITCR_CLKSRC_REF_HIGH (1 << 24) #define EPITCR_CLKSRC_REF_LOW (3 << 24) diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 4b1690a..f07da82 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -394,7 +394,7 @@ config MACH_SMDK2416 config MACH_S3C2416_DT bool "Samsung S3C2416 machine using devicetree" - select CLKSRC_OF + select TIMER_OF select USE_OF select PINCTRL select PINCTRL_S3C24XX diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 459214f..71a4934 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -336,7 +336,7 @@ config MACH_WLF_CRAGG_6410 config MACH_S3C64XX_DT bool "Samsung S3C6400/S3C6410 machine using Device Tree" - select CLKSRC_OF + select TIMER_OF select CPU_S3C6400 select CPU_S3C6410 select PINCTRL diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 129cc5a..611abc4 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -17,7 +17,7 @@ config ARCH_ALPINE config ARCH_BCM2835 bool "Broadcom BCM2835 family" - select CLKSRC_OF + select TIMER_OF select GPIOLIB select PINCTRL select PINCTRL_BCM2835 @@ -170,7 +170,7 @@ config ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select CLKDEV_LOOKUP select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select GENERIC_CLOCKEVENTS select GPIOLIB select PINCTRL diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 3ae8525..6e3d36f 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -15,7 +15,7 @@ config H8300 select OF_IRQ select OF_EARLY_FLATTREE select HAVE_MEMBLOCK - select CLKSRC_OF + select TIMER_OF select H8300_TMR8 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZO diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 85885a5..8e47121 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -4,7 +4,7 @@ config MICROBLAZE select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT - select CLKSRC_OF + select TIMER_OF select CLONE_BACKWARDS3 select COMMON_CLK select GENERIC_ATOMIC64 diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 9825dee..710b04c 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -4,7 +4,7 @@ config CLKEVT_RT3352 bool depends on SOC_RT305X || SOC_MT7620 default y - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO config RALINK_ILL_ACC diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 51a56c8..863f388 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -1,6 +1,6 @@ config NIOS2 def_bool y - select CLKSRC_OF + select TIMER_OF select GENERIC_ATOMIC64 select GENERIC_CLOCKEVENTS select GENERIC_CPU_DEVICES diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 4e21949..3554fca 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -10,7 +10,7 @@ config SH_DEVICE_TREE bool "Board Described by Device Tree" select OF select OF_EARLY_FLATTREE - select CLKSRC_OF + select TIMER_OF select COMMON_CLK select GENERIC_CALIBRATE_DELAY help diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 623fcc6..90f062e 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -1,15 +1,15 @@ menu "Clock Source drivers" depends on !ARCH_USES_GETTIMEOFFSET -config CLKSRC_OF +config TIMER_OF bool - select CLKSRC_PROBE + select TIMER_PROBE config CLKSRC_ACPI bool - select CLKSRC_PROBE + select TIMER_PROBE -config CLKSRC_PROBE +config TIMER_PROBE bool config CLKSRC_I8253 @@ -58,14 +58,14 @@ config DW_APB_TIMER config DW_APB_TIMER_OF bool select DW_APB_TIMER - select CLKSRC_OF + select TIMER_OF config FTTMR010_TIMER bool "Faraday Technology timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS depends on HAS_IOMEM select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF select MFD_SYSCON help Enables support for the Faraday Technology timer block @@ -74,7 +74,7 @@ config FTTMR010_TIMER config ROCKCHIP_TIMER bool "Rockchip timer driver" if COMPILE_TEST depends on ARM || ARM64 - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the rockchip timer driver. @@ -82,7 +82,7 @@ config ROCKCHIP_TIMER config ARMADA_370_XP_TIMER bool "Armada 370 and XP timer driver" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the Armada 370 and XP timer driver. @@ -97,7 +97,7 @@ config MESON6_TIMER config ORION_TIMER bool "Orion timer driver" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Enables the support for the Orion timer driver @@ -141,7 +141,7 @@ config ASM9260_TIMER bool "ASM9260 timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF help Enables support for the ASM9260 timer. @@ -247,21 +247,21 @@ config CLKSRC_LPC32XX depends on GENERIC_CLOCKEVENTS && HAS_IOMEM depends on ARM select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF help Support for the LPC32XX clocksource. config CLKSRC_PISTACHIO bool "Clocksource for Pistachio SoC" if COMPILE_TEST depends on HAS_IOMEM - select CLKSRC_OF + select TIMER_OF help Enables the clocksource for the Pistachio SoC. config CLKSRC_TI_32K bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK - select CLKSRC_OF if OF + select TIMER_OF if OF help This option enables support for Texas Instruments 32.768 Hz clocksource available on many OMAP-like platforms. @@ -270,7 +270,7 @@ config CLKSRC_NPS bool "NPS400 clocksource driver" if COMPILE_TEST depends on !PHYS_ADDR_T_64BIT select CLKSRC_MMIO - select CLKSRC_OF if OF + select TIMER_OF if OF help NPS400 clocksource support. Got 64 bit counter with update rate up to 1000MHz. @@ -285,12 +285,12 @@ config CLKSRC_MPS2 bool "Clocksource for MPS2 SoCs" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK select CLKSRC_MMIO - select CLKSRC_OF + select TIMER_OF config ARC_TIMERS bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF help These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores (ARC700 as well as ARC HS38). @@ -300,7 +300,7 @@ config ARC_TIMERS_64BIT bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS depends on ARC_TIMERS - select CLKSRC_OF + select TIMER_OF help This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP) RTC is implemented inside the core, while GFRC sits outside the core in @@ -309,7 +309,7 @@ config ARC_TIMERS_64BIT config ARM_ARCH_TIMER bool - select CLKSRC_OF if OF + select TIMER_OF if OF select CLKSRC_ACPI if ACPI config ARM_ARCH_TIMER_EVTSTREAM @@ -367,7 +367,7 @@ config ARM64_ERRATUM_858921 config ARM_GLOBAL_TIMER bool "Support for the ARM global timer" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF depends on ARM help This options enables support for the ARM global timer unit @@ -376,7 +376,7 @@ config ARM_TIMER_SP804 bool "Support for Dual Timer SP804 module" depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP select CLKSRC_MMIO - select CLKSRC_OF if OF + select TIMER_OF if OF config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK bool @@ -387,19 +387,19 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK config ARMV7M_SYSTICK bool "Support for the ARMv7M system time" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF select CLKSRC_MMIO help This options enables support for the ARMv7M system timer unit config ATMEL_PIT - select CLKSRC_OF if OF + select TIMER_OF if OF def_bool SOC_AT91SAM9 || SOC_SAMA5 config ATMEL_ST bool "Atmel ST timer support" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF select MFD_SYSCON help Support for the Atmel ST timer. @@ -442,7 +442,7 @@ config VF_PIT_TIMER config OXNAS_RPS_TIMER bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help This enables support for the Oxford Semiconductor OXNAS RPS timers. @@ -453,7 +453,7 @@ config SYS_SUPPORTS_SH_CMT config MTK_TIMER bool "Mediatek timer driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS && HAS_IOMEM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help Support for Mediatek timer driver. @@ -526,7 +526,7 @@ config EM_TIMER_STI config CLKSRC_QCOM bool "Qualcomm MSM timer" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF help This enables the clocksource and the per CPU clockevent driver for the Qualcomm SoCs. @@ -534,7 +534,7 @@ config CLKSRC_QCOM config CLKSRC_VERSATILE bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET - select CLKSRC_OF + select TIMER_OF default y if MFD_VEXPRESS_SYSREG help This option enables clock source based on free running @@ -545,12 +545,12 @@ config CLKSRC_VERSATILE config CLKSRC_MIPS_GIC bool depends on MIPS_GIC - select CLKSRC_OF + select TIMER_OF config CLKSRC_TANGO_XTAL bool "Clocksource for Tango SoC" if COMPILE_TEST depends on ARM - select CLKSRC_OF + select TIMER_OF select CLKSRC_MMIO help This enables the clocksource for Tango SoC @@ -591,7 +591,7 @@ config CLKSRC_IMX_GPT config CLKSRC_ST_LPC bool "Low power clocksource found in the LPC" if COMPILE_TEST - select CLKSRC_OF if OF + select TIMER_OF if OF depends on HAS_IOMEM select CLKSRC_MMIO help diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index cad713c..ec55921 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o +obj-$(CONFIG_TIMER_PROBE) += timer-probe.o obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c deleted file mode 100644 index da81e5d..0000000 --- a/drivers/clocksource/clksrc-probe.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -extern struct of_device_id __timer_of_table[]; - -static const struct of_device_id __timer_of_table_sentinel - __used __section(__timer_of_table_end); - -void __init timer_probe(void) -{ - struct device_node *np; - const struct of_device_id *match; - of_init_fn_1_ret init_func_ret; - unsigned timers = 0; - int ret; - - for_each_matching_node_and_match(np, __timer_of_table, &match) { - if (!of_device_is_available(np)) - continue; - - init_func_ret = match->data; - - ret = init_func_ret(np); - if (ret) { - pr_err("Failed to initialize '%s': %d\n", - of_node_full_name(np), ret); - continue; - } - - timers++; - } - - timers += acpi_probe_device_table(timer); - - if (!timers) - pr_crit("%s: no matching timers found\n", __func__); -} diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c index fc9e025..a8dd805 100644 --- a/drivers/clocksource/clps711x-timer.c +++ b/drivers/clocksource/clps711x-timer.c @@ -103,7 +103,7 @@ void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base, BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq)); } -#ifdef CONFIG_CLKSRC_OF +#ifdef CONFIG_TIMER_OF static int __init clps711x_timer_init(struct device_node *np) { unsigned int irq = irq_of_parse_and_map(np, 0); diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 21cd72c..6d5d126 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -418,7 +418,7 @@ void __init samsung_pwm_clocksource_init(void __iomem *base, _samsung_pwm_clocksource_init(); } -#ifdef CONFIG_CLKSRC_OF +#ifdef CONFIG_TIMER_OF static int __init samsung_pwm_alloc(struct device_node *np, const struct samsung_pwm_variant *variant) { diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c new file mode 100644 index 0000000..da81e5d --- /dev/null +++ b/drivers/clocksource/timer-probe.c @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include + +extern struct of_device_id __timer_of_table[]; + +static const struct of_device_id __timer_of_table_sentinel + __used __section(__timer_of_table_end); + +void __init timer_probe(void) +{ + struct device_node *np; + const struct of_device_id *match; + of_init_fn_1_ret init_func_ret; + unsigned timers = 0; + int ret; + + for_each_matching_node_and_match(np, __timer_of_table, &match) { + if (!of_device_is_available(np)) + continue; + + init_func_ret = match->data; + + ret = init_func_ret(np); + if (ret) { + pr_err("Failed to initialize '%s': %d\n", + of_node_full_name(np), ret); + continue; + } + + timers++; + } + + timers += acpi_probe_device_table(timer); + + if (!timers) + pr_crit("%s: no matching timers found\n", __func__); +} diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ca922ae..79d5443 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -172,7 +172,7 @@ KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table_end)) -#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer) +#define TIMER_OF_TABLES() OF_TABLE(CONFIG_TIMER_OF, timer) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 7cd38b2..c48ceef 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -252,7 +252,7 @@ extern int clocksource_i8253_init(void); #define TIMER_OF_DECLARE(name, compat, fn) \ OF_DECLARE_1_RET(timer, name, compat, fn) -#ifdef CONFIG_CLKSRC_PROBE +#ifdef CONFIG_TIMER_PROBE extern void timer_probe(void); #else static inline void timer_probe(void) {} From patchwork Sat May 27 09:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 100599 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp622356qge; Sat, 27 May 2017 03:00:30 -0700 (PDT) X-Received: by 10.84.194.34 with SMTP id g31mr25920234pld.89.1495879230625; Sat, 27 May 2017 03:00:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495879230; cv=none; d=google.com; s=arc-20160816; b=x3yBZWHsYt25drF1yizmvvzxiLNGhd81H6yKAQflI4f0ULTMfpc6lkApGjNP+g/l/w BDhEPh8B4zpQEeP/rmRBA8kPGQulNQlPHCOF+wROuGiCIa2tbcOwIQ4RAUJweeazTHp0 V2CgMC7h42F8mG7nWV9hGFE+zreA3nnztBQZ6QzkhuFxB6EYHHt8Tb0bCPYO2cFhKPCX rxd9QO78esP/BeHzlS13eN5X6q4pdXjo3W7ef9q16NAkPkEtz3zlJoogcudTKkJqQYXF q3IZd+6b3+hh14P3Jou8HRHB1Sl7YeK59yoRbp+PU8JqZhA3lVvckzZBqbXjnwc8vUum 72lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=aCrHOA0E1DRU5JcCe6aI2yANnW2s7O0RC6OyOOc6QDKXLChRQuK7nitGDookxYf0QK kJ6D2yQOpz/Y1J6YczPUkD28ubTdc22AKXiKROvtfAyNKbas1wHLq1oDoFxwLWwrxYnv pQL/l0yuUC3S3ae14GUanHtpE/0Wg1/p0Pvx7DB2h+V6lp8AcATWDntdG8BNxV0u/QR4 IcY33a191GqH5mLIAVuTe5wyXZdViEY6pxi6/MTSJ7cooy8misWLsmXPzQuuBumTCS3E 9wiBxMn8X7c+c25+mwImRx7Z8HjUHSwUZD7U8Ks6NFO6NnEyeoMxMSpe4fpkm0PU8RxA PB2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z31si5578593plb.186.2017.05.27.03.00.30; Sat, 27 May 2017 03:00:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755311AbdE0J7w (ORCPT + 25 others); Sat, 27 May 2017 05:59:52 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:36700 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755277AbdE0J7s (ORCPT ); Sat, 27 May 2017 05:59:48 -0400 Received: by mail-wr0-f171.google.com with SMTP id l50so12780186wrc.3 for ; Sat, 27 May 2017 02:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=ML+FBgDnf+B4D/cz99ST8Sh5aNf33nWJQSn2OdFKisrS8HStq2tMMXYjmfd6lIAOe8 i6uI3mxqiM0hW877cI59g4OB2PVYssRcfeOokeYqsTJGFwI2wxuDgRFCaFyCu9MUziId pljaq1I1sojQwfY08wq1vTs1B03mLEX0Uhuu8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=ijhqZNwyWmt/miwuHCffqUZ+2RIlguXZjGFGUuArucbzDnlP4F0o6fQVhjIIETP/ep FmYPsvCQD0rJtZhERuiN//r6SrSovVBYvC0MQOhTQqSKjzEagw7s3iKNCNp1GVFJEFHT SV2iGOsWxSA3IhndPpkcusRkg22w/obnEGqVk1RP89rW4wOcg5+C9xuebGfD/4KSqHwf AWLDI/HIdhxLCbaRj/spNCBl4+wrlEYA/7rqAkyWktKIErobAjHlS2iCAuWBrv+p57yj fbWFhx/svcf4jvxOEn9gA/YNdK/7yBepxnihBBDmNSP/HwgCTBm2nEWPliwvXlXzOEKQ D3dQ== X-Gm-Message-State: AODbwcB2slnvYfYhCGxyLefLPlgtn+I3FlptWMSp1QGJYD9tn6P9rZDG dnUTf0g70Xe6+42D X-Received: by 10.223.135.50 with SMTP id a47mr4424649wra.138.1495879187587; Sat, 27 May 2017 02:59:47 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:47 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Date: Sat, 27 May 2017 11:58:48 +0200 Message-Id: <1495879129-28109-7-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The config option name is now renamed to 'CLKSRC_ACPI' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano --- drivers/clocksource/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 Reviewed-by: Linus Walleij diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 90f062e..4ba230d 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -5,7 +5,7 @@ config TIMER_OF bool select TIMER_PROBE -config CLKSRC_ACPI +config TIMER_ACPI bool select TIMER_PROBE @@ -310,7 +310,7 @@ config ARC_TIMERS_64BIT config ARM_ARCH_TIMER bool select TIMER_OF if OF - select CLKSRC_ACPI if ACPI + select TIMER_ACPI if ACPI config ARM_ARCH_TIMER_EVTSTREAM bool "Enable ARM architected timer event stream generation by default"