diff --git a/cpu/nrf51/include/periph_cpu.h b/cpu/nrf51/include/periph_cpu.h
index 251bd319c7166af7f5b2e14b8fc4c46791740e84..bc368152fd0f77a78bb25951847405a0bf4f189b 100644
--- a/cpu/nrf51/include/periph_cpu.h
+++ b/cpu/nrf51/include/periph_cpu.h
@@ -54,6 +54,21 @@ typedef enum {
} i2c_speed_t;
/** @} */
+/**
+ * @brief Override ADC resolution values
+ * @{
+ */
+#define HAVE_ADC_RES_T
+typedef enum {
+ ADC_RES_6BIT = 0xf0, /**< ADC resolution: 6 bit (not supported) */
+ ADC_RES_8BIT = 0x00, /**< ADC resolution: 8 bit */
+ ADC_RES_10BIT = 0x02, /**< ADC resolution: 10 bit */
+ ADC_RES_12BIT = 0xf1, /**< ADC resolution: 12 bit (not supported) */
+ ADC_RES_14BIT = 0xf2, /**< ADC resolution: 14 bit (not supported) */
+ ADC_RES_16BIT = 0xf3 /**< ADC resolution: 16 bit (not supported) */
+} adc_res_t;
+/** @} */
+
/**
* @brief I2C (TWI) configuration options
*/
diff --git a/cpu/nrf52/Makefile.features b/cpu/nrf52/Makefile.features
index 7d12728b90a68dc1f4ce134b53fd28fe4cb22e6b..56ecba5a416cb9b33fafce76076a583a17a5805d 100644
--- a/cpu/nrf52/Makefile.features
+++ b/cpu/nrf52/Makefile.features
@@ -1 +1,4 @@
+# The ADC does not depend on any board configuration, so always available
+FEATURES_PROVIDED += periph_adc
+
-include $(RIOTCPU)/nrf5x_common/Makefile.features
diff --git a/cpu/nrf52/include/periph_cpu.h b/cpu/nrf52/include/periph_cpu.h
index 38c7726fc95c6637cac5abcf571664fafd3d83d5..bac6b6487e7c8d310ded0c09efe5b846338108a8 100644
--- a/cpu/nrf52/include/periph_cpu.h
+++ b/cpu/nrf52/include/periph_cpu.h
@@ -40,6 +40,41 @@ extern "C" {
#define SPI_MISOSEL (dev(bus)->PSEL.MISO)
/** @} */
+/**
+ * @brief The nRF52 family of CPUs provides a fixed number of 9 ADC lines
+ */
+#define ADC_NUMOF (9U)
+
+/**
+ * @brief nRF52 specific naming of ADC lines (for convenience)
+ */
+enum {
+ NRF52_AIN0 = 0, /**< Analog Input 0 */
+ NRF52_AIN1 = 1, /**< Analog Input 1 */
+ NRF52_AIN2 = 2, /**< Analog Input 2 */
+ NRF52_AIN3 = 3, /**< Analog Input 3 */
+ NRF52_AIN4 = 4, /**< Analog Input 4 */
+ NRF52_AIN5 = 5, /**< Analog Input 5 */
+ NRF52_AIN6 = 6, /**< Analog Input 6 */
+ NRF52_AIN7 = 7, /**< Analog Input 7 */
+ NRF52_VDD = 8, /**< VDD, not useful if VDD is reference... */
+};
+
+/**
+ * @brief Override ADC resolution values
+ * @{
+ */
+#define HAVE_ADC_RES_T
+typedef enum {
+ ADC_RES_6BIT = 0xf0, /**< not supported by hardware */
+ ADC_RES_8BIT = 0x00, /**< ADC resolution: 8 bit */
+ ADC_RES_10BIT = 0x01, /**< ADC resolution: 10 bit */
+ ADC_RES_12BIT = 0x02, /**< ADC resolution: 12 bit */
+ ADC_RES_14BIT = 0xf1, /**< supported with oversampling, not implemented */
+ ADC_RES_16BIT = 0xf2 /**< not supported by hardware */
+} adc_res_t;
+/** @} */
+
#ifdef __cplusplus
}
#endif
diff --git a/cpu/nrf52/periph/adc.c b/cpu/nrf52/periph/adc.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ecd219784d1a7780004e7b07b2e4c2e0139cdb7
--- /dev/null
+++ b/cpu/nrf52/periph/adc.c
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 HAW Hamburg
+ * 2017 Freie Universität Berlin
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup cpu_nrf52
+ * @{
+ *
+ * @file
+ * @brief Low-level ADC driver implementation
+ *
+ * @author Dimitri Nahm <dimitri.nahm@haw-hamburg.de>
+ * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
+ *
+ * @}
+ */
+
+#include "cpu.h"
+#include "mutex.h"
+#include "periph/adc.h"
+#include "periph_conf.h"
+
+/**
+ * @name Default ADC reference, gain configuration and acquisition time
+ *
+ * Can be overridden by the board configuration if needed. The default
+ * configuration uses the full VDD (typically 3V3) as reference and samples for
+ * 10us.
+ * @{
+ */
+#ifndef ADC_REF
+#define ADC_REF SAADC_CH_CONFIG_REFSEL_VDD1_4
+#endif
+#ifndef ADC_GAIN
+#define ADC_GAIN SAADC_CH_CONFIG_GAIN_Gain1_4
+#endif
+#ifndef ADC_TACQ
+#define ADC_TACQ SAADC_CH_CONFIG_TACQ_10us
+#endif
+/** @} */
+
+/**
+ * @brief Lock to prevent concurrency issues when used from different threads
+ */
+static mutex_t lock = MUTEX_INIT;
+
+/**
+ * @brief We use a static result buffer so we do not have to reprogram the
+ * result pointer register
+ */
+static int16_t result;
+
+static inline void prep(void)
+{
+ mutex_lock(&lock);
+ NRF_SAADC->ENABLE = 1;
+}
+
+static inline void done(void)
+{
+ NRF_SAADC->ENABLE = 0;
+ mutex_unlock(&lock);
+}
+
+int adc_init(adc_t line)
+{
+ if (line >= ADC_NUMOF) {
+ return -1;
+ }
+
+ prep();
+
+ /* prevent multiple initialization by checking the result ptr register */
+ if (NRF_SAADC->RESULT.PTR != (uint32_t)&result) {
+ /* set data pointer and the single channel we want to convert */
+ NRF_SAADC->RESULT.MAXCNT = 1;
+ NRF_SAADC->RESULT.PTR = (uint32_t)&result;
+
+ /* configure the first channel (the only one we use):
+ * - bypass resistor ladder+
+ * - acquisition time as defined by board (or 10us as default)
+ * - reference and gain as defined by board (or VDD as default)
+ * - no oversampling */
+ NRF_SAADC->CH[0].CONFIG = ((ADC_GAIN << SAADC_CH_CONFIG_GAIN_Pos) |
+ (ADC_REF << SAADC_CH_CONFIG_REFSEL_Pos) |
+ (ADC_TACQ << SAADC_CH_CONFIG_TACQ_Pos));
+ NRF_SAADC->CH[0].PSELN = SAADC_CH_PSELN_PSELN_NC;
+ NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Bypass;
+
+ /* calibrate SAADC */
+ NRF_SAADC->EVENTS_CALIBRATEDONE = 0;
+ NRF_SAADC->TASKS_CALIBRATEOFFSET = 1;
+ while (NRF_SAADC->EVENTS_CALIBRATEDONE == 0) {}
+ }
+
+ done();
+
+ return 0;
+}
+
+int adc_sample(adc_t line, adc_res_t res)
+{
+ assert(line < ADC_NUMOF);
+
+ /* check if resolution is valid */
+ if (res > 2) {
+ return -1;
+ }
+
+ /* prepare device */
+ prep();
+
+ /* set resolution */
+ NRF_SAADC->RESOLUTION = res;
+ /* set line to sample */
+ NRF_SAADC->CH[0].PSELP = (line + 1);
+
+ /* start the SAADC and wait for the started event */
+ NRF_SAADC->EVENTS_STARTED = 0;
+ NRF_SAADC->TASKS_START = 1;
+ while (NRF_SAADC->EVENTS_STARTED == 0) {}
+
+ /* trigger the actual conversion */
+ NRF_SAADC->EVENTS_END = 0;
+ NRF_SAADC->TASKS_SAMPLE = 1;
+ while (NRF_SAADC->EVENTS_END == 0) {}
+
+ /* stop the SAADC */
+ NRF_SAADC->EVENTS_STOPPED = 0;
+ NRF_SAADC->TASKS_STOP = 1;
+ while (NRF_SAADC->EVENTS_STOPPED == 0) {}
+
+ /* free device */
+ done();
+
+ /* hack -> the result can be a small negative number when a AINx pin is
+ * connected via jumper wire a the board's GND pin. There seems to be a
+ * slight difference between the internal CPU GND and the board's GND
+ * voltage levels?! (observed on nrf52dk and nrf52840dk) */
+ return (result < 0) ? 0 : (int)result;
+}
diff --git a/cpu/nrf5x_common/include/periph_cpu_common.h b/cpu/nrf5x_common/include/periph_cpu_common.h
index 78d1ab0491bc050bc2cc63fe8142d0f12edecafd..608883c8e6a8f53379826f81b44b84b17edafa08 100644
--- a/cpu/nrf5x_common/include/periph_cpu_common.h
+++ b/cpu/nrf5x_common/include/periph_cpu_common.h
@@ -109,21 +109,6 @@ typedef enum {
GPIO_BOTH = 3 /**< emit interrupt on both flanks */
} gpio_flank_t;
/** @} */
-
-/**
- * @brief Override ADC resolution values
- * @{
- */
-#define HAVE_ADC_RES_T
-typedef enum {
- ADC_RES_6BIT = 0xf0, /**< ADC resolution: 6 bit */
- ADC_RES_8BIT = 0x00, /**< ADC resolution: 8 bit */
- ADC_RES_10BIT = 0x02, /**< ADC resolution: 10 bit */
- ADC_RES_12BIT = 0xf1, /**< ADC resolution: 12 bit */
- ADC_RES_14BIT = 0xf2, /**< ADC resolution: 14 bit */
- ADC_RES_16BIT = 0xf3 /**< ADC resolution: 16 bit */
-} adc_res_t;
-/** @} */
#endif /* ndef DOXYGEN */
/**