Message ID | 1475086637-1914-3-git-send-email-fu.wei@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Sep 29, 2016 at 02:17:10AM +0800, fu.wei@linaro.org wrote: > diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h > index 6f06481..16dcd10 100644 > --- a/include/clocksource/arm_arch_timer.h > +++ b/include/clocksource/arm_arch_timer.h > @@ -45,6 +45,12 @@ enum ppi_nr { > MAX_TIMER_PPI > }; > > +enum spi_nr { > + PHYS_SPI, > + VIRT_SPI, > + MAX_TIMER_SPI > +}; Please rename this to arch_timer_spi_nr (as with patch 1 for s/ppi_nr/arch_timer_ppi_nr/). With that: Acked-by: Mark Rutland <mark.rutland@arm.com> Thanks, Mark.
Hi Mark, On 20 October 2016 at 23:09, Mark Rutland <mark.rutland@arm.com> wrote: > On Thu, Sep 29, 2016 at 02:17:10AM +0800, fu.wei@linaro.org wrote: >> diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h >> index 6f06481..16dcd10 100644 >> --- a/include/clocksource/arm_arch_timer.h >> +++ b/include/clocksource/arm_arch_timer.h >> @@ -45,6 +45,12 @@ enum ppi_nr { >> MAX_TIMER_PPI >> }; >> >> +enum spi_nr { >> + PHYS_SPI, >> + VIRT_SPI, >> + MAX_TIMER_SPI >> +}; > > Please rename this to arch_timer_spi_nr (as with patch 1 for > s/ppi_nr/arch_timer_ppi_nr/). With that: > > Acked-by: Mark Rutland <mark.rutland@arm.com> OK, NP, done :-) Great thanks! > > Thanks, > Mark.
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index aea6c10..059f7fb 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -861,9 +861,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, VIRT_SPI); else - irq = irq_of_parse_and_map(best_frame, 0); + irq = irq_of_parse_and_map(best_frame, PHYS_SPI); ret = -EINVAL; if (!irq) { diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 6f06481..16dcd10 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -45,6 +45,12 @@ enum ppi_nr { MAX_TIMER_PPI }; +enum spi_nr { + PHYS_SPI, + VIRT_SPI, + MAX_TIMER_SPI +}; + #define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2