Rename arch/arm/src/kl/chip to arch/arm/src/kl/hardware.

arch/arm/src/kl/chip.h

@@ -54,7 +54,7 @@
  * this file for the proper setup.
  */
 
-#include "chip/kl_memorymap.h"
+#include "hardware/kl_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/kl/hardware/k25z128_pinmux.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kl/k25z128_pinmux.h
+ * arch/arm/src/kl/hardware/k25z128_pinmux.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -336,4 +336,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_K40PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_K25PINMUX_H */

arch/arm/src/kl/hardware/kl_fmc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_fmc.h
+ * arch/arm/src/kl/hardware/kl_fmc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_FMC_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_FMC_H
-#define __ARCH_ARM_SRC_KL_KL_FMC_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_FMC_H
 
 /************************************************************************************
  * Included Files
@@ -386,4 +386,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_FMC_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_FMC_H */

arch/arm/src/kl/hardware/kl_gpio.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/chip/kl_gpio.h
+ * arch/arm/src/kl/hardware/kl_gpio.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_CHIP_KL_GPIO_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_GPIO_H
-#define __ARCH_ARM_SRC_KL_CHIP_KL_GPIO_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -159,4 +159,4 @@ extern "C"
 }
 #endif
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_KL_CHIP_KL_GPIO_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_GPIO_H */

arch/arm/src/kl/hardware/kl_i2c.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kl/chip/kl_i2c.h
+ * arch/arm/src/kl/hardware/kl_i2c.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_CHIP_KL_I2C_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_I2C_H
-#define __ARCH_ARM_SRC_KL_CHIP_KL_I2C_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_I2C_H
 
 /********************************************************************************************
  * Included Files
@@ -185,4 +185,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_CHIP_KL_I2C_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_I2C_H */

arch/arm/src/kl/hardware/kl_llwu.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_llwu.h
+ * arch/arm/src/kl/hardware/kl_llwu.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_LLWU_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_LLWU_H
-#define __ARCH_ARM_SRC_KL_KL_LLWU_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_LLWU_H
 
 /************************************************************************************
  * Included Files
@@ -249,4 +249,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_LLWU_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_LLWU_H */

arch/arm/src/kl/hardware/kl_mcg.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_mcg.h
+ * arch/arm/src/kl/hardware/kl_mcg.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_MCG_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_MCG_H
-#define __ARCH_ARM_SRC_KL_KL_MCG_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_MCG_H
 
 /************************************************************************************
  * Included Files
@@ -183,4 +183,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_MCG_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_MCG_H */

arch/arm/src/kl/hardware/kl_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_memorymap.h
+ * arch/arm/src/kl/hardware/kl_memorymap.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_MEMORYMAP_H
-#define __ARCH_ARM_SRC_KL_KL_MEMORYMAP_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -137,4 +137,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_MEMORYMAP_H */

arch/arm/src/kl/hardware/kl_osc.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kl/kl_osc.h
+ * arch/arm/src/kl/hardware/kl_osc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_OSC_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_OSC_H
-#define __ARCH_ARM_SRC_KL_KL_OSC_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_OSC_H
 
 /********************************************************************************************
  * Included Files
@@ -81,4 +81,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_OSC_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_OSC_H */

arch/arm/src/kl/hardware/kl_pinmux.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kl/kl_pinmux.h
+ * arch/arm/src/kl/hardware/kl_pinmux.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_PINMUX_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_PINMUX_H
-#define __ARCH_ARM_SRC_KL_KL_PINMUX_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_PINMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -66,4 +66,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_PINMUX_H */

arch/arm/src/kl/hardware/kl_pit.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/kl/kl_pit.h
+ * arch/arm/src/kl/hardware/kl_pit.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_PIT_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_PIT_H
-#define __ARCH_ARM_SRC_KL_KL_PIT_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_PIT_H
 
 /****************************************************************************
  * Included Files
@@ -96,4 +96,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_PIT_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_PIT_H */

arch/arm/src/kl/hardware/kl_port.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_port.h
+ * arch/arm/src/kl/hardware/kl_port.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_PORT_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_PORT_H
-#define __ARCH_ARM_SRC_KL_KL_PORT_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_PORT_H
 
 /************************************************************************************
  * Included Files
@@ -428,4 +428,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_PORT_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_PORT_H */

arch/arm/src/kl/hardware/kl_sim.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_sim.h
+ * arch/arm/src/kl/hardware/kl_sim.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_SIM_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_SIM_H
-#define __ARCH_ARM_SRC_KL_KL_SIM_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_SIM_H
 
 /************************************************************************************
  * Included Files
@@ -387,4 +387,4 @@
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
-#endif /* __ARCH_ARM_SRC_KL_KL_SIM_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_SIM_H */

arch/arm/src/kl/hardware/kl_spi.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kl/kl_spi.h
+ * arch/arm/src/kl/hardware/kl_spi.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_CHIP_KL_SPI_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_SPI_H
-#define __ARCH_ARM_SRC_KL_CHIP_KL_SPI_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_SPI_H
 
 /********************************************************************************************
  * Included Files
@@ -136,4 +136,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_CHIP_KL_SPI_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_SPI_H */

arch/arm/src/kl/hardware/kl_tpm.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/kl/kl_tpm.h
+ * arch/arm/src/kl/hardware/kl_tpm.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_TPM_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_TPM_H
-#define __ARCH_ARM_SRC_KL_KL_TPM_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_TPM_H
 
 /****************************************************************************
  * Included Files
@@ -208,4 +208,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_TPM_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_TPM_H */

arch/arm/src/kl/hardware/kl_tsi.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/chip/kl_tsi.h
+ * arch/arm/src/kl/hardware/kl_tsi.h
  *
  *   Copyright (C) 2013 Alan Carvalho de Assis
  *   Author: Alan Carvalho de Assis <acassis@gmail.com>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_CHIP_KL_TSI_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_TSI_H
-#define __ARCH_ARM_SRC_KL_CHIP_KL_TSI_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_TSI_H
 
 /************************************************************************************
  * Included Files
@@ -151,4 +151,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_CHIP_KL_TSI_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_TSI_H */

arch/arm/src/kl/hardware/kl_uart.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kl/kl_uart.h
+ * arch/arm/src/kl/hardware/kl_uart.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KL_KL_UART_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_KL_UART_H
-#define __ARCH_ARM_SRC_KL_KL_UART_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_KL_UART_H
 
 /************************************************************************************
  * Included Files
@@ -219,4 +219,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KL_KL_UART_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_KL_UART_H */

arch/arm/src/kl/kl_clockconfig.c

@@ -47,12 +47,12 @@
 
 #include "chip.h"
 #include "kl_gpio.h"
-#include "chip/kl_mcg.h"
+#include "hardware/kl_mcg.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
-#include "chip/kl_osc.h"
+#include "hardware/kl_osc.h"
-#include "chip/kl_fmc.h"
+#include "hardware/kl_fmc.h"
-#include "chip/kl_llwu.h"
+#include "hardware/kl_llwu.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
 
 /****************************************************************************
  * Private Data

arch/arm/src/kl/kl_gpio.h

@@ -47,8 +47,8 @@
 #include <nuttx/irq.h>
 
 #include "kl_config.h"
-#include "chip/kl_gpio.h"
+#include "hardware/kl_gpio.h"
-#include "chip/kl_port.h"
+#include "hardware/kl_port.h"
 
 /****************************************************************************
  * Pre-processor Declarations

arch/arm/src/kl/kl_gpioirq.c

@@ -48,7 +48,7 @@
 
 #include "up_arch.h"
 
-#include "chip/kl_port.h"
+#include "hardware/kl_port.h"
 #include "kl_gpio.h"
 
 #ifdef CONFIG_KL_GPIOIRQ

arch/arm/src/kl/kl_lowputc.c

@@ -51,11 +51,11 @@
 #include "kl_lowputc.h"
 #include "kl_gpio.h"
 
-#include "chip/kl_uart.h"
+#include "hardware/kl_uart.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
-#include "chip/kl_port.h"
+#include "hardware/kl_port.h"
-#include "chip/kl_uart.h"
+#include "hardware/kl_uart.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/kl/kl_pwm.c

@@ -57,8 +57,8 @@
 #include "chip.h"
 #include "kl_pwm.h"
 #include "kl_gpio.h"
-#include "chip/kl_tpm.h"
+#include "hardware/kl_tpm.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
 
 /* This module then only compiles if there is at least one enabled timer
  * intended for use with the PWM upper half driver.

arch/arm/src/kl/kl_pwm.h

@@ -71,7 +71,7 @@
     defined(CONFIG_KL_TPM2_PWM)
 
 #include <arch/board/board.h>
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
 
 /* For each timer that is enabled for PWM usage, we need the following additional
  * configuration settings:

arch/arm/src/kl/kl_serial.c

@@ -61,7 +61,7 @@
 #include "kl_lowputc.h"
 #include "chip.h"
 #include "kl_gpio.h"
-#include "chip/kl_uart.h"
+#include "hardware/kl_uart.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/kl/kl_spi.c

@@ -54,10 +54,10 @@
 #include "up_arch.h"
 #include "kl_spi.h"
 #include "kl_gpio.h"
-#include "chip/kl_memorymap.h"
+#include "hardware/kl_memorymap.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
-#include "chip/kl_spi.h"
+#include "hardware/kl_spi.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
 
 #if defined(CONFIG_KL_SPI0) || defined(CONFIG_KL_SPI1)
 

arch/arm/src/kl/kl_start.c

@@ -48,7 +48,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
 
 #include "kl_config.h"
 #include "kl_gpio.h"

configs/freedom-kl25z/src/kl_tsi.c

@@ -52,9 +52,9 @@
 
 #include "up_arch.h"
 #include "kl_gpio.h"
-#include "chip/kl_tsi.h"
+#include "hardware/kl_tsi.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
 
 #ifdef CONFIG_KL_TSI
 

configs/freedom-kl26z/src/kl_tsi.c

@@ -52,9 +52,9 @@
 
 #include "up_arch.h"
 #include "kl_gpio.h"
-#include "chip/kl_tsi.h"
+#include "hardware/kl_tsi.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
-#include "chip/kl_sim.h"
+#include "hardware/kl_sim.h"
 
 #ifdef CONFIG_KL_TSI
 

configs/teensy-lc/src/kl_boardinitialize.c

@@ -45,7 +45,7 @@
 #include <arch/board/board.h>
 #include "chip.h"
 #include "kl_gpio.h"
-#include "chip/kl_pinmux.h"
+#include "hardware/kl_pinmux.h"
 
 #include "up_arch.h"
 #include "teensy-lc.h"