diff --git a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
index 9125007..69d390d 100644
--- a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
@@ -231,9 +231,8 @@ int main(void)
 	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);
-	gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
+	gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
 
 	usbd_dev = usbd_init(&otgfs_usb_driver, &dev, &config,
 			usb_strings, 3,
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c b/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c
index b57f999..2f42837 100644
--- a/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c
+++ b/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c
@@ -371,9 +371,8 @@ int main(void)
 	rcc_periph_clock_enable(RCC_OTGFS);
 
 	/* USB pins */
-	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE,
-			GPIO9 | GPIO11 | GPIO12);
-	gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
+	gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
 
 	desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number));
 
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c b/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
index a786339..0a27ea1 100644
--- a/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
+++ b/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
@@ -109,9 +109,8 @@ int main(void)
 	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);
-	gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO11 | GPIO12);
+	gpio_set_af(GPIOA, GPIO_AF10, GPIO11 | GPIO12);
 
 	msc_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config_descr,
 			    usb_strings, 3,
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c
index 84c94cc..fe3ebbd 100644
--- a/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c
@@ -232,9 +232,8 @@ int main(void)
 	rcc_periph_clock_enable(RCC_GPIOB);
 	rcc_periph_clock_enable(RCC_OTGHS);
 
-	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE,
-			GPIO13 | GPIO14 | GPIO15);
-	gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
+	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
+	gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
 
 	usbd_dev = usbd_init(&otghs_usb_driver, &dev, &config,
 			usb_strings, 3,
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c b/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c
index 64251b0..359e506 100644
--- a/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c
+++ b/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c
@@ -373,9 +373,8 @@ int main(void)
 	rcc_periph_clock_enable(RCC_OTGHS);
 
 	/* USB pins */
-	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE,
-			GPIO13 | GPIO14 | GPIO15);
-	gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
+	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
+	gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
 
 	desig_get_unique_id_as_string(usb_serial_number, sizeof(usb_serial_number));
 
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c b/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c
index 8f59f06..ff0b7a0 100644
--- a/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c
+++ b/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c
@@ -110,9 +110,8 @@ int main(void)
 	rcc_periph_clock_enable(RCC_GPIOB);
 	rcc_periph_clock_enable(RCC_OTGHS);
 
-	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE,
-			GPIO13 | GPIO14 | GPIO15);
-	gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15);
+	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO14 | GPIO15);
+	gpio_set_af(GPIOB, GPIO_AF12, GPIO14 | GPIO15);
 
 	msc_dev = usbd_init(&otghs_usb_driver, &dev_descr, &config_descr,
 			    usb_strings, 3,