From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: <tglx@linutronix.de>, <linux-kernel@vger.kernel.org>,
<linux-snps-arc@lists.infradead.org>,
Noam Camus <noamca@mellanox.com>, <Alexey.Brodkin@synopsys.com>,
Vineet Gupta <Vineet.Gupta1@synopsys.com>
Subject: [PATCH 8/9] ARC: timer: rename config options
Date: Mon, 31 Oct 2016 15:48:15 -0700 [thread overview]
Message-ID: <1477954096-770-9-git-send-email-vgupta@synopsys.com> (raw)
In-Reply-To: <1477954096-770-1-git-send-email-vgupta@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---
arch/arc/Kconfig | 4 ++--
arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +-
arch/arc/configs/vdk_hs38_smp_defconfig | 2 +-
arch/arc/kernel/setup.c | 4 ++--
arch/arc/kernel/time.c | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index bd204bfa29ed..b4499f97035a 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -410,12 +410,12 @@ config ARC_HAS_DIV_REM
bool "Insn: div, divu, rem, remu"
default y
-config ARC_HAS_RTC
+config ARC_TIMER_RTC
bool "Local 64-bit r/o cycle counter"
default n
depends on !SMP
-config ARC_HAS_GFRC
+config ARC_TIMER_GFRC
bool "SMP synchronized 64-bit cycle counter"
default y
depends on SMP
diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig
index 6da71ba253a9..9782fe512244 100644
--- a/arch/arc/configs/nsimosci_hs_smp_defconfig
+++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
@@ -21,7 +21,7 @@ CONFIG_MODULES=y
CONFIG_ARC_PLAT_SIM=y
CONFIG_ISA_ARCV2=y
CONFIG_SMP=y
-# CONFIG_ARC_HAS_GFRC is not set
+# CONFIG_ARC_TIMER_GFRC is not set
CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci_hs_idu"
CONFIG_PREEMPT=y
# CONFIG_COMPACTION is not set
diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
index 969b206d6c67..a927389d02d8 100644
--- a/arch/arc/configs/vdk_hs38_smp_defconfig
+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
@@ -15,7 +15,7 @@ CONFIG_ARC_PLAT_AXS10X=y
CONFIG_AXS103=y
CONFIG_ISA_ARCV2=y
CONFIG_SMP=y
-# CONFIG_ARC_HAS_GFRC is not set
+# CONFIG_ARC_TIMER_GFRC is not set
CONFIG_ARC_UBOOT_SUPPORT=y
CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp"
CONFIG_PREEMPT=y
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 5865bd34a7fa..4855335b956b 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -239,8 +239,8 @@ static char *arc_cpu_mumbojumbo(int cpu_id, char *buf, int len)
n += scnprintf(buf + n, len - n, "Timers\t\t: %s%s%s%s%s%s\nISA Extn\t: ",
IS_AVAIL1(cpu->extn.timer0, "Timer0 "),
IS_AVAIL1(cpu->extn.timer1, "Timer1 "),
- IS_AVAIL2(cpu->extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_HAS_RTC),
- IS_AVAIL2(cpu->extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_HAS_GFRC));
+ IS_AVAIL2(cpu->extn.rtc, "RTC [UP 64-bit] ", CONFIG_ARC_TIMER_RTC),
+ IS_AVAIL2(cpu->extn.gfrc, "GFRC [SMP 64-bit] ", CONFIG_ARC_TIMER_GFRC));
n += i = scnprintf(buf + n, len - n, "%s%s%s%s%s",
IS_AVAIL2(cpu->isa.atomic, "atomic ", CONFIG_ARC_HAS_LLSC),
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index dad3a9933c4c..676b14b7a9be 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -81,7 +81,7 @@ static int noinline arc_get_timer_clk(struct device_node *node)
/********** Clock Source Device *********/
-#ifdef CONFIG_ARC_HAS_GFRC
+#ifdef CONFIG_ARC_TIMER_GFRC
static cycle_t arc_read_gfrc(struct clocksource *cs)
{
@@ -135,7 +135,7 @@ CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc);
#endif
-#ifdef CONFIG_ARC_HAS_RTC
+#ifdef CONFIG_ARC_TIMER_RTC
#define AUX_RTC_CTRL 0x103
#define AUX_RTC_LOW 0x104
--
2.7.4
next prev parent reply other threads:[~2016-10-31 22:49 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-23 12:12 [PATCH v2 0/3] Add clockevet for timer-nps driver to NPS400 SoC Noam Camus
2016-10-23 12:12 ` [PATCH v2 1/3] soc: Support for NPS HW scheduling Noam Camus
2016-10-31 10:26 ` Daniel Lezcano
2016-10-31 12:26 ` Noam Camus
2016-10-23 12:12 ` [PATCH v2 2/3] clocksource: update "fn" at CLOCKSOURCE_OF_DECLARE() of nps400 timer Noam Camus
2016-10-31 10:28 ` Daniel Lezcano
2016-10-31 15:19 ` Noam Camus
2016-10-23 12:12 ` [PATCH v2 3/3] clocksource: Add clockevent support to NPS400 driver Noam Camus
2016-10-30 20:41 ` Rob Herring
2016-10-31 10:52 ` Daniel Lezcano
2016-10-31 17:03 ` Noam Camus
2016-10-31 17:51 ` Vineet Gupta
2016-10-31 22:48 ` [PATCH 0/9] Move ARC timer code into drivers/clocksource/ Vineet Gupta
2016-10-31 22:48 ` [PATCH 1/9] ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists Vineet Gupta
2016-11-03 17:00 ` Daniel Lezcano
2016-11-03 17:41 ` Vineet Gupta
2016-10-31 22:48 ` [PATCH 2/9] ARC: timer: rtc: implement read loop in "C" vs. inline asm Vineet Gupta
2016-11-03 17:02 ` Daniel Lezcano
2016-11-03 17:45 ` Vineet Gupta
2016-10-31 22:48 ` [PATCH 3/9] ARC: timer: gfrc: boot print alongside other timers Vineet Gupta
2016-11-03 17:09 ` Daniel Lezcano
2016-11-03 17:47 ` Vineet Gupta
2016-11-03 17:51 ` Daniel Lezcano
2016-10-31 22:48 ` [PATCH 4/9] ARC: time: move time_init() out of the driver Vineet Gupta
2016-11-03 17:15 ` Daniel Lezcano
2016-10-31 22:48 ` [PATCH 5/9] ARC: breakout aux handling into a seperate header Vineet Gupta
2016-11-01 7:49 ` Noam Camus
2016-10-31 22:48 ` [PATCH 6/9] ARC: move mcip.h into include/soc and adjust the includes Vineet Gupta
2016-11-03 17:20 ` Daniel Lezcano
2016-10-31 22:48 ` [PATCH 7/9] ARC: breakout timer stuff into a seperate header Vineet Gupta
2016-11-03 17:25 ` Daniel Lezcano
2016-10-31 22:48 ` Vineet Gupta [this message]
2016-10-31 22:48 ` [PATCH 9/9] clocksource: import ARC timer driver Vineet Gupta
2016-11-01 0:01 ` kbuild test robot
2016-11-01 0:45 ` Vineet Gupta
2016-11-01 20:42 ` Daniel Lezcano
2016-11-01 20:57 ` Vineet Gupta
2016-11-02 0:19 ` Daniel Lezcano
2016-11-02 1:03 ` Vineet Gupta
2016-11-03 16:40 ` Vineet Gupta
2016-11-03 16:50 ` Daniel Lezcano
2016-11-03 17:57 ` Vineet Gupta
2016-11-03 18:11 ` Daniel Lezcano
2016-11-03 18:43 ` Vineet Gupta
2016-11-03 17:33 ` Daniel Lezcano
2016-11-03 18:14 ` Daniel Lezcano
2016-11-03 18:47 ` Vineet Gupta
2016-11-03 17:28 ` [PATCH 0/9] Move ARC timer code into drivers/clocksource/ Daniel Lezcano
2016-11-01 20:01 ` [PATCH v2 3/3] clocksource: Add clockevent support to NPS400 driver Daniel Lezcano
2016-11-08 8:30 ` Noam Camus
2016-11-10 10:34 ` Daniel Lezcano
2016-11-10 13:00 ` Noam Camus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477954096-770-9-git-send-email-vgupta@synopsys.com \
--to=vineet.gupta1@synopsys.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=noamca@mellanox.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).