diff --git a/examples/stm32/f1/lisa-m-1/can/can.c b/examples/stm32/f1/lisa-m-1/can/can.c
index b25ff37..3673996 100644
--- a/examples/stm32/f1/lisa-m-1/can/can.c
+++ b/examples/stm32/f1/lisa-m-1/can/can.c
@@ -50,16 +50,16 @@ struct can_rx_msg can_rx_msg;
 static void gpio_setup(void)
 {
         /* Enable Alternate Function clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Preconfigure LEDs. */
 	gpio_set(GPIOA, GPIO8);  /* LED0 off */
@@ -103,9 +103,9 @@ static void systick_setup(void)
 static void can_setup(void)
 {
 	/* Enable peripheral clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_CANEN);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_CAN);
 
 	AFIO_MAPR |= AFIO_MAPR_CAN1_REMAP_PORTB;
 
diff --git a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
index 750e4eb..e2427e8 100644
--- a/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/lisa-m-1/fancyblink/fancyblink.c
@@ -27,9 +27,9 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOB, GPIOC, and AFIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_AFIO);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
index e23b98c..e9bf0a1 100644
--- a/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/lisa-m-1/usb_cdcacm/cdcacm.c
@@ -242,8 +242,8 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	gpio_set(GPIOC, GPIO2);
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
index 33f5a77..f78270c 100644
--- a/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
@@ -233,7 +233,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	if (!gpio_get(GPIOA, GPIO10)) {
 		/* Boot the application if it's valid. */
@@ -250,8 +250,8 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	gpio_set(GPIOC, GPIO2);
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
diff --git a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
index a74b9e6..dd84f80 100644
--- a/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
+++ b/examples/stm32/f1/lisa-m-1/usb_hid/usbhid.c
@@ -325,11 +325,11 @@ int main(void)
 
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_SPI2);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	/* Configure SPI2: PB13(SCK), PB14(MISO), PB15(MOSI). */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_10_MHZ,
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
index 4503b3f..d8116c3 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec/adc_injec.c
@@ -28,8 +28,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -50,8 +50,8 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup the LEDs. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -64,7 +64,7 @@ static void adc_setup(void)
 {
 	int i;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
index 1bee9c7..a318a1b 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig/adc_injec_timtrig.c
@@ -29,8 +29,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -51,8 +51,8 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup the LEDs. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -65,14 +65,9 @@ static void timer_setup(void)
 {
 	/* Set up the timer TIM2 for injected sampling */
 	uint32_t timer;
-    volatile uint32_t *rcc_apbenr;
-    uint32_t rcc_apb;
 
 	timer   = TIM2;
-    rcc_apbenr = &RCC_APB1ENR;
-    rcc_apb = RCC_APB1ENR_TIM2EN;
-
-	rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+	rcc_periph_clock_enable(RCC_TIM2);
 
 	/* Time Base configuration */
     timer_reset(timer);
@@ -89,8 +84,7 @@ static void timer_setup(void)
 static void adc_setup(void)
 {
 	int i;
-
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
index 080614a..1adf6f7 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq/adc_injec_timtrig_irq.c
@@ -32,8 +32,8 @@ volatile uint16_t temperature = 0;
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -54,8 +54,8 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup the LEDs. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -68,14 +68,9 @@ static void timer_setup(void)
 {
 	/* Set up the timer TIM2 for injected sampling */
 	uint32_t timer;
-    volatile uint32_t *rcc_apbenr;
-    uint32_t rcc_apb;
 
 	timer   = TIM2;
-    rcc_apbenr = &RCC_APB1ENR;
-    rcc_apb = RCC_APB1ENR_TIM2EN;
-
-	rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+	rcc_periph_clock_enable(RCC_TIM2);
 
 	/* Time Base configuration */
     timer_reset(timer);
@@ -100,7 +95,7 @@ static void adc_setup(void)
 {
 	int i;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
index 380c9e7..791b3fe 100644
--- a/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
+++ b/examples/stm32/f1/lisa-m-2/adc_injec_timtrig_irq_4ch/adc_injec_timtrig_irq_4ch.c
@@ -36,8 +36,8 @@ uint8_t channel_array[4]; /* for injected sampling, 4 channels max, for regular,
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -58,8 +58,8 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup the LEDs. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -76,14 +76,9 @@ static void timer_setup(void)
 {
 	/* Set up the timer TIM2 for injected sampling */
 	uint32_t timer;
-    volatile uint32_t *rcc_apbenr;
-    uint32_t rcc_apb;
 
 	timer   = TIM2;
-    rcc_apbenr = &RCC_APB1ENR;
-    rcc_apb = RCC_APB1ENR_TIM2EN;
-
-	rcc_peripheral_enable_clock(rcc_apbenr, rcc_apb);
+	rcc_periph_clock_enable(RCC_TIM2);
 
 	/* Time Base configuration */
     timer_reset(timer);
@@ -108,7 +103,7 @@ static void adc_setup(void)
 {
 	int i;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
index e06b219..d617d63 100644
--- a/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
+++ b/examples/stm32/f1/lisa-m-2/adc_regular/adc.c
@@ -28,8 +28,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -50,8 +50,8 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup the LEDs. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
@@ -64,7 +64,7 @@ static void adc_setup(void)
 {
 	int i;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/lisa-m-2/can/can.c b/examples/stm32/f1/lisa-m-2/can/can.c
index 73de09a..5703a4f 100644
--- a/examples/stm32/f1/lisa-m-2/can/can.c
+++ b/examples/stm32/f1/lisa-m-2/can/can.c
@@ -50,16 +50,16 @@ struct can_rx_msg can_rx_msg;
 static void gpio_setup(void)
 {
         /* Enable Alternate Function clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Preconfigure LEDs. */
 	gpio_set(GPIOA, GPIO8);  /* LED1 off */
@@ -103,9 +103,9 @@ static void systick_setup(void)
 static void can_setup(void)
 {
 	/* Enable peripheral clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_CAN1EN);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_CAN1);
 
 	AFIO_MAPR |= AFIO_MAPR_CAN1_REMAP_PORTB;
 
diff --git a/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
index 45fa0c8..6be5d3d 100644
--- a/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/lisa-m-2/fancyblink/fancyblink.c
@@ -27,10 +27,10 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC, and AFIO clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_AFIO);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/lisa-m-2/spi/spi.c b/examples/stm32/f1/lisa-m-2/spi/spi.c
index f6e4e73..f94aaeb 100644
--- a/examples/stm32/f1/lisa-m-2/spi/spi.c
+++ b/examples/stm32/f1/lisa-m-2/spi/spi.c
@@ -34,19 +34,17 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Enable SPI1 Periph and gpio clocks */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_SPI1EN);
-
+	rcc_periph_clock_enable(RCC_SPI1);
 }
 
 static void spi_setup(void) {
diff --git a/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c b/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
index 035096c..bf948ba 100644
--- a/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
+++ b/examples/stm32/f1/lisa-m-2/spi_dma/spi_dma.c
@@ -54,21 +54,20 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Enable SPI1 Periph and gpio clocks */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_SPI1EN);
+	rcc_periph_clock_enable(RCC_SPI1);
 
 	/* Enable DMA1 clock */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN);
+	rcc_periph_clock_enable(RCC_DMA1);
 }
 
 static void spi_setup(void) {
diff --git a/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c b/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
index c959720..2182865 100644
--- a/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
+++ b/examples/stm32/f1/lisa-m-2/spi_dma_adv/spi_dma_adv.c
@@ -64,21 +64,20 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Enable SPI1 Periph and gpio clocks */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_SPI1EN);
+	rcc_periph_clock_enable(RCC_SPI1);
 
 	/* Enable DMA1 clock */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN);
+	rcc_periph_clock_enable(RCC_DMA1);
 }
 
 static void spi_setup(void) {
diff --git a/examples/stm32/f1/lisa-m-2/usart/usart.c b/examples/stm32/f1/lisa-m-2/usart/usart.c
index 5431e88..06cdaeb 100644
--- a/examples/stm32/f1/lisa-m-2/usart/usart.c
+++ b/examples/stm32/f1/lisa-m-2/usart/usart.c
@@ -26,13 +26,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART3_TX) and USART3. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR,
-				    RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
index da74761..887f376 100644
--- a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
+++ b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
@@ -28,16 +28,15 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA, GPIOB, GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART3_TX) and USART3. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR,
-				    RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* Enable DMA1 clock */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN);
+	rcc_periph_clock_enable(RCC_DMA1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c b/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
index 2b9a27c..1c237c7 100644
--- a/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/lisa-m-2/usart_irq/usart_irq.c
@@ -27,13 +27,13 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
index bc2139d..a8e3bbe 100644
--- a/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32/f1/lisa-m-2/usart_irq_printf/usart_irq_printf.c
@@ -120,12 +120,11 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c b/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
index 04f47ca..ce6f5bb 100644
--- a/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
+++ b/examples/stm32/f1/lisa-m-2/usart_printf/usart_printf.c
@@ -32,12 +32,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/mb525/fancyblink/fancyblink.c b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
index 2096eae..d40c327 100644
--- a/examples/stm32/f1/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
@@ -26,7 +26,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/mb525/pwmleds/pwmleds.c b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
index 8d96e71..7621393 100644
--- a/examples/stm32/f1/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
@@ -241,11 +241,11 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable TIM1 clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_TIM1EN);
+	rcc_periph_clock_enable(RCC_TIM1);
 
 	/* Enable GPIOC, Alternate Function clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-			RCC_APB2ENR_IOPAEN | RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/obldc-strip/can/can.c b/examples/stm32/f1/obldc-strip/can/can.c
index 6584e43..fc21809 100644
--- a/examples/stm32/f1/obldc-strip/can/can.c
+++ b/examples/stm32/f1/obldc-strip/can/can.c
@@ -49,10 +49,10 @@ struct can_rx_msg can_rx_msg;
 static void gpio_setup(void)
 {
         /* Enable Alternate Function clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Preconfigure LEDs. */
 	gpio_set(GPIOB, GPIO4);  /* LED green off */
@@ -87,9 +87,9 @@ static void systick_setup(void)
 static void can_setup(void)
 {
 	/* Enable peripheral clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_CAN1EN);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_CAN1);
 
 	AFIO_MAPR |= AFIO_MAPR_CAN1_REMAP_PORTB;
 
diff --git a/examples/stm32/f1/obldc-strip/led/led.c b/examples/stm32/f1/obldc-strip/led/led.c
index 32dc95e..c4a89e1 100644
--- a/examples/stm32/f1/obldc-strip/led/led.c
+++ b/examples/stm32/f1/obldc-strip/led/led.c
@@ -26,10 +26,10 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hsi_out_64mhz();
 
 	/* Enable alternate function peripheral clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/obldc-strip/systick/systick.c b/examples/stm32/f1/obldc-strip/systick/systick.c
index 44b9e15..17bed8c 100644
--- a/examples/stm32/f1/obldc-strip/systick/systick.c
+++ b/examples/stm32/f1/obldc-strip/systick/systick.c
@@ -28,10 +28,10 @@ uint32_t temp32;
 static void gpio_setup(void)
 {
 	/* Enable alternate function peripheral clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	gpio_clear(GPIOB, GPIO4); /* LED green on */
 	gpio_set(GPIOB, GPIO5);   /* LED red off */
diff --git a/examples/stm32/f1/obldc-strip/usart/usart.c b/examples/stm32/f1/obldc-strip/usart/usart.c
index 7b1b0aa..a785173 100644
--- a/examples/stm32/f1/obldc-strip/usart/usart.c
+++ b/examples/stm32/f1/obldc-strip/usart/usart.c
@@ -26,9 +26,9 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hsi_out_64mhz();
 
 	/* Enable clocks for GPIO port B (for GPIO_USART1_TX and LED) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/obldc/can/can.c b/examples/stm32/f1/obldc/can/can.c
index c8156b6..5b6d4f7 100644
--- a/examples/stm32/f1/obldc/can/can.c
+++ b/examples/stm32/f1/obldc/can/can.c
@@ -50,10 +50,10 @@ struct can_rx_msg can_rx_msg;
 static void gpio_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	gpio_set(GPIOA, GPIO6); /* LED0 off */
 	gpio_set(GPIOA, GPIO7); /* LED1 off */
@@ -91,9 +91,9 @@ static void systick_setup(void)
 static void can_setup(void)
 {
 	/* Enable peripheral clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_CANEN);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_CAN);
 
 	/* Configure CAN pin: RX (input pull-up). */
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
diff --git a/examples/stm32/f1/obldc/led/led.c b/examples/stm32/f1/obldc/led/led.c
index 71a009d..300fc06 100644
--- a/examples/stm32/f1/obldc/led/led.c
+++ b/examples/stm32/f1/obldc/led/led.c
@@ -27,10 +27,10 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/obldc/pwmleds/pwmleds.c b/examples/stm32/f1/obldc/pwmleds/pwmleds.c
index 5fff7e7..a421ec2 100644
--- a/examples/stm32/f1/obldc/pwmleds/pwmleds.c
+++ b/examples/stm32/f1/obldc/pwmleds/pwmleds.c
@@ -241,13 +241,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable TIM3 clock. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM3EN);
+	rcc_periph_clock_enable(RCC_TIM3);
 
 	/* Enable GPIOC, Alternate Function clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_AFIO);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/obldc/systick/systick.c b/examples/stm32/f1/obldc/systick/systick.c
index 1d633c3..9af1e8e 100644
--- a/examples/stm32/f1/obldc/systick/systick.c
+++ b/examples/stm32/f1/obldc/systick/systick.c
@@ -29,10 +29,10 @@ uint32_t temp32;
 static void gpio_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	gpio_set(GPIOA, GPIO6); /* LED0 off */
 	gpio_set(GPIOA, GPIO7); /* LED1 off */
diff --git a/examples/stm32/f1/obldc/usart/usart.c b/examples/stm32/f1/obldc/usart/usart.c
index 5a03eb6..64cee3a 100644
--- a/examples/stm32/f1/obldc/usart/usart.c
+++ b/examples/stm32/f1/obldc/usart/usart.c
@@ -26,12 +26,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/obldc/usart_irq/usart_irq.c b/examples/stm32/f1/obldc/usart_irq/usart_irq.c
index ef3b60a..60a6d9b 100644
--- a/examples/stm32/f1/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/obldc/usart_irq/usart_irq.c
@@ -27,12 +27,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c
index fb0069a..5b023b0 100644
--- a/examples/stm32/f1/other/adc_temperature_sensor/adc.c
+++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c
@@ -26,8 +26,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -48,7 +48,7 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
@@ -61,7 +61,7 @@ static void adc_setup(void)
 {
 	int i;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 
 	/* Make sure the ADC doesn't run during config. */
 	adc_off(ADC1);
diff --git a/examples/stm32/f1/other/dma_mem2mem/dma.c b/examples/stm32/f1/other/dma_mem2mem/dma.c
index 952e41e..9b70175 100644
--- a/examples/stm32/f1/other/dma_mem2mem/dma.c
+++ b/examples/stm32/f1/other/dma_mem2mem/dma.c
@@ -26,8 +26,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -48,7 +48,7 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
@@ -84,7 +84,7 @@ int main(void)
 	my_usart_print_string(USART1, "s1 ");
 	my_usart_print_string(USART1, s1);
 
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN);
+	rcc_periph_clock_enable(RCC_DMA1);
 
 	/* MEM2MEM mode for channel 1. */
 	dma_enable_mem2mem_mode(DMA1, DMA_CHANNEL1);
diff --git a/examples/stm32/f1/other/dogm128/main.c b/examples/stm32/f1/other/dogm128/main.c
index ade4712..e06a147 100644
--- a/examples/stm32/f1/other/dogm128/main.c
+++ b/examples/stm32/f1/other/dogm128/main.c
@@ -29,7 +29,7 @@
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
@@ -57,7 +57,7 @@ static void spi_setup(void)
 {
 	/* The DOGM128 display is connected to SPI2, so initialise it. */
 
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
+	rcc_periph_clock_enable(RCC_SPI2);
 
 	spi_set_unidirectional_mode(DOGM128_SPI); /* We want to send only. */
 	spi_disable_crc(DOGM128_SPI); /* No CRC for this slave. */
diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
index 31d91d3..dab2151 100644
--- a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
+++ b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
@@ -27,8 +27,8 @@
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 
 	/* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
@@ -49,7 +49,7 @@ static void usart_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
@@ -61,8 +61,8 @@ static void gpio_setup(void)
 static void i2c_setup(void)
 {
 	/* Enable clocks for I2C2 and AFIO. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_I2C2EN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_I2C2);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Set alternate functions for the SCL and SDA pins of I2C2. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
diff --git a/examples/stm32/f1/other/rtc/rtc.c b/examples/stm32/f1/other/rtc/rtc.c
index 092d1df..e45cc15 100644
--- a/examples/stm32/f1/other/rtc/rtc.c
+++ b/examples/stm32/f1/other/rtc/rtc.c
@@ -29,11 +29,11 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/other/systick/systick.c b/examples/stm32/f1/other/systick/systick.c
index 53cf867..09e1f48 100644
--- a/examples/stm32/f1/other/systick/systick.c
+++ b/examples/stm32/f1/other/systick/systick.c
@@ -28,7 +28,7 @@ uint32_t temp32;
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/f1/other/timer_interrupt/timer.c b/examples/stm32/f1/other/timer_interrupt/timer.c
index f17c3d4..77ff030 100644
--- a/examples/stm32/f1/other/timer_interrupt/timer.c
+++ b/examples/stm32/f1/other/timer_interrupt/timer.c
@@ -26,7 +26,7 @@
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */
 	gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
@@ -57,7 +57,7 @@ int main(void)
 	gpio_clear(GPIOB, GPIO7);	/* LED1 on */
 	gpio_set(GPIOB, GPIO6);		/* LED2 off */
 
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM2EN);
+	rcc_periph_clock_enable(RCC_TIM2);
 
 	/*
 	 * The goal is to let the LED2 glow for a second and then be
diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
index 2069e43..3fdca15 100644
--- a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
@@ -237,8 +237,8 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 
diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c
index 7db2eec..e589079 100644
--- a/examples/stm32/f1/other/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/other/usb_dfu/usbdfu.c
@@ -233,7 +233,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	if (!gpio_get(GPIOA, GPIO10)) {
 		/* Boot the application if it's valid. */
@@ -250,13 +250,13 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
 
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_control_callback(
diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
index d95595c..84f474c 100644
--- a/examples/stm32/f1/other/usb_hid/usbhid.c
+++ b/examples/stm32/f1/other/usb_hid/usbhid.c
@@ -279,8 +279,8 @@ int main(void)
 {
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
diff --git a/examples/stm32/f1/stm32-h103/button/button.c b/examples/stm32/f1/stm32-h103/button/button.c
index aca9b6d..84bc180 100644
--- a/examples/stm32/f1/stm32-h103/button/button.c
+++ b/examples/stm32/f1/stm32-h103/button/button.c
@@ -34,7 +34,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -44,7 +44,7 @@ static void gpio_setup(void)
 static void button_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Set GPIO0 (in GPIO port A) to 'input open-drain'. */
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO0);
diff --git a/examples/stm32/f1/stm32-h103/exti_both/exti_both.c b/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
index 8a8ac1a..16b9903 100644
--- a/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
+++ b/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
@@ -34,7 +34,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -44,10 +44,10 @@ static void gpio_setup(void)
 static void exti_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable AFIO clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable EXTI0 interrupt. */
 	nvic_enable_irq(NVIC_EXTI0_IRQ);
diff --git a/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
index 3ac08c9..438d266 100644
--- a/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
+++ b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
@@ -37,7 +37,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -47,10 +47,10 @@ static void gpio_setup(void)
 static void exti_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable AFIO clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable EXTI0 interrupt. */
 	nvic_enable_irq(NVIC_EXTI0_IRQ);
diff --git a/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
index 2d04481..4948e5c 100644
--- a/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
@@ -26,7 +26,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
index 2994b82..74794e4 100644
--- a/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
+++ b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
@@ -68,8 +68,8 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOB and GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_GPIOB);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/miniblink/miniblink.c b/examples/stm32/f1/stm32-h103/miniblink/miniblink.c
index 51e469f..d164339 100644
--- a/examples/stm32/f1/stm32-h103/miniblink/miniblink.c
+++ b/examples/stm32/f1/stm32-h103/miniblink/miniblink.c
@@ -26,7 +26,7 @@ static void gpio_setup(void)
 	/* Manually: */
 	// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	/* Manually: */
diff --git a/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
index 0556cc4..ce82a8c 100644
--- a/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
+++ b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
@@ -36,7 +36,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -46,10 +46,10 @@ static void gpio_setup(void)
 static void exti_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable AFIO clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/* Enable EXTI0 interrupt. */
 	nvic_enable_irq(NVIC_EXTI0_IRQ);
@@ -83,12 +83,12 @@ void exti0_isr(void)
 static void tim_setup(void)
 {
 	/* Enable TIM1 clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_TIM1EN);
+	rcc_periph_clock_enable(RCC_TIM1);
 
 	/* Enable GPIOA, GPIOB and Alternate Function clocks. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_IOPBEN | RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	/*
 	 * Set TIM1 channel output pins to
diff --git a/examples/stm32/f1/stm32-h103/timer/timer.c b/examples/stm32/f1/stm32-h103/timer/timer.c
index bd513f1..03189ac 100644
--- a/examples/stm32/f1/stm32-h103/timer/timer.c
+++ b/examples/stm32/f1/stm32-h103/timer/timer.c
@@ -59,7 +59,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -71,7 +71,7 @@ static void gpio_setup(void)
 static void tim_setup(void)
 {
 	/* Enable TIM2 clock. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM2EN);
+	rcc_periph_clock_enable(RCC_TIM2);
 
 	/* Enable TIM2 interrupt. */
 	nvic_enable_irq(NVIC_TIM2_IRQ);
diff --git a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
index 00f74ba..8ca27eb 100644
--- a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
+++ b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
@@ -30,7 +30,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void trace_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/usart/usart.c b/examples/stm32/f1/stm32-h103/usart/usart.c
index 442f8de..445cc81 100644
--- a/examples/stm32/f1/stm32-h103/usart/usart.c
+++ b/examples/stm32/f1/stm32-h103/usart/usart.c
@@ -26,15 +26,14 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR,
-				    RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port B (for GPIO_USART3_TX) and USART3. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR,
-				    RCC_APB1ENR_USART2EN |
-				    RCC_APB1ENR_USART3EN);
+	rcc_periph_clock_enable(RCC_USART1);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_USART3);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
index b3c570b..0fb9b76 100644
--- a/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
@@ -27,11 +27,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN | RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
index 5c8d2dd..8034f80 100644
--- a/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
@@ -120,11 +120,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN | RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
index 39819a9..8051b68 100644
--- a/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
+++ b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
@@ -32,11 +32,12 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock (for LED GPIOs). */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_AFIOEN | RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
index a36f634..c1015f6 100644
--- a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -240,7 +240,7 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	gpio_set(GPIOC, GPIO11);
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
index 2ba5ca4..e3e0f32 100644
--- a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
@@ -233,7 +233,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	if (!gpio_get(GPIOA, GPIO10)) {
 		/* Boot the application if it's valid. */
@@ -250,7 +250,7 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
 		      GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
diff --git a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
index 6af754c..ee63e72 100644
--- a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
@@ -280,7 +280,7 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	gpio_set(GPIOC, GPIO11);
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
index 21d3db0..784ce28 100644
--- a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
@@ -233,7 +233,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	if (!gpio_get(GPIOA, GPIO10)) {
 		/* Boot the application if it's valid. */
@@ -250,8 +250,8 @@ int main(void)
 
 	rcc_clock_setup_in_hsi_out_48mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
 
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
diff --git a/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
index 69ea33c..e339328 100644
--- a/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
@@ -27,7 +27,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_25mhz_out_72mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c b/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
index c6dbe7c..e98f0c7 100644
--- a/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
+++ b/examples/stm32/f1/stm32-h107/flash_rw_example/flash_rw_example.c
@@ -86,7 +86,9 @@ static void init_system(void)
 
 static void init_usart(void)
 {
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN | RCC_APB2ENR_IOPAEN | RCC_APB2ENR_AFIOEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_AFIO);
+	rcc_periph_clock_enable(RCC_USART1);
 
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
diff --git a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
index d2fae5e..ce0d66a 100644
--- a/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
+++ b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
@@ -102,9 +102,9 @@ int main(void)
 
 	rcc_clock_setup_in_hse_25mhz_out_72mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	/* LED output */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/f1/stm32-maple/miniblink/miniblink.c b/examples/stm32/f1/stm32-maple/miniblink/miniblink.c
index 19ca5fd..9d26ca1 100644
--- a/examples/stm32/f1/stm32-maple/miniblink/miniblink.c
+++ b/examples/stm32/f1/stm32-maple/miniblink/miniblink.c
@@ -26,7 +26,7 @@ static void gpio_setup(void)
 	/* Manually: */
 	// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO5 (in GPIO port A) to 'output push-pull'. */
 	/* Manually: */
diff --git a/examples/stm32/f1/stm32-maple/usart/usart.c b/examples/stm32/f1/stm32-maple/usart/usart.c
index 7d91f1d..449c97c 100644
--- a/examples/stm32/f1/stm32-maple/usart/usart.c
+++ b/examples/stm32/f1/stm32-maple/usart/usart.c
@@ -26,10 +26,10 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
index aeb4310..d8458ab 100644
--- a/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
+++ b/examples/stm32/f1/stm32-maple/usart_irq/usart_irq.c
@@ -28,10 +28,10 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for GPIO port A (for LED GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
index edd3ba5..4422508 100644
--- a/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
@@ -243,8 +243,8 @@ int main(void)
 
 	rcc_clock_setup_in_hse_8mhz_out_72mhz();
 
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-				    RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Setup GPIOC Pin 12 to pull up the D+ high, so autodect works
 	 * with the bootloader.  The circuit is active low. */
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 02bd215..6a57abe 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
@@ -39,13 +39,13 @@ static void clock_setup(void)
 {
 	rcc_clock_setup_in_hsi_out_24mhz();
 	/* Enable clocks for USART2 and DAC*/
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_DACEN);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_DAC);
 
 	/* and the ADC and IO ports */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_ADC1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32vl-discovery/button/button.c b/examples/stm32/f1/stm32vl-discovery/button/button.c
index 4461611..41bdda0 100644
--- a/examples/stm32/f1/stm32vl-discovery/button/button.c
+++ b/examples/stm32/f1/stm32vl-discovery/button/button.c
@@ -32,7 +32,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO9 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -42,7 +42,7 @@ static void gpio_setup(void)
 static void button_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Set GPIO0 (in GPIO port A) to 'input open-drain'. */
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO0);
diff --git a/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c b/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
index f04a0ce..2d9e125 100644
--- a/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/stm32vl-discovery/fancyblink/fancyblink.c
@@ -28,7 +28,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_24mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/stm32vl-discovery/miniblink/miniblink.c b/examples/stm32/f1/stm32vl-discovery/miniblink/miniblink.c
index 82efa5c..d9bee4c 100644
--- a/examples/stm32/f1/stm32vl-discovery/miniblink/miniblink.c
+++ b/examples/stm32/f1/stm32vl-discovery/miniblink/miniblink.c
@@ -26,7 +26,7 @@ static void gpio_setup(void)
 	/* Manually: */
 	// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO8 (in GPIO port C) to 'output push-pull'. */
 	/* Manually: */
diff --git a/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c b/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
index 4b71d3c..c85fb3c 100644
--- a/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
+++ b/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
@@ -30,11 +30,11 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_24mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/stm32vl-discovery/usart/usart.c b/examples/stm32/f1/stm32vl-discovery/usart/usart.c
index 3976505..3a5a973 100644
--- a/examples/stm32/f1/stm32vl-discovery/usart/usart.c
+++ b/examples/stm32/f1/stm32vl-discovery/usart/usart.c
@@ -26,11 +26,11 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_24mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_USART1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f1/waveshare-open103r/button/button.c b/examples/stm32/f1/waveshare-open103r/button/button.c
index fced818..036ea46 100644
--- a/examples/stm32/f1/waveshare-open103r/button/button.c
+++ b/examples/stm32/f1/waveshare-open103r/button/button.c
@@ -33,7 +33,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO9 (in GPIO port C) to 'output push-pull'. */
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
@@ -43,7 +43,7 @@ static void gpio_setup(void)
 static void button_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Set GPIO9 (in GPIO port A) to 'input with pull-up resistor'. */
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
diff --git a/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c b/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
index 117340b..ce02958 100644
--- a/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/waveshare-open103r/fancyblink/fancyblink.c
@@ -29,7 +29,7 @@ static void clock_setup(void)
 	rcc_clock_setup_in_hse_8mhz_out_24mhz();
 
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f1/waveshare-open103r/joystick/joystick.c b/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
index 69ce194..c4272d3 100644
--- a/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
+++ b/examples/stm32/f1/waveshare-open103r/joystick/joystick.c
@@ -53,7 +53,7 @@ static void clock_setup(void)
 static void led_setup(void)
 {
   /* Enable GPIOC clock. */
-  rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+  rcc_periph_clock_enable(RCC_GPIOC);
   /* Set LEDs to output push-pull. */
   gpio_set_mode(LED_PORT, GPIO_MODE_OUTPUT_2_MHZ,
 		GPIO_CNF_OUTPUT_PUSHPULL, LED_ALL);
@@ -64,7 +64,7 @@ static void led_setup(void)
 static void joystick_setup(void)
 {
   /* Enable GPIOA clock. */
-  rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
+  rcc_periph_clock_enable(RCC_GPIOA);
   /* Set joystick pins to input. */
   gpio_set_mode(JOY_PORT, GPIO_MODE_INPUT,
 		GPIO_CNF_INPUT_PULL_UPDOWN,
diff --git a/examples/stm32/f1/waveshare-open103r/miniblink/miniblink.c b/examples/stm32/f1/waveshare-open103r/miniblink/miniblink.c
index b14e35a..a392ee7 100644
--- a/examples/stm32/f1/waveshare-open103r/miniblink/miniblink.c
+++ b/examples/stm32/f1/waveshare-open103r/miniblink/miniblink.c
@@ -27,7 +27,7 @@ static void gpio_setup(void)
 	/* Manually: */
 	// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO9 (in GPIO port C) to 'output push-pull'. */
 	/* Manually: */
diff --git a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
index 2062af6..bc891d4 100644
--- a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
+++ b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
@@ -247,7 +247,7 @@ int main(void)
   usbd_device *usbd_dev;
 
   rcc_clock_setup_in_hsi_out_48mhz();
-  rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN);
+  rcc_periph_clock_enable(RCC_AFIO);
 
   AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 
diff --git a/examples/stm32/f2/jobygps/miniblink/miniblink.c b/examples/stm32/f2/jobygps/miniblink/miniblink.c
index 7dfaebe..dca494b 100644
--- a/examples/stm32/f2/jobygps/miniblink/miniblink.c
+++ b/examples/stm32/f2/jobygps/miniblink/miniblink.c
@@ -24,7 +24,7 @@
 static void gpio_setup(void)
 {
 	/* Enable GPIOC clock. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPCEN);
+	rcc_periph_clock_enable(RCC_GPIOC);
 
 	/* Set GPIO3 and GPIO4 (in GPIO port C) to 'output push-pull'. */
 	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3 | GPIO4);
diff --git a/examples/stm32/f2/jobygps/spi_test/spi_test.c b/examples/stm32/f2/jobygps/spi_test/spi_test.c
index 3fb3b0c..bb570c2 100644
--- a/examples/stm32/f2/jobygps/spi_test/spi_test.c
+++ b/examples/stm32/f2/jobygps/spi_test/spi_test.c
@@ -31,10 +31,11 @@ int _write(int file, char *ptr, int len);
 static void clock_setup(void)
 {
 	/* Enable clocks on all the peripherals we are going to use. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR,
-		RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN | RCC_AHB1ENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_SPI2);
+	rcc_periph_clock_enable(RCC_USART1);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
+	rcc_periph_clock_enable(RCC_GPIOC);
 }
 
 static void spi_setup(void)
diff --git a/examples/stm32/f2/jobygps/usart_printf/usart_printf.c b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c
index 7de53dc..dc3ead1 100644
--- a/examples/stm32/f2/jobygps/usart_printf/usart_printf.c
+++ b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c
@@ -30,9 +30,9 @@ int _write(int file, char *ptr, int len);
 static void clock_setup(void)
 {
 	/* Enable clocks on all the peripherals we are going to use. */
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR,
-			RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_USART1);
+	rcc_periph_clock_enable(RCC_GPIOC);
+	rcc_periph_clock_enable(RCC_GPIOA);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f3/stm32f3-discovery/adc/adc.c b/examples/stm32/f3/stm32f3-discovery/adc/adc.c
index ed61010..7e67532 100644
--- a/examples/stm32/f3/stm32f3-discovery/adc/adc.c
+++ b/examples/stm32/f3/stm32f3-discovery/adc/adc.c
@@ -47,8 +47,8 @@
 static void adc_setup(void)
 {
 	//ADC
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_ADC12EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_ADC12);
+	rcc_periph_clock_enable(RCC_GPIOA);
 	//ADC
 	gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO0);
 	gpio_mode_setup(GPIOA, GPIO_MODE_ANALOG, GPIO_PUPD_NONE, GPIO1);
@@ -77,8 +77,8 @@ static void adc_setup(void)
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Setup GPIO pin GPIO_USART2_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO2 | GPIO3);
@@ -98,7 +98,7 @@ static void usart_setup(void)
 
 static void gpio_setup(void)
 {
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE,
 		GPIO8 | GPIO9 | GPIO10 | GPIO11 | GPIO12 | GPIO13 |
 		GPIO14 | GPIO15);
diff --git a/examples/stm32/f3/stm32f3-discovery/button/button.c b/examples/stm32/f3/stm32f3-discovery/button/button.c
index 3f458b4..74befb6 100644
--- a/examples/stm32/f3/stm32f3-discovery/button/button.c
+++ b/examples/stm32/f3/stm32f3-discovery/button/button.c
@@ -35,7 +35,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOD clock. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 
 	/* Set GPIO12 (in GPIO port D) to 'output push-pull'. */
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT,
@@ -45,7 +45,7 @@ static void gpio_setup(void)
 static void button_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Set GPIO0 (in GPIO port A) to 'input open-drain'. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_INPUT, GPIO_PUPD_NONE, GPIO0);
diff --git a/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c b/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c
index 4beed45..25bd44c 100644
--- a/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c
+++ b/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c
@@ -28,7 +28,7 @@ static void clock_setup(void)
 	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
 
 	/* Enable GPIOE clock. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c b/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c
index 61857a6..5c2c350 100644
--- a/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c
+++ b/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c
@@ -45,8 +45,8 @@
 
 static void i2c_setup(void)
 {
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_I2C1EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPBEN);
+	rcc_periph_clock_enable(RCC_I2C1);
+	rcc_periph_clock_enable(RCC_GPIOB);
 	rcc_set_i2c_clock_hsi(I2C1);
 
 	i2c_reset(I2C1);
@@ -70,8 +70,8 @@ static void i2c_setup(void)
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Setup GPIO pin GPIO_USART2_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO2 | GPIO3);
@@ -91,7 +91,7 @@ static void usart_setup(void)
 
 static void gpio_setup(void)
 {
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE,
 		GPIO8 | GPIO9 | GPIO10 | GPIO11 | GPIO12 | GPIO13 |
 		GPIO14 | GPIO15);
diff --git a/examples/stm32/f3/stm32f3-discovery/miniblink/miniblink.c b/examples/stm32/f3/stm32f3-discovery/miniblink/miniblink.c
index 25d04c8..a8cf17c 100644
--- a/examples/stm32/f3/stm32f3-discovery/miniblink/miniblink.c
+++ b/examples/stm32/f3/stm32f3-discovery/miniblink/miniblink.c
@@ -26,7 +26,7 @@
 static void gpio_setup(void)
 {
 	/* Enable GPIOE clock. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 
 	/* Set GPIO12 (in GPIO port E) to 'output push-pull'. */
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO12);
diff --git a/examples/stm32/f3/stm32f3-discovery/spi/spi.c b/examples/stm32/f3/stm32f3-discovery/spi/spi.c
index 81e320f..102a9e3 100644
--- a/examples/stm32/f3/stm32f3-discovery/spi/spi.c
+++ b/examples/stm32/f3/stm32f3-discovery/spi/spi.c
@@ -45,11 +45,11 @@
 
 static void spi_setup(void)
 {
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_SPI1EN);
+	rcc_periph_clock_enable(RCC_SPI1);
 	/* For spi signal pins */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 	/* For spi mode select on the l3gd20 */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 
 	/* Setup GPIOE3 pin for spi mode l3gd20 select. */
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3);
@@ -81,8 +81,8 @@ static void spi_setup(void)
 static void usart_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Setup GPIO pin GPIO_USART2_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO2 | GPIO3);
@@ -102,7 +102,7 @@ static void usart_setup(void)
 
 static void gpio_setup(void)
 {
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPEEN);
+	rcc_periph_clock_enable(RCC_GPIOE);
 	gpio_mode_setup(GPIOE, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE,
 		GPIO8 | GPIO9 | GPIO10 | GPIO11 | GPIO12 | GPIO13 |
 		GPIO14 | GPIO15);
diff --git a/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c
index c6be449..c9d71a2 100644
--- a/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c
@@ -237,8 +237,8 @@ static void usb_setup(void)
 {
 	/* Enable clocks for GPIO port A (for GPIO_USART2_TX) and USART2. */
 	rcc_usb_prescale_1();
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USBEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_USB);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Setup GPIO pin GPIO_USART2_TX/GPIO9 on GPIO port A for transmit. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
diff --git a/examples/stm32/f4/other/crypto-basic/cryptobasic.c b/examples/stm32/f4/other/crypto-basic/cryptobasic.c
index df431b0..96cc374 100644
--- a/examples/stm32/f4/other/crypto-basic/cryptobasic.c
+++ b/examples/stm32/f4/other/crypto-basic/cryptobasic.c
@@ -26,14 +26,14 @@
 static void clock_setup(void)
 {
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 	
 	/* Enable clocks for CRYP. */
-	rcc_peripheral_enable_clock(&RCC_AHB2ENR, RCC_AHB2ENR_CRYPEN);
+	rcc_periph_clock_enable(RCC_CRYP);
 }
 
 static void usart_setup(void)
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 39c2172..0a87e6c 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
@@ -38,15 +38,15 @@ static void clock_setup(void)
 {
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for USART2 and dac */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_DACEN);
+	rcc_periph_clock_enable(RCC_USART2);
+	rcc_periph_clock_enable(RCC_DAC);
 
 	/* And ADC*/
-	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN);
+	rcc_periph_clock_enable(RCC_ADC1);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/button/button.c b/examples/stm32/f4/stm32f4-discovery/button/button.c
index 8c69a0c..729111c 100644
--- a/examples/stm32/f4/stm32f4-discovery/button/button.c
+++ b/examples/stm32/f4/stm32f4-discovery/button/button.c
@@ -33,7 +33,7 @@ static void clock_setup(void)
 static void gpio_setup(void)
 {
 	/* Enable GPIOD clock. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
 
 	/* Set GPIO12 (in GPIO port D) to 'output push-pull'. */
 	gpio_mode_setup(GPIOD, GPIO_MODE_OUTPUT,
@@ -43,7 +43,7 @@ static void gpio_setup(void)
 static void button_setup(void)
 {
 	/* Enable GPIOA clock. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Set GPIO0 (in GPIO port A) to 'input open-drain'. */
 	gpio_mode_setup(GPIOA, GPIO_MODE_INPUT, GPIO_PUPD_NONE, GPIO0);
diff --git a/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c b/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c
index dbac4cf..e382d43 100644
--- a/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c
+++ b/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c
@@ -28,7 +28,7 @@ static void clock_setup(void)
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOD clock. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c b/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c
index f923db1..607f365 100644
--- a/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c
+++ b/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c
@@ -29,11 +29,11 @@ static void clock_setup(void)
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.c b/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.c
index 7f7d2b8..f398b2b 100644
--- a/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.c
+++ b/examples/stm32/f4/stm32f4-discovery/miniblink/miniblink.c
@@ -27,7 +27,7 @@ static void gpio_setup(void)
 	/* Manually: */
 	// RCC_AHB1ENR |= RCC_AHB1ENR_IOPDEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
 
 	/* Set GPIO12 (in GPIO port D) to 'output push-pull'. */
 	/* Manually: */
diff --git a/examples/stm32/f4/stm32f4-discovery/random/random.c b/examples/stm32/f4/stm32f4-discovery/random/random.c
index 186b113..e3c532b 100644
--- a/examples/stm32/f4/stm32f4-discovery/random/random.c
+++ b/examples/stm32/f4/stm32f4-discovery/random/random.c
@@ -26,10 +26,10 @@ static void rcc_setup(void)
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOD clock for onboard leds. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
 
 	/* Enable rng clock */
-	rcc_peripheral_enable_clock(&RCC_AHB2ENR, RCC_AHB2ENR_RNGEN);
+	rcc_periph_clock_enable(RCC_RNG);
 }
 
 static void rng_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c b/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c
index 568a74e..0b332a4 100644
--- a/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c
+++ b/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c
@@ -62,7 +62,7 @@ static void clock_setup(void)
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOD clock. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/usart/usart.c b/examples/stm32/f4/stm32f4-discovery/usart/usart.c
index 426abda..dc70bea 100644
--- a/examples/stm32/f4/stm32f4-discovery/usart/usart.c
+++ b/examples/stm32/f4/stm32f4-discovery/usart/usart.c
@@ -25,11 +25,11 @@
 static void clock_setup(void)
 {
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c b/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c
index 793ee87..36fc566 100644
--- a/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c
+++ b/examples/stm32/f4/stm32f4-discovery/usart_irq/usart_irq.c
@@ -27,11 +27,11 @@
 static void clock_setup(void)
 {
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPDEN);
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	rcc_periph_clock_enable(RCC_GPIOA);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
index f709e8f..8978954 100644
--- a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
@@ -228,8 +228,8 @@ int main(void)
 
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
 
-	rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
-	rcc_peripheral_enable_clock(&RCC_AHB2ENR, RCC_AHB2ENR_OTGFSEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE,
 			GPIO9 | GPIO11 | GPIO12);
diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
index c3f9e8c..2d7192c 100644
--- a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
+++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
@@ -136,7 +136,7 @@ static void setup_button_press_timer(void)
 static int setup_rtc(void)
 {
 	/* turn on power block to enable unlocking */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_PWREN);
+	rcc_periph_clock_enable(RCC_PWR);
 	pwr_disable_backup_domain_write_protect();
 
 	/* reset rtc */
@@ -269,13 +269,13 @@ static void reset_clocks(void)
 	rcc_clock_setup_msi(&myclock_config);
 
 	/* buttons and uarts */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOAEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
 	/* user feedback leds */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 	/* And a timers for button presses */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM7EN);
+	rcc_periph_clock_enable(RCC_TIM7);
 }
 
 int main(void)
diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c b/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
index 483533b..2c3ecf4 100644
--- a/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
+++ b/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
@@ -37,15 +37,15 @@ static void clock_setup(void)
 {
 	rcc_clock_setup_pll(&clock_config[CLOCK_VRANGE1_HSI_PLL_24MHZ]);
 	/* Lots of things on all ports... */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOAEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOBEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 
 	/* And timers. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM6EN);
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM7EN);
+	rcc_periph_clock_enable(RCC_TIM6);
+	rcc_periph_clock_enable(RCC_TIM7);
 
 }
 
diff --git a/examples/stm32/l1/stm32l-discovery/miniblink/miniblink.c b/examples/stm32/l1/stm32l-discovery/miniblink/miniblink.c
index 561e20e..8edbf72 100644
--- a/examples/stm32/l1/stm32l-discovery/miniblink/miniblink.c
+++ b/examples/stm32/l1/stm32l-discovery/miniblink/miniblink.c
@@ -22,20 +22,17 @@
 #include <libopencm3/stm32/rcc.h>
 #include <libopencm3/stm32/gpio.h>
 
-#define PORT_LED GPIOB
-#define PIN_LED GPIO6
-
 static void gpio_setup(void)
 {
 	/* Enable GPIOB clock. */
 	/* Manually: */
 	//RCC_AHBENR |= RCC_AHBENR_GPIOBEN;
 	/* Using API functions: */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOBEN);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Set GPIO6 (in GPIO port B) to 'output push-pull'. */
 	/* Using API functions: */
-	gpio_mode_setup(PORT_LED, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, PIN_LED);
+	gpio_mode_setup(GPIOB, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO6);
 }
 
 int main(void)
@@ -47,23 +44,23 @@ int main(void)
 	/* Blink the LED (PC8) on the board. */
 	while (1) {
 		/* Manually: */
-		// GPIOD_BSRR = GPIO12;		/* LED off */
+		// GPIOD_BSRR = GPIO6;		/* LED off */
 		// for (i = 0; i < 1000000; i++)	/* Wait a bit. */
 		// 	__asm__("nop");
-		// GPIOD_BRR = GPIO12;		/* LED on */
+		// GPIOD_BRR = GPIO6;		/* LED on */
 		// for (i = 0; i < 1000000; i++)	/* Wait a bit. */
 		// 	__asm__("nop");
 
 		/* Using API functions gpio_set()/gpio_clear(): */
-		// gpio_set(GPIOD, GPIO12);	/* LED off */
+		// gpio_set(GPIOD, GPIO6);	/* LED off */
 		// for (i = 0; i < 1000000; i++)	/* Wait a bit. */
 		// 	__asm__("nop");
-		// gpio_clear(GPIOD, GPIO12);	/* LED on */
+		// gpio_clear(GPIOD, GPIO6);	/* LED on */
 		// for (i = 0; i < 1000000; i++)	/* Wait a bit. */
 		// 	__asm__("nop");
 
 		/* Using API function gpio_toggle(): */
-		gpio_toggle(PORT_LED, PIN_LED);	/* LED on/off */
+		gpio_toggle(GPIOB, GPIO6);	/* LED on/off */
 		for (i = 0; i < 1000000; i++)	/* Wait a bit. */
 			__asm__("nop");
 	}
diff --git a/examples/stm32/l1/stm32l-discovery/usart-semihosting/usart-semihosting.c b/examples/stm32/l1/stm32l-discovery/usart-semihosting/usart-semihosting.c
index 602d5b9..55e675b 100644
--- a/examples/stm32/l1/stm32l-discovery/usart-semihosting/usart-semihosting.c
+++ b/examples/stm32/l1/stm32l-discovery/usart-semihosting/usart-semihosting.c
@@ -30,11 +30,11 @@ static void clock_setup(void)
 {
 	/* We are running on MSI after boot. */
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOAEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOBEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)
diff --git a/examples/stm32/l1/stm32l-discovery/usart/usart.c b/examples/stm32/l1/stm32l-discovery/usart/usart.c
index c0ec26b..abcb120 100644
--- a/examples/stm32/l1/stm32l-discovery/usart/usart.c
+++ b/examples/stm32/l1/stm32l-discovery/usart/usart.c
@@ -26,11 +26,11 @@ static void clock_setup(void)
 {
 	/* We are running on MSI after boot. */
 	/* Enable GPIOD clock for LED & USARTs. */
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOAEN);
-	rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_GPIOBEN);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_GPIOB);
 
 	/* Enable clocks for USART2. */
-	rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_USART2EN);
+	rcc_periph_clock_enable(RCC_USART2);
 }
 
 static void usart_setup(void)