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

2026-06-06 16:50:55 +08:00 · 2019-05-24 17:10:46 -06:00
parent 9b38f5cf2f
commit 2899e529b8
96 changed files with 342 additions and 341 deletions
@@ -48,7 +48,7 @@

 #include <arch/irq.h>
 #include <arch/kinetis/chip.h>
-#include "chip/kinetis_memorymap.h"
+#include "hardware/kinetis_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_adc.h
+ * arch/arm/src/kinetis/hardware/kinetis_adc.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H

 /********************************************************************************************
 * Included Files
@@ -320,4 +320,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ADC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_aips.h
+ * arch/arm/src/kinetis/hardware/kinetis_aips.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H

 /************************************************************************************
 * Included Files
@@ -214,4 +214,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AIPS_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_axbs.h
+ * arch/arm/src/kinetis/hardware/kinetis_axbs.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H

 /************************************************************************************
 * Included Files
@@ -248,4 +248,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_AXBS_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_cmp.h
+ * arch/arm/src/kinetis/hardware/kinetis_cmp.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H

 /********************************************************************************************
 * Included Files
@@ -189,4 +189,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_cmt.h
+ * arch/arm/src/kinetis/hardware/kinetis_cmt.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H

 /************************************************************************************
 * Included Files
@@ -135,4 +135,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CMT_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_crc.h
+ * arch/arm/src/kinetis/hardware/kinetis_crc.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H

 /************************************************************************************
 * Included Files
@@ -114,4 +114,4 @@
 ************************************************************************************/

 #endif /* KINETIS_NCRC && KINETIS_NCRC > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_CRC_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_dac.h
+ * arch/arm/src/kinetis/hardware/kinetis_dac.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H

 /********************************************************************************************
 * Included Files
@@ -232,4 +232,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DAC_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_dma.h
+ * arch/arm/src/kinetis/hardware/kinetis_dma.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H

 /****************************************************************************************************
 * Included Files
@@ -779,4 +779,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMA_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_dmamux.h
+ * arch/arm/src/kinetis/hardware/kinetis_dmamux.h
 *
 *   Copyright (C) 2011, 2016, 2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H

 /********************************************************************************************
 * Included Files
@@ -270,4 +270,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DMAMUX_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_dspi.h
+ * arch/arm/src/kinetis/hardware/kinetis_dspi.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H

 /********************************************************************************************
 * Included Files
@@ -322,4 +322,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_DSPI_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_enet.h
+ * arch/arm/src/kinetis/hardware/kinetis_enet.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H

 /********************************************************************************************
 * Included Files
@@ -649,4 +649,4 @@ struct enet_desc_s
 ********************************************************************************************/

 #endif /* KINETIS_NENET &&  KINETIS_NENET > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_ENET_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_ewm.h
+ * arch/arm/src/kinetis/hardware/kinetis_ewm.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H

 /************************************************************************************
 * Included Files
@@ -87,4 +87,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_EWM_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_flexbus.h
+ * arch/arm/src/kinetis/hardware/kinetis_flexbus.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H

 /************************************************************************************
 * Included Files
@@ -210,4 +210,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXBUS_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_flexcan.h
+ * arch/arm/src/kinetis/hardware/kinetis_flexcan.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H

 /****************************************************************************************************
 * Included Files
@@ -315,4 +315,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FLEXCAN_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_fmc.h
+ * arch/arm/src/kinetis/hardware/kinetis_fmc.h
 *
 *   Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H

 /********************************************************************************************
 * Included Files
@@ -49,11 +49,11 @@
 */

 #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
-#  include "chip/kinetis_k20k40k60fmc.h"
+#  include "hardware/kinetis_k20k40k60fmc.h"
 #elif defined(KINETIS_K64)
-#  include "chip/kinetis_k64fmc.h"
+#  include "hardware/kinetis_k64fmc.h"
 #elif defined(KINETIS_K28) || defined(KINETIS_K66)
-#  include "chip/kinetis_k28k66fmc.h"
+#  include "hardware/kinetis_k28k66fmc.h"
 #else
 #  error "No FMC definitions for this Kinetis part"
 #endif
@@ -74,4 +74,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FMC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_ftfe.h
+ * arch/arm/src/kinetis/hardware/kinetis_ftfe.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H

 /************************************************************************************
 * Included Files
@@ -156,4 +156,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTFE_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_ftm.h
+ * arch/arm/src/kinetis/hardware/kinetis_ftm.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H

 /********************************************************************************************
 * Included Files
@@ -569,4 +569,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_FTM_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_gpio.h
+ * arch/arm/src/kinetis/hardware/kinetis_gpio.h
 *
 *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H

 /************************************************************************************
 * Included Files
@@ -139,4 +139,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_GPIO_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_GPIO_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_i2c.h
+ * arch/arm/src/kinetis/hardware/kinetis_i2c.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H

 /********************************************************************************************
 * Included Files
@@ -292,4 +292,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_i2s.h
+ * arch/arm/src/kinetis/hardware/kinetis_i2s.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H

 /****************************************************************************************************
 * Included Files
@@ -294,4 +294,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2S_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_k20k40k60fmc.h
+ * arch/arm/src/kinetis/hardware/kinetis_k20k40k60fmc.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H

 /************************************************************************************
 * Included Files
@@ -386,4 +386,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20K40K60FMC_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_mpu.h
+ * arch/arm/src/kinetis/hardware/kinetis_mpu.h
 *
 *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H

 /****************************************************************************************************
 * Included Files
@@ -395,4 +395,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k20memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k20memorymap.h
 *
 *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -177,4 +177,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K20 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k20pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_k20pinmux.h
 *
 *   Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -350,4 +350,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K20PINMUX_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k28k64k66mpu.h
+ * arch/arm/src/kinetis/hardware/kinetis_k28k64k66mpu.h
 *
 *   Copyright (C) 2011, 2017-2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H

 /****************************************************************************************************
 * Included Files
@@ -388,4 +388,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K64K66MPU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K64K66MPU_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_k28k66fmc.h
+ * arch/arm/src/kinetis/hardware/kinetis_k28k66fmc.h
 *
 *   Copyright (C) 2016-2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H

 /************************************************************************************
 * Included Files
@@ -361,4 +361,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28K66FMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28K66FMC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k28memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k28memorymap.h
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -226,4 +226,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K28 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K28MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k28pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_k28pinmux.h
 *
 *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -830,4 +830,4 @@
 ********************************************************************************************/

 #endif /* KINETIS_K28 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K28PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K28PINMUX_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k40memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k40memorymap.h
 *
 *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -196,4 +196,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K40 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k40pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_k40pinmux.h
 *
 *   Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -516,4 +516,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K40PINMUX_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k60memorymap.h
 *
 *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -193,4 +193,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K60 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k60pinset.h
+ * arch/arm/src/kinetis/hardware/kinetis_k60pinset.h
 *
 *   Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -484,4 +484,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K60PINMUX_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_k64fmc.h
+ * arch/arm/src/kinetis/hardware/kinetis_k64fmc.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H

 /************************************************************************************
 * Included Files
@@ -290,4 +290,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64FMC_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k64memorymap.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -210,4 +210,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K64 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_k64pinmux.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -638,4 +638,4 @@
 ********************************************************************************************/

 #endif /* KINETIS_K64 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K64PINMUX_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k66memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_k66memorymap.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H

 /************************************************************************************
 * Included Files
@@ -238,4 +238,4 @@
 ************************************************************************************/

 #endif /* KINETIS_K66 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K66MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_k66pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_k66pinmux.h
 *
 *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -759,4 +759,4 @@
 ********************************************************************************************/

 #endif /* KINETIS_K66 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K66PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_K66PINMUX_H */
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_kx6tpm.h
+ * arch/arm/src/kinetis/hardware/kinetis_kx6tpm.h
 *
 *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H

 /****************************************************************************
 * Included Files
@@ -208,4 +208,4 @@
 # define TPM_CONF_TRGSEL_LPTMR      (14 << TPM_CONF_TRGSEL_SHIFT) /* LPTMR trigger */
 # define TPM_CONF_TRGSEL_SW         (15 << TPM_CONF_TRGSEL_SHIFT) /* Software Trigger */

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_KX6TPM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_KX6TPM_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_llwu.h
+ * arch/arm/src/kinetis/hardware/kinetis_llwu.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H

 /************************************************************************************
 * Included Files
@@ -251,4 +251,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LLWU_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_lptmr.h
+ * arch/arm/src/kinetis/hardware/kinetis_lptmr.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H

 /****************************************************************************************************
 * Included Files
@@ -135,4 +135,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPTMR_H */
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_lpuart.h
+ * arch/arm/src/kinetis/hardware/kinetis_lpuart.h
 *
 *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H

 /****************************************************************************************************
 * Included Files
@@ -353,4 +353,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPUART_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_LPUART_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_mcg.h
+ * arch/arm/src/kinetis/hardware/kinetis_mcg.h
 *
 *   Copyright (C) 2011, 2016-2018 Gregory Nutt. All rights reserved.
 *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H

 /************************************************************************************
 * Included Files
@@ -436,4 +436,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCG_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_mcm.h
+ * arch/arm/src/kinetis/hardware/kinetis_mcm.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H

 /************************************************************************************
 * Included Files
@@ -154,4 +154,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MCM_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_memorymap.h
+ * arch/arm/src/kinetis/hardware/kinetis_memorymap.h
 *
 *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H

 /********************************************************************************************
 * Included Files
@@ -49,17 +49,17 @@
 */

 #if defined(KINETIS_K20)
-#  include "chip/kinetis_k20memorymap.h"
+#  include "hardware/kinetis_k20memorymap.h"
 #elif defined(KINETIS_K28)
-#  include "chip/kinetis_k28memorymap.h"
+#  include "hardware/kinetis_k28memorymap.h"
 #elif defined(KINETIS_K40)
-#  include "chip/kinetis_k40memorymap.h"
+#  include "hardware/kinetis_k40memorymap.h"
 #elif defined(KINETIS_K60)
-#  include "chip/kinetis_k60memorymap.h"
+#  include "hardware/kinetis_k60memorymap.h"
 #elif defined(KINETIS_K64)
-#  include "chip/kinetis_k64memorymap.h"
+#  include "hardware/kinetis_k64memorymap.h"
 #elif defined(KINETIS_K66)
-#  include "chip/kinetis_k66memorymap.h"
+#  include "hardware/kinetis_k66memorymap.h"
 #else
 #  error "No memory map for this Kinetis part"
 #endif
@@ -80,4 +80,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MEMORYMAP_H */
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_mmcau.h
+ * arch/arm/src/kinetis/hardware/kinetis_mmcau.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H

 /************************************************************************************
 * Included Files
@@ -139,4 +139,4 @@
 ************************************************************************************/

 #endif /* KINETIS_NMMCAU && KINETIS_NMMCAU > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MMCAU_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_mpu.h
+ * arch/arm/src/kinetis/hardware/kinetis_mpu.h
 *
 *   Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H

 /********************************************************************************************
 * Included Files
@@ -49,9 +49,9 @@
 */

 #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
-#  include "chip/kinetis_k20k40k60mpu.h"
+#  include "hardware/kinetis_k20k40k60mpu.h"
 #elif defined(KINETIS_K28) || defined(KINETIS_K64) || defined(KINETIS_K66)
-#  include "chip/kinetis_k28k64k66mpu.h"
+#  include "hardware/kinetis_k28k64k66mpu.h"
 #else
 #  error "No MPU definitions for this Kinetis part"
 #endif
@@ -72,4 +72,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_MPU_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_osc.h
+ * arch/arm/src/kinetis/hardware/kinetis_osc.h
 *
 *   Copyright (C) 2011, 2016-2017 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H
-#define __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H

 /********************************************************************************************
 * Included Files
@@ -92,4 +92,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_OSC_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_pdb.h
+ * arch/arm/src/kinetis/hardware/kinetis_pdb.h
 *
 *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H

 /********************************************************************************************
 * Included Files
@@ -260,4 +260,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PDB_H */
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/chip/kinetis_pinmux.h
+ * arch/arm/src/kinetis/hardware/kinetis_pinmux.h
 *
 *   Copyright (C) 2011, 2015-2016, 2018 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H

 /********************************************************************************************
 * Included Files
@@ -49,17 +49,17 @@
 */

 #if defined(KINETIS_K20)
-#  include "chip/kinetis_k20pinmux.h"
+#  include "hardware/kinetis_k20pinmux.h"
 #elif defined(KINETIS_K28)
-#  include "chip/kinetis_k28pinmux.h"
+#  include "hardware/kinetis_k28pinmux.h"
 #elif defined(KINETIS_K40)
-#  include "chip/kinetis_k40pinmux.h"
+#  include "hardware/kinetis_k40pinmux.h"
 #elif defined(KINETIS_K60)
-#  include "chip/kinetis_k60pinmux.h"
+#  include "hardware/kinetis_k60pinmux.h"
 #elif defined(KINETIS_K64)
-#  include "chip/kinetis_k64pinmux.h"
+#  include "hardware/kinetis_k64pinmux.h"
 #elif defined(KINETIS_K66)
-#  include "chip/kinetis_k66pinmux.h"
+#  include "hardware/kinetis_k66pinmux.h"
 #else
 #  error "No pin multiplexing for this Kinetis part"
 #endif
@@ -80,4 +80,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_PINMUX_H */
--- a/Show More
+++ b/Show More