diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-22 10:38:25 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-22 10:38:25 -0600 |
commit | 93b6dd865cd9779c2bdc199145c9c6315baac712 (patch) | |
tree | 078efe11d89aeba80e044abc22cc8166bfa5e630 | |
parent | 336e93df0acfc8c3c4db17ee236d245c2a00da5e (diff) | |
download | px4-nuttx-93b6dd865cd9779c2bdc199145c9c6315baac712.tar.gz px4-nuttx-93b6dd865cd9779c2bdc199145c9c6315baac712.tar.bz2 px4-nuttx-93b6dd865cd9779c2bdc199145c9c6315baac712.zip |
Rename sam3u_pmc.h to sam_pmc.h since it handles all of the SAM3/4 chips
-rw-r--r-- | nuttx/arch/arm/src/sam34/chip/sam_pmc.h (renamed from nuttx/arch/arm/src/sam34/chip/sam3u_pmc.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam3u_dmac.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam3u_periphclks.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam3x_periphclks.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam4e_periphclks.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam4s_periphclks.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_clockconfig.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_gpioirq.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_hsmci.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/sam34/sam_spi.c | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/arch/arm/src/sam34/chip/sam3u_pmc.h b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h index 8fd82a8f4..a1d282e23 100644 --- a/nuttx/arch/arm/src/sam34/chip/sam3u_pmc.h +++ b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/sam34/chip/sam3u_pmc.h + * arch/arm/src/sam34/chip/sam_pmc.h * Power Management Controller (PMC) for the SAM3U, SAM3X, SAM3A, and SAM4S * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H -#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H +#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H +#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H /******************************************************************************************** * Included Files @@ -529,4 +529,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H */ +#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */ diff --git a/nuttx/arch/arm/src/sam34/sam3u_dmac.c b/nuttx/arch/arm/src/sam34/sam3u_dmac.c index 9a5d85aa6..f2304c931 100644 --- a/nuttx/arch/arm/src/sam34/sam3u_dmac.c +++ b/nuttx/arch/arm/src/sam34/sam3u_dmac.c @@ -57,7 +57,7 @@ #include "sam_dmac.h" #include "sam_periphclks.h" -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" #include "chip/sam3u_dmac.h" /**************************************************************************** diff --git a/nuttx/arch/arm/src/sam34/sam3u_periphclks.h b/nuttx/arch/arm/src/sam34/sam3u_periphclks.h index 309454a02..145ebe4ac 100644 --- a/nuttx/arch/arm/src/sam34/sam3u_periphclks.h +++ b/nuttx/arch/arm/src/sam34/sam3u_periphclks.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #include <stdint.h> #include <arch/irq.h> -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/sam34/sam3x_periphclks.h b/nuttx/arch/arm/src/sam34/sam3x_periphclks.h index 51de6aa27..a6b106cc8 100644 --- a/nuttx/arch/arm/src/sam34/sam3x_periphclks.h +++ b/nuttx/arch/arm/src/sam34/sam3x_periphclks.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #include <stdint.h> #include <arch/irq.h> -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/sam34/sam4e_periphclks.h b/nuttx/arch/arm/src/sam34/sam4e_periphclks.h index 68ef58c0e..ad996593d 100644 --- a/nuttx/arch/arm/src/sam34/sam4e_periphclks.h +++ b/nuttx/arch/arm/src/sam34/sam4e_periphclks.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #include <stdint.h> #include <arch/irq.h> -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/sam34/sam4s_periphclks.h b/nuttx/arch/arm/src/sam34/sam4s_periphclks.h index 0e9995c96..d44e432f2 100644 --- a/nuttx/arch/arm/src/sam34/sam4s_periphclks.h +++ b/nuttx/arch/arm/src/sam34/sam4s_periphclks.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #include <stdint.h> #include <arch/irq.h> -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" /************************************************************************************ * Pre-processor Definitions diff --git a/nuttx/arch/arm/src/sam34/sam_clockconfig.c b/nuttx/arch/arm/src/sam34/sam_clockconfig.c index ebe7dc0c3..8e1c4ced8 100644 --- a/nuttx/arch/arm/src/sam34/sam_clockconfig.c +++ b/nuttx/arch/arm/src/sam34/sam_clockconfig.c @@ -49,7 +49,7 @@ #include "up_internal.h" #include "sam_clockconfig.h" -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" #include "chip/sam3u_eefc.h" #include "chip/sam3u_wdt.h" #include "chip/sam3u_supc.h" diff --git a/nuttx/arch/arm/src/sam34/sam_gpioirq.c b/nuttx/arch/arm/src/sam34/sam_gpioirq.c index 399a3eb19..ddb6e8560 100644 --- a/nuttx/arch/arm/src/sam34/sam_gpioirq.c +++ b/nuttx/arch/arm/src/sam34/sam_gpioirq.c @@ -56,7 +56,7 @@ #include "sam_gpio.h" #include "sam_periphclks.h" #include "chip/sam3u_pio.h" -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" #ifdef CONFIG_GPIO_IRQ diff --git a/nuttx/arch/arm/src/sam34/sam_hsmci.c b/nuttx/arch/arm/src/sam34/sam_hsmci.c index 42ae70d8f..5a406752c 100644 --- a/nuttx/arch/arm/src/sam34/sam_hsmci.c +++ b/nuttx/arch/arm/src/sam34/sam_hsmci.c @@ -65,7 +65,7 @@ #include "sam_hsmci.h" #include "sam_periphclks.h" #include "chip/sam3u_dmac.h" -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" #include "chip/sam_hsmci.h" #include "chip/sam_pinmap.h" diff --git a/nuttx/arch/arm/src/sam34/sam_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c index 278eb55d2..dc0647e75 100644 --- a/nuttx/arch/arm/src/sam34/sam_spi.c +++ b/nuttx/arch/arm/src/sam34/sam_spi.c @@ -59,7 +59,7 @@ #include "sam_gpio.h" #include "sam_spi.h" #include "sam_periphclks.h" -#include "chip/sam3u_pmc.h" +#include "chip/sam_pmc.h" #include "chip/sam_spi.h" #include "chip/sam_pinmap.h" |