clocksource: arm_arch_timer: add a new enum for spi type

BugLink: http://bugs.launchpad.net/bugs/1688114
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>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
(cherry picked from commit 097cd143dd871bfceacf4ed252b177cf515a1888)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 0616b4cda066780914186cc2b6d548e1449df36e..976d7ea56854d7ff6e9fa5345e45dc6fdfbb3bda 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1267,9 +1267,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 b8986371159cb0110d9cca96a91a3b437627e428..4a98c060d80a89a6a9497617795de3b15b9205c4 100644 (file)
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -46,6 +46,12 @@ enum arch_timer_ppi_nr {
        ARCH_TIMER_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