diff options
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/Make.defs | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/chip/sam_isi.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/chip/sam_pmc.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_ethernet.h | 1 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_pck.c | 225 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_pck.h | 125 |
8 files changed, 361 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index fe7cf52a2..ea7b9ca8e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6043,5 +6043,6 @@ * fs/procfs: Add a little, primitive procfs file system. (2013-11-13). * fs/binfs/README.txt: Add a README file for binfs (2013-11-13). * arch/arm/src/stm32/Kconfig: Add missing setup of CAN TSEG1 and - TSEG2 values. From Martin Lederhilger (2013-11014). - + TSEG2 values. From Martin Lederhilger (2013-11-14). + * arch/arm/src/sama5/sam_pck.c and .h: Add support for programmable + clock outputs (2013-11-14). diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c b/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c index 1449d5e5b..03f869562 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -2507,7 +2507,7 @@ void up_usbinitialize(void) } } - /* Enable USB to AHB clock and to Event router*/ + /* Enable USB to AHB clock and to Event router */ lpc31_enableclock (CLKID_USBOTGAHBCLK); lpc31_enableclock (CLKID_EVENTROUTERPCLK); diff --git a/nuttx/arch/arm/src/sama5/Make.defs b/nuttx/arch/arm/src/sama5/Make.defs index 86c275405..e49fcf43c 100644 --- a/nuttx/arch/arm/src/sama5/Make.defs +++ b/nuttx/arch/arm/src/sama5/Make.defs @@ -93,8 +93,9 @@ CHIP_ASRCS = # SAMA5-specific C source files -CHIP_CSRCS = sam_allocateheap.c sam_boot.c sam_clockconfig.c sam_memories.c -CHIP_CSRCS += sam_pio.c sam_irq.c sam_lowputc.c sam_serial.c sam_timerisr.c +CHIP_CSRCS = sam_allocateheap.c sam_boot.c sam_clockconfig.c sam_irq.c +CHIP_CSRCS += sam_lowputc.c sam_memories.c sam_pck.c sam_pio.c sam_serial.c +CHIP_CSRCS += sam_timerisr.c # Configuration dependent C and assembly language files diff --git a/nuttx/arch/arm/src/sama5/chip/sam_isi.h b/nuttx/arch/arm/src/sama5/chip/sam_isi.h index fe8ebddb9..bfc9443a1 100644 --- a/nuttx/arch/arm/src/sama5/chip/sam_isi.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_isi.h @@ -171,7 +171,7 @@ /* ISI Preview Decimation Factor Register */ -#define ISI_PDECF_MASK (0xff) /* Bits 0-7: Decimation Factor / +#define ISI_PDECF_MASK (0xff) /* Bits 0-7: Decimation Factor */ /* ISI CSC YCrCb To RGB Set 0 Register */ diff --git a/nuttx/arch/arm/src/sama5/chip/sam_pmc.h b/nuttx/arch/arm/src/sama5/chip/sam_pmc.h index ba2c75990..09ddb1665 100644 --- a/nuttx/arch/arm/src/sama5/chip/sam_pmc.h +++ b/nuttx/arch/arm/src/sama5/chip/sam_pmc.h @@ -134,6 +134,8 @@ #define PMC_SMDCK (1 << 4) /* Bit 4: SMD Clock */ #define PMC_UHP (1 << 6) /* Bit 6: USB Host OHCI Clocks */ #define PMC_UDP (1 << 7) /* Bit 7: USB Device Clock */ + +#define PMC_PCKN(n) (1 << ((int)(n) + 8)) #define PMC_PCK0 (1 << 8) /* Bit 8: Programmable Clock 0 Output */ #define PMC_PCK1 (1 << 9) /* Bit 9: Programmable Clock 1 Output */ #define PMC_PCK2 (1 << 10) /* Bit 10: Programmable Clock 2 Output */ diff --git a/nuttx/arch/arm/src/sama5/sam_ethernet.h b/nuttx/arch/arm/src/sama5/sam_ethernet.h index 703a49c61..adb85c4a6 100644 --- a/nuttx/arch/arm/src/sama5/sam_ethernet.h +++ b/nuttx/arch/arm/src/sama5/sam_ethernet.h @@ -119,6 +119,7 @@ # error ETH1 PHY unrecognized # endif #endif + /************************************************************************************ * Public Functions ************************************************************************************/ diff --git a/nuttx/arch/arm/src/sama5/sam_pck.c b/nuttx/arch/arm/src/sama5/sam_pck.c new file mode 100644 index 000000000..0e33c9155 --- /dev/null +++ b/nuttx/arch/arm/src/sama5/sam_pck.c @@ -0,0 +1,225 @@ +/**************************************************************************** + * arch/arm/src/sama5/sam_pck.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <debug.h> + +#include "sam_isi.h" + +#ifdef CONFIG_SAMA5_ISI + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Function: sam_pck_configure + * + * Description: + * Configure a programmable clock output. The selected PCK is programmed + * to the selected frequency using either PLLA or the MCK as the source + * clock (depending on the value of the selected frequency). The clock + * is initially disabled. You must call sam_pck_enable() to enable the + * clock after it has been configured. + * + * Input Parameters: + * pckid - Identifies the programmable clock output (0, 1, or 2) + * frequency - Defines the desired frequency. The exact frequency may + * not be attainable. In this case, frequency is interpreted to be + * a not-to-exceed frequency. + * + * Returned Value: + * The actual frequency of the clock output. + * + ****************************************************************************/ + +uint32_t sam_pck_configure(enum pckid_e pckid, uint32_t frequency) +{ + uint32_t regval; + uint32_t clkin; + + /* Pick a clock source. Several are possible but only MCK or PLLA is + * chosen here. + */ + + DEBUGASSERT(BOARD_MCK_FREQUENCY < BOARD_PLLA_FREQUENCY) + if (frequency <= BOARD_MCK_FREQUENCY || + frequency < BOARD_PLLA_FREQUENCY / 64) + { + regval = PMC_PCK_CSS_MCK; + clkin = BOARD_MCK_FREQUENCY; + } + else + { + regval = PMC_PCK_CSS_PLLA; + clkin = BOARD_PLLA_FREQUENCY; + } + + /* The the larger smallest divisor that does not exceed the requested + * frequency. + */ + + if (frequency > clkin) + { + regval |= PMC_PCK_PRES_DIV1; + actual = clkin; + } + else if (frequency > (clkin >> 1)) + { + regval |= PMC_PCK_PRES_DIV2; + actual = clkin >> 1; + } + else if (frequency > (clkin >> 2)) + { + regval |= PMC_PCK_PRES_DIV4; + actual = clkin >> 2; + } + else if (frequency > (clkin >> 3)) + { + regval |= PMC_PCK_PRES_DIV8; + actual = clkin >> 3; + } + else if (frequency > (clkin >> 4)) + { + regval |= PMC_PCK_PRES_DIV16; + actual = clkin >> 4; + } + else if (frequency > (clkin >> 5)) + { + regval |= PMC_PCK_PRES_DIV32; + actual = clkin >> 5; + } + else if (frequency > (clkin >> 6)) + { + regval |= PMC_PCK_PRES_DIV64; + actual = clkin >> 6; + } + else + { + sdbg("ERROR: frequency cannot be realized.\n"); + sdbg(" frequency=%d MCK=%d\n", + frequency, clkin); + return -ERANGE; + } + + /* Disable the programmable clock then set the selected configuration */ + + switch (pckid) + { + case PCK0: + putreg32(PMC_PCK0, SAM_PMC_SCDR); + putreg32(regval, SAM_PMC_PCK0); + break; + + case PCK1: + putreg32(PMC_PCK1, SAM_PMC_SCDR); + putreg32(regval, SAM_PMC_PCK1); + break; + + case PCK2: + putreg32(PMC_PCK2, SAM_PMC_SCDR); + putreg32(regval, SAM_PMC_PCK2); + break; + + default: + return -EINVAL; + } + + /* And return the actual frequency */ + + return actual; +} + +/**************************************************************************** + * Function: sam_pck_enable + * + * Description: + * Enable or disable a programmable clock output. + * + * Input Parameters: + * pckid - Identifies the programmable clock output (0, 1, or 2) + * enable - True: enable the clock output, False: disable the clock output + * + * Returned Value: + * None + * + ****************************************************************************/ + +void sam_pck_enable(enum pckid_e pckid, bool enable) +{ + uintptr_t regaddr; + uint32_t regval; + + /* Select the bit in the PMC_SDER or PMC_SCER corresponding to the + * programmable clock. + */ + + regval = PMC_PCKN(pckid); + + /* Select the SDER or SCER */ + + regaddr = enable ? SAM_PMC_SCER : SAM_PMC_SCDR; + + /* And do the deead */ + + putreg32(regval, regaddr); +} + +#endif /* CONFIG_SAMA5_ISI && CONFIG_SAMA5_EMAC */ diff --git a/nuttx/arch/arm/src/sama5/sam_pck.h b/nuttx/arch/arm/src/sama5/sam_pck.h new file mode 100644 index 000000000..8ea561dbe --- /dev/null +++ b/nuttx/arch/arm/src/sama5/sam_pck.h @@ -0,0 +1,125 @@ +/************************************************************************************ + * arch/arm/src/sama5/sam_pck.h + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARPCKNG IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +#ifndef __ARCH_ARM_SRC_SAMA5_SAM_PCK_H +#define __ARCH_ARM_SRC_SAMA5_SAM_PCK_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include <nuttx/config.h> + +#include "chip.h" +#include "chip/sam_pmc.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +/************************************************************************************ + * Public Types + ************************************************************************************/ +/* Identifies the programmable clock */ + +enum pckid_e +{ + PCK0 = 0, + PCK1, + PCK2 +}; + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Function: sam_pck_configure + * + * Description: + * Configure a programmable clock output. The selected PCK is programmed + * to the selected frequency using either PLLA or the MCK as the source + * clock (depending on the value of the selected frequency). The clock + * is initially disabled. You must call sam_pck_enable() to enable the + * clock after it has been configured. + * + * Input Parameters: + * pckid - Identifies the programmable clock output (0, 1, or 2) + * frequency - Defines the desired frequency. The exact frequency may + * not be attainable. In this case, frequency is interpreted to be + * a not-to-exceed frequency. + * + * Returned Value: + * The actual frequency of the clock output. + * + ****************************************************************************/ + +uint32_t sam_pck_configure(enum pckid_e pckid, uint32_t frequency); + +/**************************************************************************** + * Function: sam_pck_enable + * + * Description: + * Enable or disable a programmable clock output. + * + * Input Parameters: + * pckid - Identifies the programmable clock output (0, 1, or 2) + * enable - True: enable the clock output, False: disable the clock output + * + * Returned Value: + * None + * + ****************************************************************************/ + +void sam_pck_enable(enum pckid_e pckid, bool enable); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* __ARCH_ARM_SRC_SAMA5_SAM_PCK_H */ + |