diff --git a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
index c6f0e8e3..5af9e81f 100644
--- a/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
+++ b/examples/stm32/f1/stm32vl-discovery/adc-dac-printf/adc-dac-printf.c
@@ -118,10 +118,10 @@ static void adc_setup(void)
 static void dac_setup(void)
 {
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO5);
-	dac_disable(CHANNEL_2);
-	dac_disable_waveform_generation(CHANNEL_2);
-	dac_enable(CHANNEL_2);
-	dac_set_trigger_source(DAC_CR_TSEL2_SW);
+	dac_disable(DAC1, DAC_CHANNEL2);
+	dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
+	dac_enable(DAC1, DAC_CHANNEL2);
+	dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
 }
 
 static uint16_t read_adc_naiive(uint8_t channel)
@@ -150,8 +150,9 @@ int main(void)
 	while (1) {
 		uint16_t input_adc0 = read_adc_naiive(0);
 		uint16_t target = input_adc0 / 2;
-		dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
-		dac_software_trigger(CHANNEL_2);
+		dac_load_data_buffer_single(
+				DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
+		dac_software_trigger(DAC1, DAC_CHANNEL2);
 		uint16_t input_adc1 = read_adc_naiive(1);
 		printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
 			j++, input_adc0, target, input_adc1);
diff --git a/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c
index 706d2aee..cf372306 100644
--- a/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c
+++ b/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c
@@ -109,10 +109,10 @@ static void adc_setup(void)
 static void dac_setup(void)
 {
 	gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO5);
-	dac_disable(CHANNEL_2);
-	dac_disable_waveform_generation(CHANNEL_2);
-	dac_enable(CHANNEL_2);
-	dac_set_trigger_source(DAC_CR_TSEL2_SW);
+	dac_disable(DAC1, DAC_CHANNEL2);
+	dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
+	dac_enable(DAC1, DAC_CHANNEL2);
+	dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
 }
 
 static uint16_t read_adc_naiive(uint8_t channel)
@@ -143,8 +143,9 @@ int main(void)
 	while (1) {
 		uint16_t input_adc0 = read_adc_naiive(0);
 		uint16_t target = input_adc0 / 2;
-		dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
-		dac_software_trigger(CHANNEL_2);
+		dac_load_data_buffer_single(
+				DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
+		dac_software_trigger(DAC1, DAC_CHANNEL2);
 		uint16_t input_adc1 = read_adc_naiive(1);
 		printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
 			j++, input_adc0, target, input_adc1);
diff --git a/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c b/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
index 94457251..cdd3dc07 100644
--- a/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
+++ b/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
@@ -107,10 +107,10 @@ static void dac_setup(void)
 	rcc_periph_clock_enable(RCC_DAC);
 	/* Setup the DAC channel 1, with timer 2 as trigger source.
 	 * Assume the DAC has woken up by the time the first transfer occurs */
-	dac_trigger_enable(CHANNEL_1);
-	dac_set_trigger_source(DAC_CR_TSEL1_T2);
-	dac_dma_enable(CHANNEL_1);
-	dac_enable(CHANNEL_1);
+	dac_trigger_enable(DAC1, DAC_CHANNEL1);
+	dac_set_trigger_source(DAC1, DAC_CR_TSEL1_T2);
+	dac_dma_enable(DAC1, DAC_CHANNEL1);
+	dac_enable(DAC1, DAC_CHANNEL1);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c
index 56360ca2..cb6865ac 100644
--- a/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c
+++ b/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c
@@ -110,10 +110,10 @@ static void adc_setup(void)
 static void dac_setup(void)
 {
 	gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO5);
-	dac_disable(CHANNEL_2);
-	dac_disable_waveform_generation(CHANNEL_2);
-	dac_enable(CHANNEL_2);
-	dac_set_trigger_source(DAC_CR_TSEL2_SW);
+	dac_disable(DAC1, DAC_CHANNEL2);
+	dac_disable_waveform_generation(DAC1, DAC_CHANNEL2);
+	dac_enable(DAC1, DAC_CHANNEL2);
+	dac_set_trigger_source(DAC1, DAC_CR_TSEL2_SW);
 }
 
 static uint16_t read_adc_naiive(uint8_t channel)
@@ -144,8 +144,9 @@ int main(void)
 	while (1) {
 		uint16_t input_adc0 = read_adc_naiive(0);
 		uint16_t target = input_adc0 / 2;
-		dac_load_data_buffer_single(target, RIGHT12, CHANNEL_2);
-		dac_software_trigger(CHANNEL_2);
+		dac_load_data_buffer_single(
+				DAC1, target, DAC_ALIGN_RIGHT12, DAC_CHANNEL2);
+		dac_software_trigger(DAC1, DAC_CHANNEL2);
 		uint16_t input_adc1 = read_adc_naiive(1);
 		printf("tick: %d: adc0= %u, target adc1=%d, adc1=%d\n",
 			j++, input_adc0, target, input_adc1);
diff --git a/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c b/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
index 7feeb7e6..bdecb697 100644
--- a/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
+++ b/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
@@ -108,10 +108,10 @@ static void dac_setup(void)
 	rcc_periph_clock_enable(RCC_DAC);
 	/* Setup the DAC channel 1, with timer 2 as trigger source.
 	 * Assume the DAC has woken up by the time the first transfer occurs */
-	dac_trigger_enable(CHANNEL_1);
-	dac_set_trigger_source(DAC_CR_TSEL1_T2);
-	dac_dma_enable(CHANNEL_1);
-	dac_enable(CHANNEL_1);
+	dac_trigger_enable(DAC1, DAC_CHANNEL1);
+	dac_set_trigger_source(DAC1, DAC_CR_TSEL1_T2);
+	dac_dma_enable(DAC1, DAC_CHANNEL1);
+	dac_enable(DAC1, DAC_CHANNEL1);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/libopencm3 b/libopencm3
index cb0661f8..55de5a17 160000
--- a/libopencm3
+++ b/libopencm3
@@ -1 +1 @@
-Subproject commit cb0661f81de5b1cae52ca99c7b5985b678176db7
+Subproject commit 55de5a1759a061a9527184e88b62285fea5249ff