arch: m68k: Use existing CONFIG_MCFTMR instead of CFG_MCFTMR

[platform/kernel/u-boot.git] / arch / m68k / cpu / mcf523x / interrupts.c

diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c
index b8ee527..09c7f9e 100644 (file)
--- a/arch/m68k/cpu/mcf523x/interrupts.c
+++ b/arch/m68k/cpu/mcf523x/interrupts.c
@@ -1,19 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /* CPU specific interrupt routine */
 #include <common.h>
+#include <irq_func.h>
 #include <asm/immap.h>
 #include <asm/io.h>
 
 int interrupt_init(void)
 {
-       int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+       int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
        /* Make sure all interrupts are disabled */
        setbits_be32(&intp->imrl0, 0x1);
@@ -22,13 +22,13 @@ int interrupt_init(void)
        return 0;
 }
 
-#if defined(CONFIG_MCFTMR)
+#if CONFIG_IS_ENABLED(MCFTMR)
 void dtimer_intr_setup(void)
 {
-       int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
+       int0_t *intp = (int0_t *) (CFG_SYS_INTR_BASE);
 
-       out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
+       out_8(&intp->icr0[CFG_SYS_TMRINTR_NO], CFG_SYS_TMRINTR_PRI);
        clrbits_be32(&intp->imrl0, INTC_IPRL_INT0);
-       clrbits_be32(&intp->imrl0, CONFIG_SYS_TMRINTR_MASK);
+       clrbits_be32(&intp->imrl0, CFG_SYS_TMRINTR_MASK);
 }
 #endif