Browse Source

clocksource: arm_arch_timer: add a new enum for spi type

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>
Fu Wei 8 years ago
parent
commit
097cd143dd
2 changed files with 8 additions and 2 deletions
  1. 2 2
      drivers/clocksource/arm_arch_timer.c
  2. 6 0
      include/clocksource/arm_arch_timer.h

+ 2 - 2
drivers/clocksource/arm_arch_timer.c

@@ -1258,9 +1258,9 @@ static int __init arch_timer_mem_init(struct device_node *np)
 	}
 	}
 
 
 	if (arch_timer_mem_use_virtual)
 	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
 	else
-		irq = irq_of_parse_and_map(best_frame, 0);
+		irq = irq_of_parse_and_map(best_frame, ARCH_TIMER_PHYS_SPI);
 
 
 	ret = -EINVAL;
 	ret = -EINVAL;
 	if (!irq) {
 	if (!irq) {

+ 6 - 0
include/clocksource/arm_arch_timer.h

@@ -46,6 +46,12 @@ enum arch_timer_ppi_nr {
 	ARCH_TIMER_MAX_TIMER_PPI
 	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_PHYS_ACCESS		0
 #define ARCH_TIMER_VIRT_ACCESS		1
 #define ARCH_TIMER_VIRT_ACCESS		1
 #define ARCH_TIMER_MEM_PHYS_ACCESS	2
 #define ARCH_TIMER_MEM_PHYS_ACCESS	2