diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-08 06:14:59 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-08 06:14:59 -0600 |
| commit | 110434b762f0c8d9a90f2a04522aa5a56f244542 (patch) | |
| tree | bb2e3e83d728a5981f0a65bd36be458f69ef581c /nuttx/arch/arm/src | |
| parent | 6f5287675d7e2dcae7d5899d4d8674499cd87be1 (diff) | |
| download | px4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.tar.gz px4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.tar.bz2 px4-nuttx-110434b762f0c8d9a90f2a04522aa5a56f244542.zip | |
SAM3X/Arduino Due: Fix typo in sam3x_periphclks.h; add SCLK definitions to board.h header file. From Fabien Comte
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam3x_periphclks.h | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_rtt.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_tc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sam34/sam_wdt.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_wdt.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam3x_periphclks.h b/nuttx/arch/arm/src/sam34/sam3x_periphclks.h index a6b106cc8..f20a86a0e 100644 --- a/nuttx/arch/arm/src/sam34/sam3x_periphclks.h +++ b/nuttx/arch/arm/src/sam34/sam3x_periphclks.h @@ -52,8 +52,8 @@ #define sam_enableperiph0(s) putreg32((1 << (s)), SAM_PMC_PCER0) #define sam_enableperiph1(s) putreg32((1 << ((s) - 32)), SAM_PMC_PCER1) -#define sam_disableperiph0(s) putreg32((1 << (s)), SAM_PMC_PDER0) -#define sam_disableperiph1(s) putreg32((1 << ((s) - 32)), SAM_PMC_PDER1) +#define sam_disableperiph0(s) putreg32((1 << (s)), SAM_PMC_PCDR0) +#define sam_disableperiph1(s) putreg32((1 << ((s) - 32)), SAM_PMC_PCDR1) #define sam_supc_enableclk() sam_enableperiph0(SAM_PID_SUPC) #define sam_rstc_enableclk() sam_enableperiph0(SAM_PID_RSTC) diff --git a/nuttx/arch/arm/src/sam34/sam_rtt.c b/nuttx/arch/arm/src/sam34/sam_rtt.c index fc9ddd170..e417a6565 100644 --- a/nuttx/arch/arm/src/sam34/sam_rtt.c +++ b/nuttx/arch/arm/src/sam34/sam_rtt.c @@ -67,7 +67,7 @@ # define RTT_PRES 1 #endif -#define RTT_FCLK (BOARD_SLCK_FREQUENCY/RTT_PRES) +#define RTT_FCLK (BOARD_SCLK_FREQUENCY/RTT_PRES) #define RTT_MAXTIMEOUT ((1000000ULL * (0x100000000ULL)) / RTT_FCLK) /* Configuration ************************************************************/ diff --git a/nuttx/arch/arm/src/sam34/sam_tc.c b/nuttx/arch/arm/src/sam34/sam_tc.c index b955d6bb0..1f866726a 100644 --- a/nuttx/arch/arm/src/sam34/sam_tc.c +++ b/nuttx/arch/arm/src/sam34/sam_tc.c @@ -66,7 +66,7 @@ /* TODO: Allow selection of any of the input clocks */ -#define TC_FCLK (BOARD_SLCK_FREQUENCY) +#define TC_FCLK (BOARD_SCLK_FREQUENCY) #define TC_MAXTIMEOUT ((1000000ULL * (1ULL + TC_RVALUE_MASK)) / TC_FCLK) /* Configuration ************************************************************/ diff --git a/nuttx/arch/arm/src/sam34/sam_wdt.c b/nuttx/arch/arm/src/sam34/sam_wdt.c index 7886b7842..40d59d10a 100644 --- a/nuttx/arch/arm/src/sam34/sam_wdt.c +++ b/nuttx/arch/arm/src/sam34/sam_wdt.c @@ -71,7 +71,7 @@ * 1000 * 64 / Fmin = 49.93 msec */ -#define WDT_FCLK (BOARD_SLCK_FREQUENCY / 128) +#define WDT_FCLK (BOARD_SCLK_FREQUENCY / 128) #define WDT_MAXTIMEOUT ((1000 * (WDT_MR_WDV_MAX+1)) / WDT_FCLK) /* Configuration ************************************************************/ diff --git a/nuttx/arch/arm/src/sama5/sam_wdt.c b/nuttx/arch/arm/src/sama5/sam_wdt.c index 8d8d10dcd..706f8e8a3 100644 --- a/nuttx/arch/arm/src/sama5/sam_wdt.c +++ b/nuttx/arch/arm/src/sama5/sam_wdt.c @@ -61,11 +61,11 @@ * 32768 kHz). */ -#ifndef BOARD_SLCK_FREQUENCY -# define BOARD_SLCK_FREQUENCY 32768 +#ifndef BOARD_SCLK_FREQUENCY +# define BOARD_SCLK_FREQUENCY 32768 #endif -#define WDT_FREQUENCY (BOARD_SLCK_FREQUENCY / 128) +#define WDT_FREQUENCY (BOARD_SCLK_FREQUENCY / 128) /* At 32768Hz, the maximum timeout value will be: * |