sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAML21: Rename sam_clockconfig.c to samd_clockconfig.c. saml_clockconfig.c forthcoming.

Browse Source
This commit is contained in:
Gregory Nutt 2015-05-16 13:32:12 -06:00
parent 79d3684fb4
commit bfb822380b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/src/samdl/Make.defs
View File

@ -68,9 +68,16 @@ CMN_CSRCS += up_dumpnvic.c
endif
CHIP_ASRCS =
CHIP_CSRCS = sam_clockconfig.c sam_idle.c sam_irq.c sam_lowputc.c
CHIP_CSRCS += sam_port.c sam_sercom.c sam_serial.c sam_start.c
CHIP_CSRCS += sam_usart.c
CHIP_CSRCS = sam_idle.c sam_irq.c sam_lowputc.c sam_port.c sam_sercom.c
CHIP_CSRCS += sam_serial.c sam_start.c sam_usart.c
ifneq ($(CONFIG_ARCH_FAMILY_SAMD20),y)
CHIP_CSRCS += samd_clockconfig.c
else
ifneq ($(CONFIG_ARCH_FAMILY_SAML21),y)
CHIP_CSRCS += saml_clockconfig.c
endif
endif
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sam_timerisr.c

2
arch/arm/src/samdl/chip/saml_mclk.h
View File

@ -62,7 +62,7 @@
#define SAM_MCLK_CPUDIV_OFFSET 0x0004 /* CPU clock division */
#define SAM_MCLK_LPDIV_OFFSET 0x0005 /* Low-power clock division */
#define SAM_MCLK_BUPDIV_OFFSET 0x0006 /* Backup clock division */
/* 0x0007-0x000f: Reserved */
/* 0x0007-0x000f: Reserved */
#define SAM_MCLK_AHBMASK_OFFSET 0x0010 /* AHB mask */
#define SAM_MCLK_APBAMASK_OFFSET 0x0010 /* APBA mask */
#define SAM_MCLK_APBBMASK_OFFSET 0x0010 /* APBB mask */

2
arch/arm/src/samdl/sam_clockconfig.c → arch/arm/src/samdl/samd_clockconfig.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/samdl/sam_clockconfig.c
* arch/arm/src/samdl/samd_clockconfig.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>