summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-08-30 09:33:30 -0700
committerRalf Baechle <ralf@linux-mips.org>2017-09-01 22:34:46 +0200
commit60702867008172c5bd7b5aa82964123e252c2612 (patch)
tree393b29dcb01a79001bc927f7de3fe5da7710ac90
parente07127a077c781797f3dc7a873c3815e2a0e6e89 (diff)
downloadop-kernel-dev-60702867008172c5bd7b5aa82964123e252c2612.zip
op-kernel-dev-60702867008172c5bd7b5aa82964123e252c2612.tar.gz
MIPS: Malta: Use new GIC accessor functions
Use the accessor functions provided by asm/mips-gic.h rather than calling functions provided by the GIC irqchip driver, in preparation for those non-IRQ-related functions being removed from the irqchip driver. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/mti-malta/malta-time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index cea4ec9..f057746 100644
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -86,7 +86,7 @@ static void __init estimate_frequencies(void)
local_irq_save(flags);
if (gic_present)
- gic_start_count();
+ clear_gic_config(GIC_CONFIG_COUNTSTOP);
/*
* Read counters exactly on rising edge of update flag.
@@ -96,7 +96,7 @@ static void __init estimate_frequencies(void)
while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));
start = read_c0_count();
if (gic_present)
- gicstart = gic_read_count();
+ gicstart = read_gic_counter();
/* Wait for falling edge before reading RTC. */
while (CMOS_READ(RTC_REG_A) & RTC_UIP);
@@ -106,7 +106,7 @@ static void __init estimate_frequencies(void)
while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));
count = read_c0_count();
if (gic_present)
- giccount = gic_read_count();
+ giccount = read_gic_counter();
/* Wait for falling edge before reading RTC again. */
while (CMOS_READ(RTC_REG_A) & RTC_UIP);
OpenPOWER on IntegriCloud