All of lore.kernel.org
 help / color / mirror / Atom feed
From: fu.wei@linaro.org
To: rjw@rjwysocki.net, lenb@kernel.org, daniel.lezcano@linaro.org,
	tglx@linutronix.de, marc.zyngier@arm.com, mark.rutland@arm.com,
	lorenzo.pieralisi@arm.com, sudeep.holla@arm.com,
	hanjun.guo@linaro.org
Cc: linux-arm-kernel@lists.infradead.org,
	linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org,
	linux-acpi@vger.kernel.org, rruigrok@codeaurora.org,
	harba@codeaurora.org, cov@codeaurora.org, timur@codeaurora.org,
	graeme.gregory@linaro.org, al.stone@linaro.org, jcm@redhat.com,
	wei@redhat.com, arnd@arndb.de, catalin.marinas@arm.com,
	will.deacon@arm.com, Suravee.Suthikulpanit@amd.com,
	leo.duran@amd.com, wim@iguana.be, linux@roeck-us.net,
	linux-watchdog@vger.kernel.org, tn@semihalf.com,
	christoffer.dall@linaro.org, julien.grall@arm.com,
	Fu Wei <fu.wei@linaro.org>
Subject: [PATCH v16 02/15] clocksource/drivers/arm_arch_timer: Add a new enum for spi type
Date: Wed, 16 Nov 2016 21:48:55 +0800	[thread overview]
Message-ID: <1479304148-2965-3-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1479304148-2965-1-git-send-email-fu.wei@linaro.org>

From: Fu Wei <fu.wei@linaro.org>

This patch add a new enum "arch_timer_spi_nr" and use it in the driver.
Just for code's readability, no functional change.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
---
 drivers/clocksource/arm_arch_timer.c | 4 ++--
 include/clocksource/arm_arch_timer.h | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 21068be..63bb532 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -960,9 +960,9 @@ static int __init arch_timer_mem_init(struct device_node *np)
 	}
 
 	if (arch_timer_mem_use_virtual)
-		irq = irq_of_parse_and_map(best_frame, 1);
+		irq = irq_of_parse_and_map(best_frame, ARCH_TIMER_VIRT_SPI);
 	else
-		irq = irq_of_parse_and_map(best_frame, 0);
+		irq = irq_of_parse_and_map(best_frame, ARCH_TIMER_PHYS_SPI);
 
 	ret = -EINVAL;
 	if (!irq) {
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 557f869..d23c381 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -46,6 +46,12 @@ enum arch_timer_ppi_nr {
 	MAX_TIMER_PPI
 };
 
+enum arch_timer_spi_nr {
+	ARCH_TIMER_PHYS_SPI,
+	ARCH_TIMER_VIRT_SPI,
+	ARCH_TIMER_MAX_TIMER_SPI
+};
+
 #define ARCH_TIMER_PHYS_ACCESS		0
 #define ARCH_TIMER_VIRT_ACCESS		1
 #define ARCH_TIMER_MEM_PHYS_ACCESS	2
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: fu.wei@linaro.org (fu.wei at linaro.org)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v16 02/15] clocksource/drivers/arm_arch_timer: Add a new enum for spi type
Date: Wed, 16 Nov 2016 21:48:55 +0800	[thread overview]
Message-ID: <1479304148-2965-3-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1479304148-2965-1-git-send-email-fu.wei@linaro.org>

From: Fu Wei <fu.wei@linaro.org>

This patch add a new enum "arch_timer_spi_nr" and use it in the driver.
Just for code's readability, no functional change.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
---
 drivers/clocksource/arm_arch_timer.c | 4 ++--
 include/clocksource/arm_arch_timer.h | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 21068be..63bb532 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -960,9 +960,9 @@ static int __init arch_timer_mem_init(struct device_node *np)
 	}
 
 	if (arch_timer_mem_use_virtual)
-		irq = irq_of_parse_and_map(best_frame, 1);
+		irq = irq_of_parse_and_map(best_frame, ARCH_TIMER_VIRT_SPI);
 	else
-		irq = irq_of_parse_and_map(best_frame, 0);
+		irq = irq_of_parse_and_map(best_frame, ARCH_TIMER_PHYS_SPI);
 
 	ret = -EINVAL;
 	if (!irq) {
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 557f869..d23c381 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -46,6 +46,12 @@ enum arch_timer_ppi_nr {
 	MAX_TIMER_PPI
 };
 
+enum arch_timer_spi_nr {
+	ARCH_TIMER_PHYS_SPI,
+	ARCH_TIMER_VIRT_SPI,
+	ARCH_TIMER_MAX_TIMER_SPI
+};
+
 #define ARCH_TIMER_PHYS_ACCESS		0
 #define ARCH_TIMER_VIRT_ACCESS		1
 #define ARCH_TIMER_MEM_PHYS_ACCESS	2
-- 
2.7.4

  parent reply	other threads:[~2016-11-16 13:48 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-16 13:48 [PATCH v16 00/15] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei
2016-11-16 13:48 ` fu.wei at linaro.org
2016-11-16 13:48 ` [PATCH v16 01/15] clocksource/drivers/arm_arch_timer: Move enums and defines to header file fu.wei
2016-11-16 13:48   ` fu.wei at linaro.org
2016-11-16 13:48 ` fu.wei [this message]
2016-11-16 13:48   ` [PATCH v16 02/15] clocksource/drivers/arm_arch_timer: Add a new enum for spi type fu.wei at linaro.org
2016-11-16 13:48 ` [PATCH v16 03/15] clocksource/drivers/arm_arch_timer: Improve printk relevant code fu.wei
2016-11-16 13:48   ` fu.wei at linaro.org
2016-11-16 13:48 ` [PATCH v16 04/15] clocksource/drivers/arm_arch_timer: rename some enums and defines, and some cleanups fu.wei
2016-11-16 13:48   ` fu.wei at linaro.org
2016-11-18 18:49   ` Mark Rutland
2016-11-18 18:49     ` Mark Rutland
2016-11-21  6:11     ` Fu Wei
2016-11-21  6:11       ` Fu Wei
2016-11-21  6:11       ` Fu Wei
2016-11-16 13:48 ` [PATCH v16 05/15] clocksource/drivers/arm_arch_timer: fix a bug in arch_timer_register about arch_timer_uses_ppi fu.wei
2016-11-16 13:48   ` fu.wei at linaro.org
2016-11-18 18:52   ` Mark Rutland
2016-11-18 18:52     ` Mark Rutland
2016-11-21  7:32     ` Fu Wei
2016-11-21  7:32       ` Fu Wei
2016-11-21  7:32       ` Fu Wei
2016-11-16 13:48 ` [PATCH v16 06/15] clocksource/drivers/arm_arch_timer: separate out arch_timer_uses_ppi init code to prepare for GTDT fu.wei
2016-11-16 13:48   ` fu.wei at linaro.org
     [not found]   ` <1479304148-2965-7-git-send-email-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-11-18 19:30     ` Mark Rutland
2016-11-18 19:30       ` Mark Rutland
2016-11-18 19:30       ` Mark Rutland
2016-11-21  9:45       ` Fu Wei
2016-11-21  9:45         ` Fu Wei
2016-11-21  9:45         ` Fu Wei
     [not found] ` <1479304148-2965-1-git-send-email-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-11-16 13:49   ` [PATCH v16 07/15] clocksource/drivers/arm_arch_timer: Refactor arch_timer_detect_rate to keep dt code in *_of_init fu.wei-QSEj5FYQhm4dnm+yROfE0A
2016-11-16 13:49     ` fu.wei at linaro.org
2016-11-16 13:49     ` fu.wei
2016-11-18 19:52     ` Mark Rutland
2016-11-18 19:52       ` Mark Rutland
2016-11-21 14:08       ` Fu Wei
2016-11-21 14:08         ` Fu Wei
2016-11-21 14:08         ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 08/15] clocksource/drivers/arm_arch_timer: Refactor arch_timer_needs_probing, and call it only if acpi disabled fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-18 19:56   ` Mark Rutland
2016-11-18 19:56     ` Mark Rutland
2016-11-21 14:38     ` Fu Wei
2016-11-21 14:38       ` Fu Wei
2016-11-21 14:38       ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 09/15] clocksource/drivers/arm_arch_timer: Introduce some new structs to prepare for GTDT fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-16 13:49 ` [PATCH v16 10/15] clocksource/drivers/arm_arch_timer: Refactor the timer init code " fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-18 20:03   ` Mark Rutland
2016-11-18 20:03     ` Mark Rutland
2016-11-23  6:10     ` Fu Wei
2016-11-23  6:10       ` Fu Wei
2016-11-23  6:10       ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 11/15] acpi/arm64: Add GTDT table parse driver fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-18 20:12   ` Mark Rutland
2016-11-18 20:12     ` Mark Rutland
2016-11-23 12:06     ` Fu Wei
2016-11-23 12:06       ` Fu Wei
2016-11-23 12:06       ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 12/15] clocksource/drivers/arm_arch_timer: Simplify ACPI support code fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-16 13:49 ` [PATCH v16 13/15] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-16 13:49   ` fu.wei
2016-11-18 14:22   ` Lorenzo Pieralisi
2016-11-18 14:22     ` Lorenzo Pieralisi
2016-11-18 14:22     ` Lorenzo Pieralisi
2016-11-23 11:53     ` Fu Wei
2016-11-23 11:53       ` Fu Wei
2016-11-23 11:53       ` Fu Wei
2016-11-24  3:57       ` Fu Wei
2016-11-24  3:57         ` Fu Wei
2016-11-24  3:57         ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 14/15] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-18 20:20   ` Mark Rutland
2016-11-18 20:20     ` Mark Rutland
2016-11-23 12:15     ` Fu Wei
2016-11-23 12:15       ` Fu Wei
2016-11-23 12:15       ` Fu Wei
2016-11-16 13:49 ` [PATCH v16 15/15] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei
2016-11-16 13:49   ` fu.wei at linaro.org
2016-11-16 13:49   ` fu.wei
2016-11-17  3:34 ` [PATCH v16 00/15] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer Xiongfeng Wang
2016-11-17  3:34   ` Xiongfeng Wang
2016-11-17  3:34   ` Xiongfeng Wang
2016-11-17  9:25   ` Xiongfeng Wang
2016-11-17  9:25     ` Xiongfeng Wang
2016-11-17  9:25     ` Xiongfeng Wang
2016-11-17 11:13     ` Fu Wei
2016-11-17 11:13       ` Fu Wei
2016-11-17 11:13       ` Fu Wei
2016-11-17  9:47 ` Daniel Lezcano
2016-11-17  9:47   ` Daniel Lezcano

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=1479304148-2965-3-git-send-email-fu.wei@linaro.org \
    --to=fu.wei@linaro.org \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=al.stone@linaro.org \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=christoffer.dall@linaro.org \
    --cc=cov@codeaurora.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=graeme.gregory@linaro.org \
    --cc=hanjun.guo@linaro.org \
    --cc=harba@codeaurora.org \
    --cc=jcm@redhat.com \
    --cc=julien.grall@arm.com \
    --cc=lenb@kernel.org \
    --cc=leo.duran@amd.com \
    --cc=linaro-acpi@lists.linaro.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=rjw@rjwysocki.net \
    --cc=rruigrok@codeaurora.org \
    --cc=sudeep.holla@arm.com \
    --cc=tglx@linutronix.de \
    --cc=timur@codeaurora.org \
    --cc=tn@semihalf.com \
    --cc=wei@redhat.com \
    --cc=will.deacon@arm.com \
    --cc=wim@iguana.be \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.