You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ra...@apache.org on 2020/08/29 07:04:00 UTC

[incubator-nuttx] 01/06: nrf52_clock.h: fix duplicate definition

This is an automated email from the ASF dual-hosted git repository.

raiden00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 4084b3396b765ba808cfce2d41de838a7ed2f1f2
Author: Matias N <ma...@protobits.dev>
AuthorDate: Sat Aug 22 17:08:22 2020 -0300

    nrf52_clock.h: fix duplicate definition
---
 arch/arm/src/nrf52/hardware/nrf52_clock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/nrf52/hardware/nrf52_clock.h b/arch/arm/src/nrf52/hardware/nrf52_clock.h
index 0e0ba0d..472bd4b 100644
--- a/arch/arm/src/nrf52/hardware/nrf52_clock.h
+++ b/arch/arm/src/nrf52/hardware/nrf52_clock.h
@@ -141,8 +141,8 @@
 #define CLOCK_LFCLKSRC_SRC_SHIFT        (0)       /* Bits 0-1: LFRC clock source */
 #define CLOCK_LFCLKSRC_SRC_MASK         (3 << CLOCK_LFCLKSRC_SRC_SHIFT)
 #  define CLOCK_LFCLKSRC_SRC_RC         (0 << CLOCK_LFCLKSRC_SRC_SHIFT)
-#  define CLOCK_LFCLKSRC_SRC_RC         (1 << CLOCK_LFCLKSRC_SRC_SHIFT)
-#  define CLOCK_LFCLKSRC_SRC_RC         (2 << CLOCK_LFCLKSRC_SRC_SHIFT)
+#  define CLOCK_LFCLKSRC_SRC_XTAL       (1 << CLOCK_LFCLKSRC_SRC_SHIFT)
+#  define CLOCK_LFCLKSRC_SRC_SYNTH      (2 << CLOCK_LFCLKSRC_SRC_SHIFT)
 #define CLOCK_LFCLKSRC_BYPASS           (1 << 16) /* Bit 16: Enable/disable bypass of LFCLK crystal oscillator */
 #define CLOCK_LFCLKSRC_EXTERNAL         (1 << 17) /* Bit 17: Enable/disable external source for LFCLK */