Rename arch/arm/src/am335x/chip to arch/arm/src/arm335x/hardware.

arch/arm/src/am335x/am335x_clockconfig.c

@@ -42,7 +42,7 @@
 #include "up_arch.h"
 #if 0
 /* TODO: add clock register module */
-#include "chip/am335x_ccm.h"
+#include "hardware/am335x_ccm.h"
 #endif
 #include "am335x_config.h"
 #include "am335x_clockconfig.h"

arch/arm/src/am335x/am335x_gpio.h

@@ -45,8 +45,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "chip/am335x_control.h"
+#include "hardware/am335x_control.h"
-#include "chip/am335x_gpio.h"
+#include "hardware/am335x_gpio.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_irq.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_intc.h"
+#include "hardware/am335x_intc.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_lowputc.c

@@ -50,7 +50,7 @@
 #include "am335x_config.h"
 #include "am335x_gpio.h"
 #include "am335x_pinmux.h"
-#include "chip/am335x_uart.h"
+#include "hardware/am335x_uart.h"
 
 /**************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_pinmux.h

@@ -42,8 +42,8 @@
 
 #include <nuttx/config.h>
 
-#include "chip/am335x_control.h"
+#include "hardware/am335x_control.h"
-#include "chip/am335x_pinmux.h"
+#include "hardware/am335x_pinmux.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_serial.c

@@ -62,7 +62,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/am335x_uart.h"
+#include "hardware/am335x_uart.h"
 #include "am335x_gpio.h"
 #include "am335x_serial.h"
 

arch/arm/src/am335x/am335x_serial.h

@@ -43,10 +43,10 @@
 #include <nuttx/config.h>
 #include <arch/board/board.h>
 
-#include "chip/am335x_uart.h"
+#include "hardware/am335x_uart.h"
 
 #include "am335x_config.h"
-#include "chip/am335x_gpio.h"
+#include "hardware/am335x_gpio.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_timerisr.c

@@ -49,7 +49,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "chip/am335x_timer.h"
+#include "hardware/am335x_timer.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/am335x_wdog.c

@@ -42,7 +42,7 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "chip/am335x_wdog.h"
+#include "hardware/am335x_wdog.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/am335x/am335x_wdog.h

@@ -49,7 +49,7 @@
 
 #include "up_internal.h"
 #include "chip.h"
-#include "chip/am335x_wdog.h"
+#include "hardware/am335x_wdog.h"
 
 /****************************************************************************
  * Public Types

arch/arm/src/am335x/chip.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/am335x/hardware/am3358_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am3358_memorymap.h
+ * arch/arm/src/am335x/hardware/am3358_memorymap.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM3358_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_MEMORYMAP_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM3358_MEMORYMAP_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -614,4 +614,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM3358_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_MEMORYMAP_H */

arch/arm/src/am335x/hardware/am3358_pinmux.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am3358_pinmux.h
+ * arch/arm/src/am335x/hardware/am3358_pinmux.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchneko@gmail.com>
@@ -33,15 +33,15 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM3358_PINMUX_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_PINMUX_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM3358_PINMUX_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_PINMUX_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -859,4 +859,4 @@
 
 #define GPIO_USB1_DRVVBUS             (GPIO_PERIPH | GPIO_PADCTL(AM335X_PADCTL_USB1_DRVVBUS_INDEX) | PINMUX_MODE0)
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM3358_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM3358_PINMUX_H */

arch/arm/src/am335x/hardware/am335x_control.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/am335x/chip/am335x_control.h
+ * arch/arm/src/am335x/hardware/am335x_control.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_CONTROL_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CONTROL_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_CONTROL_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CONTROL_H
 
 /********************************************************************************************
  * Included Files
@@ -643,4 +643,4 @@
 #define PADCTL_RXACTIVE         (1 << 5) /* Bit 5: Receiver enabled */
 #define PADCTL_SLEWCTRL         (1 << 6) /* Bit 6: Select between faster or slower slew rate */
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_CONTROL_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_CONTROL_H */

arch/arm/src/am335x/hardware/am335x_gpio.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/am335x_gpio.h
+ * arch/arm/src/am335x/hardware/am335x_gpio.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_GPIO_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_GPIO_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_GPIO_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -241,4 +241,4 @@
 #define GPIO_ICR_MASK(n)         (3 << GPIO_ICR_SHIFT(n))
 #define GPIO_ICR(i,n)            ((uint32_t)(n) << GPIO_ICR_SHIFT(n))
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_GPIO_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_GPIO_H */

arch/arm/src/am335x/hardware/am335x_intc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_intc.h
+ * arch/arm/src/am335x/hardware/am335x_intc.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_INTC_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_INTC_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_INTC_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_INTC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -268,4 +268,4 @@
 #define INTC_ILR_PRIO_MASK              (127)  /* Bits 2..7:  Interrupt Priority */
 #  define INTC_ILR_PRIO(p)              (((p) & INTC_ILR_PRIO_MASK) << INTC_ILR_PRIO_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_INTC_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_INTC_H */

arch/arm/src/am335x/hardware/am335x_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_memorymap.h
+ * arch/arm/src/am335x/hardware/am335x_memorymap.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include <arch/am335x/chip.h>
 
 #if defined(CONFIG_ARCH_CHIP_AM3358)
-#  include "chip/am3358_memorymap.h"
+#  include "hardware/am3358_memorymap.h"
 #else
 #  error Unrecognized AM335X architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_MEMORYMAP_H */

arch/arm/src/am335x/hardware/am335x_pinmux.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_pinmux.h
+ * arch/arm/src/am335x/hardware/am335x_pinmux.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_PINMUX_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PINMUX_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_PINMUX_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PINMUX_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include <arch/am335x/chip.h>
 
 #if defined(CONFIG_ARCH_CHIP_AM3358)
-#  include "chip/am3358_pinmux.h"
+#  include "hardware/am3358_pinmux.h"
 #else
 #  error Unrecognized AM335X architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_PINMUX_H */

arch/arm/src/am335x/hardware/am335x_timer.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_timer.h
+ * arch/arm/src/am335x/hardware/am335x_timer.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_TIMER_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_TIMER_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_TIMER_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_TIMER_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -213,4 +213,4 @@
 
 #define TMR1MS_TOWR_MASK                (0xffffff)
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_TIMER_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_TIMER_H */

arch/arm/src/am335x/hardware/am335x_uart.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_uart.h
+ * arch/arm/src/am335x/hardware/am335x_uart.h
  *
  *   Copyright (C) 2018 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_UART_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_UART_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_UART_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_UART_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -401,5 +401,5 @@
 #define UART_EFR_AUTORTSEN           (1 << 6)  /* Bit 6: Enable Auto-RTS */
 #define UART_EFR_AUTOCTSEN           (1 << 7)  /* Bit 7: Enable Auto-CTS */
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_UART_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_UART_H */
 

arch/arm/src/am335x/hardware/am335x_wdog.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/am335x/chip/am335x_wdog.h
+ * arch/arm/src/am335x/hardware/am335x_wdog.h
  *
  *   Copyright (C) 2019 Petro Karashchenko. All rights reserved.
  *   Author: Petro Karashchenko <petro.karashchenko@gmail.com>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_AM335X_CHIP_AM335X_WDOG_H
+#ifndef __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_WDOG_H
-#define __ARCH_ARM_SRC_AM335X_CHIP_AM335X_WDOG_H
+#define __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_WDOG_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/am335x_memorymap.h"
+#include "hardware/am335x_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -129,5 +129,5 @@
 #define WDT_WSPR_STOP_FEED_A            (0x0000aaaa)
 #define WDT_WSPR_STOP_FEED_B            (0x00005555)
 
-#endif /* __ARCH_ARM_SRC_AM335X_CHIP_AM335X_WDOG_H */
+#endif /* __ARCH_ARM_SRC_AM335X_HARDWARE_AM335X_WDOG_H */
 

arch/arm/src/lpc11xx/lpc11_spi.h

@@ -44,16 +44,6 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "hardware/lpc11_spi.h"
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
 /************************************************************************************
  * Public Data
  ************************************************************************************/

configs/beaglebone-black/include/board.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/am335x_pinmux.h"
+#include "hardware/am335x_pinmux.h"
 
 /************************************************************************************
  * Pre-processor Definitions

configs/pcduino-a10/include/board.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/a1x_piocfg.h"
+#include "hardware/a1x_piocfg.h"
 
 /************************************************************************************
  * Pre-processor Definitions