From 36d21a7a5ba85e34de5dcb23d01b4dfaecc7b509 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 13 Aug 2019 19:14:50 -0600
Subject: [PATCH] Clean up a some missed re-naming in the last slash and burn
 s32k1xx commit.

---
 .../arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c |  4 ++--
 arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c | 14 +++++++-------
 .../arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
index 21e74374d2..bfec661ea0 100644
--- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
+++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c
@@ -131,7 +131,7 @@ void arm_timer_initialize(void)
 
   /* Attach the timer interrupt vector */
 
-  (void)irq_attach(SAM_IRQ_SYSTICK, (xcpt_t)s32k11x_timerisr, NULL);
+  (void)irq_attach(S32K1XX_IRQ_SYSTICK, (xcpt_t)s32k11x_timerisr, NULL);
 
   /* Enable SysTick interrupts */
 
@@ -139,5 +139,5 @@ void arm_timer_initialize(void)
 
   /* And enable the timer interrupt */
 
-  up_enable_irq(SAM_IRQ_SYSTICK);
+  up_enable_irq(S32K1XX_IRQ_SYSTICK);
 }
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
index 4984bebf5b..a4cc44e447 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c
@@ -55,11 +55,11 @@
  *
  * Description:
  *   Clear a pending interrupt at the NVIC.  This does not seem to be required
- *   for most interrupts.  Don't know why... but the LPC54xx Ethernet EMAC
+ *   for most interrupts.  Don't know why... but the S32K14x Ethernet EMAC
  *   interrupt definitely needs it!
  *
  *   This function is logically a part of s32k14x_irq.c, but I will keep it in
- *   a separate file so that it will not increase the footprint on LPC54xx
+ *   a separate file so that it will not increase the footprint on S32K14x
  *   platforms that do not need this function.
  *
  ****************************************************************************/
@@ -68,15 +68,15 @@ void s32k14x_clrpend(int irq)
 {
   /* Check for external interrupt */
 
-  if (irq >= LPC54_IRQ_EXTINT)
+  if (irq >= S32K1XX_IRQ_EXTINT)
     {
-      if (irq < (LPC54_IRQ_EXTINT + 32))
+      if (irq < (S32K1XX_IRQ_EXTINT + 32))
         {
-          putreg32(1 << (irq - LPC54_IRQ_EXTINT), NVIC_IRQ0_31_CLRPEND);
+          putreg32(1 << (irq - S32K1XX_IRQ_EXTINT), NVIC_IRQ0_31_CLRPEND);
         }
-      else if (irq < LPC54_IRQ_NIRQS)
+      else if (irq < S32K1XX_IRQ_NIRQS)
         {
-          putreg32(1 << (irq - LPC54_IRQ_EXTINT - 32), NVIC_IRQ32_63_CLRPEND);
+          putreg32(1 << (irq - S32K1XX_IRQ_EXTINT - 32), NVIC_IRQ32_63_CLRPEND);
         }
     }
 }
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
index 8035d3c3a9..c0a902e096 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/lpc54xx/lpc54_timerisr.c
+ * arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "hardware/lpc54_syscon.h"
+#include "hardware/s32k14x_syscon.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -94,7 +94,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Function:  lpc54_timerisr
+ * Function:  s32k14x_timerisr
  *
  * Description:
  *   The timer ISR will perform a variety of services for various portions
@@ -102,7 +102,7 @@
  *
  ****************************************************************************/
 
-static int lpc54_timerisr(int irq, uint32_t *regs, void *arg)
+static int s32k14x_timerisr(int irq, uint32_t *regs, void *arg)
 {
   /* Process timer interrupt */
 
@@ -136,11 +136,11 @@ void arm_timer_initialize(void)
 
   regval = (SYSCON_SYSTICKCLKDIV_DIV(BOARD_SYSTICKCLKDIV) |
             SYSCON_SYSTICKCLKDIV_REQFLAG);
-  putreg32(regval, LPC54_SYSCON_SYSTICKCLKDIV);
+  putreg32(regval, S32K1XX_SYSCON_SYSTICKCLKDIV);
 
   /* The request flag will be cleared when the divider change is complete */
 
-  while ((getreg32(LPC54_SYSCON_SYSTICKCLKDIV) & SYSCON_SYSTICKCLKDIV_REQFLAG) != 0)
+  while ((getreg32(S32K1XX_SYSCON_SYSTICKCLKDIV) & SYSCON_SYSTICKCLKDIV_REQFLAG) != 0)
     {
     }
 
@@ -160,7 +160,7 @@ void arm_timer_initialize(void)
 
   /* Attach the timer interrupt vector */
 
-  (void)irq_attach(LPC54_IRQ_SYSTICK, (xcpt_t)lpc54_timerisr, NULL);
+  (void)irq_attach(S32K1XX_IRQ_SYSTICK, (xcpt_t)s32k14x_timerisr, NULL);
 
   /* Enable SysTick interrupts */
 
@@ -169,5 +169,5 @@ void arm_timer_initialize(void)
 
   /* And enable the timer interrupt */
 
-  up_enable_irq(LPC54_IRQ_SYSTICK);
+  up_enable_irq(S32K1XX_IRQ_SYSTICK);
 }