diff --git a/CHANGELOG.md b/CHANGELOG.md
index b99f3e44..7cb6125b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+- [breaking-change] Make `Alternate` generic over `Otype` instead of separate `Alternate` and `AlternateOD` [#372]
+
 ### Added
 
 - `count_down` constructor for `Timer` -> `CountDownTimer` without start [#382]
diff --git a/examples/i2s-audio-out-dma.rs b/examples/i2s-audio-out-dma.rs
index d0713018..117138cb 100644
--- a/examples/i2s-audio-out-dma.rs
+++ b/examples/i2s-audio-out-dma.rs
@@ -52,10 +52,11 @@ use stm32f4xx_hal::delay::Delay;
 use stm32f4xx_hal::dma::config::DmaConfig;
 use stm32f4xx_hal::dma::MemoryToPeripheral;
 use stm32f4xx_hal::dma::{Stream5, StreamsTuple, Transfer};
-use stm32f4xx_hal::gpio::gpioa::PA4;
-use stm32f4xx_hal::gpio::gpioc::{PC10, PC12, PC7};
-use stm32f4xx_hal::gpio::Alternate;
-use stm32f4xx_hal::gpio::AF6;
+use stm32f4xx_hal::gpio::{
+    gpioa::PA4,
+    gpioc::{PC10, PC12, PC7},
+    Alternate, PushPull,
+};
 use stm32f4xx_hal::i2c::I2c;
 use stm32f4xx_hal::i2s::I2s;
 use stm32f4xx_hal::pac::{interrupt, Interrupt};
@@ -216,10 +217,10 @@ type I2sDmaTransfer = Transfer<
         I2s<
             SPI3,
             (
-                PA4<Alternate<AF6>>,
-                PC10<Alternate<AF6>>,
-                PC7<Alternate<AF6>>,
-                PC12<Alternate<AF6>>,
+                PA4<Alternate<PushPull, 6>>,
+                PC10<Alternate<PushPull, 6>>,
+                PC7<Alternate<PushPull, 6>>,
+                PC12<Alternate<PushPull, 6>>,
             ),
         >,
         TransmitMode<Data16Frame16>,
diff --git a/src/can.rs b/src/can.rs
index 6b2527e4..adb1ee73 100644
--- a/src/can.rs
+++ b/src/can.rs
@@ -20,8 +20,8 @@ pub trait Pins: sealed::Sealed {
 macro_rules! pins {
     ($($PER:ident => ($tx:ident<$txaf:literal>, $rx:ident<$rxaf:literal>),)+) => {
         $(
-            impl crate::can::sealed::Sealed for ($tx<crate::gpio::Alternate<$txaf>>, $rx<crate::gpio::Alternate<$rxaf>>) {}
-            impl crate::can::Pins for ($tx<crate::gpio::Alternate<$txaf>>, $rx<crate::gpio::Alternate<$rxaf>>) {
+            impl crate::can::sealed::Sealed for ($tx<crate::gpio::Alternate<crate::gpio::PushPull, $txaf>>, $rx<crate::gpio::Alternate<crate::gpio::PushPull, $rxaf>>) {}
+            impl crate::can::Pins for ($tx<crate::gpio::Alternate<crate::gpio::PushPull, $txaf>>, $rx<crate::gpio::Alternate<crate::gpio::PushPull, $rxaf>>) {
                 type Instance = $PER;
             }
         )+
diff --git a/src/fmpi2c.rs b/src/fmpi2c.rs
index 73fdc432..d29f0089 100644
--- a/src/fmpi2c.rs
+++ b/src/fmpi2c.rs
@@ -1,7 +1,7 @@
 use core::ops::Deref;
 use embedded_hal::blocking::i2c::{Read, Write, WriteRead};
 
-use crate::gpio::{gpiob, gpioc, gpiod, gpiof, Const, SetAlternateOD};
+use crate::gpio::{gpiob, gpioc, gpiod, gpiof, Const, OpenDrain, SetAlternate};
 use crate::i2c::{Error, PinScl, PinSda};
 use crate::pac::{fmpi2c1, FMPI2C1, RCC};
 use crate::rcc::{Enable, Reset};
@@ -87,8 +87,8 @@ pin!(PinScl<FMPI2C1> for gpiof::PF15<4>);
 
 impl<SCL, SDA, const SCLA: u8, const SDAA: u8> FMPI2c<FMPI2C1, (SCL, SDA)>
 where
-    SCL: PinScl<FMPI2C1, A = Const<SCLA>> + SetAlternateOD<SCLA>,
-    SDA: PinSda<FMPI2C1, A = Const<SDAA>> + SetAlternateOD<SDAA>,
+    SCL: PinScl<FMPI2C1, A = Const<SCLA>> + SetAlternate<OpenDrain, SCLA>,
+    SDA: PinSda<FMPI2C1, A = Const<SDAA>> + SetAlternate<OpenDrain, SDAA>,
 {
     pub fn new<M: Into<FmpMode>>(i2c: FMPI2C1, mut pins: (SCL, SDA), mode: M) -> Self {
         unsafe {
diff --git a/src/fsmc_lcd/pins.rs b/src/fsmc_lcd/pins.rs
index dad26abf..d8ec5ce1 100644
--- a/src/fsmc_lcd/pins.rs
+++ b/src/fsmc_lcd/pins.rs
@@ -605,10 +605,10 @@ mod common_pins {
     };
     use crate::gpio::gpiof::{PF0, PF1, PF12, PF13, PF14, PF15, PF2, PF3, PF4, PF5};
     use crate::gpio::gpiog::{PG0, PG1, PG10, PG12, PG13, PG2, PG3, PG4, PG5, PG9};
-    use crate::gpio::Alternate;
+    use crate::gpio::{Alternate, PushPull};
 
     // All FSMC/FMC pins use AF12
-    type FmcAlternate = Alternate<12>;
+    type FmcAlternate = Alternate<PushPull, 12>;
 
     impl PinD2 for PD0<FmcAlternate> {}
     impl PinD3 for PD1<FmcAlternate> {}
@@ -725,27 +725,27 @@ mod extra_pins {
     use crate::gpio::gpiob::{PB12, PB14};
     use crate::gpio::gpioc::{PC11, PC12, PC2, PC3, PC4, PC5, PC6};
     use crate::gpio::gpiod::PD2;
-    use crate::gpio::Alternate;
+    use crate::gpio::{Alternate, PushPull};
 
     // Most FSMC/FMC pins use AF12, but a few use AF10
-    type FmcAlternate = Alternate<12>;
+    type FmcAlternate = Alternate<PushPull, 12>;
 
     impl PinD4 for PA2<FmcAlternate> {}
     impl PinD5 for PA3<FmcAlternate> {}
     impl PinD6 for PA4<FmcAlternate> {}
     impl PinD7 for PA5<FmcAlternate> {}
     impl PinD13 for PB12<FmcAlternate> {}
-    impl PinD0 for PB14<Alternate<10>> {}
+    impl PinD0 for PB14<Alternate<PushPull, 10>> {}
     impl PinWriteEnable for PC2<FmcAlternate> {}
     impl PinAddress for PC3<FmcAlternate> {}
     impl Sealed for PC3<FmcAlternate> {}
     impl PinChipSelect4 for PC4<FmcAlternate> {}
     impl Sealed for PC4<FmcAlternate> {}
     impl PinReadEnable for PC5<FmcAlternate> {}
-    impl PinD1 for PC6<Alternate<10>> {}
-    impl PinD2 for PC11<Alternate<10>> {}
-    impl PinD3 for PC12<Alternate<10>> {}
-    impl PinWriteEnable for PD2<Alternate<10>> {}
+    impl PinD1 for PC6<Alternate<PushPull, 10>> {}
+    impl PinD2 for PC11<Alternate<PushPull, 10>> {}
+    impl PinD3 for PC12<Alternate<PushPull, 10>> {}
+    impl PinWriteEnable for PD2<Alternate<PushPull, 10>> {}
 
     // Sealed trait boilerplate
     impl Sealed for PA2<FmcAlternate> {}
@@ -753,11 +753,11 @@ mod extra_pins {
     impl Sealed for PA4<FmcAlternate> {}
     impl Sealed for PA5<FmcAlternate> {}
     impl Sealed for PB12<FmcAlternate> {}
-    impl Sealed for PB14<Alternate<10>> {}
+    impl Sealed for PB14<Alternate<PushPull, 10>> {}
     impl Sealed for PC2<FmcAlternate> {}
     impl Sealed for PC5<FmcAlternate> {}
-    impl Sealed for PC6<Alternate<10>> {}
-    impl Sealed for PC11<Alternate<10>> {}
-    impl Sealed for PC12<Alternate<10>> {}
-    impl Sealed for PD2<Alternate<10>> {}
+    impl Sealed for PC6<Alternate<PushPull, 10>> {}
+    impl Sealed for PC11<Alternate<PushPull, 10>> {}
+    impl Sealed for PC12<Alternate<PushPull, 10>> {}
+    impl Sealed for PD2<Alternate<PushPull, 10>> {}
 }
diff --git a/src/gpio.rs b/src/gpio.rs
index 6e854349..15bfb4bf 100644
--- a/src/gpio.rs
+++ b/src/gpio.rs
@@ -23,7 +23,6 @@
 //! Each GPIO pin can be set to various modes:
 //!
 //! - **Alternate**: Pin mode required when the pin is driven by other peripherals
-//! - **AlternateOD**: Pin mode required when the pin is driven by other peripherals and has open drain
 //! - **Analog**: Analog input to be used with ADC.
 //! - Input
 //!     - **PullUp**: Input connected to high with a weak pull up resistor. Will be high when nothing
@@ -56,7 +55,7 @@ use crate::pac::EXTI;
 use crate::syscfg::SysCfg;
 
 mod convert;
-pub(crate) use convert::{Const, SetAlternate, SetAlternateOD};
+pub(crate) use convert::{Const, SetAlternate};
 mod partially_erased;
 pub use partially_erased::{PEPin, PartiallyErasedPin};
 mod erased;
@@ -83,10 +82,7 @@ pub trait PinExt {
 }
 
 /// Some alternate mode (type state)
-pub struct Alternate<const A: u8>;
-
-/// Some alternate mode in open drain configuration (type state)
-pub struct AlternateOD<const A: u8>;
+pub struct Alternate<Otype, const A: u8>(PhantomData<Otype>);
 
 // Compatibility constants
 pub const AF0: u8 = 0;
@@ -313,7 +309,7 @@ impl<const P: char, const N: u8> Pin<Output<OpenDrain>, P, N> {
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> Pin<Alternate<A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N> {
     /// Set pin speed
     pub fn set_speed(self, speed: Speed) -> Self {
         let offset = 2 * { N };
@@ -341,9 +337,9 @@ impl<const P: char, const N: u8, const A: u8> Pin<Alternate<A>, P, N> {
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> Pin<Alternate<A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> Pin<Alternate<PushPull, A>, P, N> {
     /// Turns pin alternate configuration pin into open drain
-    pub fn set_open_drain(self) -> Pin<AlternateOD<A>, P, N> {
+    pub fn set_open_drain(self) -> Pin<Alternate<OpenDrain, A>, P, N> {
         let offset = { N };
         unsafe {
             (*Gpio::<P>::ptr())
diff --git a/src/gpio/convert.rs b/src/gpio/convert.rs
index 361840a2..f5f041c1 100644
--- a/src/gpio/convert.rs
+++ b/src/gpio/convert.rs
@@ -8,7 +8,7 @@ impl<const L: u8, const R: u8> Assert<L, R> {
 }
 
 impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Input<MODE>, P, N>>
-    for Pin<Alternate<A>, P, N>
+    for Pin<Alternate<PushPull, A>, P, N>
 {
     #[inline(always)]
     fn from(f: Pin<Input<MODE>, P, N>) -> Self {
@@ -17,7 +17,7 @@ impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Input<MODE>, P, N>>
 }
 
 impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Output<MODE>, P, N>>
-    for Pin<Alternate<A>, P, N>
+    for Pin<Alternate<PushPull, A>, P, N>
 {
     #[inline(always)]
     fn from(f: Pin<Output<MODE>, P, N>) -> Self {
@@ -25,24 +25,26 @@ impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Output<MODE>, P, N>
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Analog, P, N>> for Pin<Alternate<A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> From<Pin<Analog, P, N>>
+    for Pin<Alternate<PushPull, A>, P, N>
+{
     #[inline(always)]
     fn from(f: Pin<Analog, P, N>) -> Self {
         f.into_alternate::<A>()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8, const B: u8> From<Pin<AlternateOD<B>, P, N>>
-    for Pin<Alternate<A>, P, N>
+impl<const P: char, const N: u8, const A: u8, const B: u8> From<Pin<Alternate<OpenDrain, B>, P, N>>
+    for Pin<Alternate<PushPull, A>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<B>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, B>, P, N>) -> Self {
         f.into_alternate::<A>()
     }
 }
 
 impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Input<MODE>, P, N>>
-    for Pin<AlternateOD<A>, P, N>
+    for Pin<Alternate<OpenDrain, A>, P, N>
 {
     #[inline(always)]
     fn from(f: Pin<Input<MODE>, P, N>) -> Self {
@@ -51,7 +53,7 @@ impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Input<MODE>, P, N>>
 }
 
 impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Output<MODE>, P, N>>
-    for Pin<AlternateOD<A>, P, N>
+    for Pin<Alternate<OpenDrain, A>, P, N>
 {
     #[inline(always)]
     fn from(f: Pin<Output<MODE>, P, N>) -> Self {
@@ -60,7 +62,7 @@ impl<MODE, const P: char, const N: u8, const A: u8> From<Pin<Output<MODE>, P, N>
 }
 
 impl<const P: char, const N: u8, const A: u8> From<Pin<Analog, P, N>>
-    for Pin<AlternateOD<A>, P, N>
+    for Pin<Alternate<OpenDrain, A>, P, N>
 {
     #[inline(always)]
     fn from(f: Pin<Analog, P, N>) -> Self {
@@ -68,11 +70,11 @@ impl<const P: char, const N: u8, const A: u8> From<Pin<Analog, P, N>>
     }
 }
 
-impl<const P: char, const N: u8, const A: u8, const B: u8> From<Pin<Alternate<B>, P, N>>
-    for Pin<AlternateOD<A>, P, N>
+impl<const P: char, const N: u8, const A: u8, const B: u8> From<Pin<Alternate<PushPull, B>, P, N>>
+    for Pin<Alternate<OpenDrain, A>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<B>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, B>, P, N>) -> Self {
         f.into_alternate_open_drain::<A>()
     }
 }
@@ -107,20 +109,20 @@ impl<const P: char, const N: u8> From<Pin<Analog, P, N>> for Pin<Input<PullDown>
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
     for Pin<Input<PullDown>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_pull_down_input()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Input<PullDown>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_pull_down_input()
     }
 }
@@ -153,20 +155,20 @@ impl<const P: char, const N: u8> From<Pin<Analog, P, N>> for Pin<Input<PullUp>,
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
     for Pin<Input<PullUp>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_pull_up_input()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Input<PullUp>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_pull_up_input()
     }
 }
@@ -201,20 +203,20 @@ impl<const P: char, const N: u8> From<Pin<Analog, P, N>> for Pin<Input<Floating>
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
     for Pin<Input<Floating>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_floating_input()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Input<Floating>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_floating_input()
     }
 }
@@ -244,20 +246,20 @@ impl<const P: char, const N: u8> From<Pin<Analog, P, N>> for Pin<Output<OpenDrai
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
     for Pin<Output<OpenDrain>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_open_drain_output()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Output<OpenDrain>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_open_drain_output()
     }
 }
@@ -287,20 +289,20 @@ impl<const P: char, const N: u8> From<Pin<Analog, P, N>> for Pin<Output<PushPull
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
     for Pin<Output<PushPull>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_push_pull_output()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Output<PushPull>, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_push_pull_output()
     }
 }
@@ -319,18 +321,20 @@ impl<MODE, const P: char, const N: u8> From<Pin<Output<MODE>, P, N>> for Pin<Ana
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<A>, P, N>> for Pin<Analog, P, N> {
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<PushPull, A>, P, N>>
+    for Pin<Analog, P, N>
+{
     #[inline(always)]
-    fn from(f: Pin<Alternate<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<PushPull, A>, P, N>) -> Self {
         f.into_analog()
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> From<Pin<AlternateOD<A>, P, N>>
+impl<const P: char, const N: u8, const A: u8> From<Pin<Alternate<OpenDrain, A>, P, N>>
     for Pin<Analog, P, N>
 {
     #[inline(always)]
-    fn from(f: Pin<AlternateOD<A>, P, N>) -> Self {
+    fn from(f: Pin<Alternate<OpenDrain, A>, P, N>) -> Self {
         f.into_analog()
     }
 }
@@ -360,14 +364,14 @@ impl<MODE, const P: char, const N: u8> Pin<MODE, P, N> {
         }
     }
     /// Configures the pin to operate alternate mode
-    pub fn into_alternate<const A: u8>(mut self) -> Pin<Alternate<A>, P, N> {
+    pub fn into_alternate<const A: u8>(mut self) -> Pin<Alternate<PushPull, A>, P, N> {
         self.set_alternate::<A>();
         Pin::new()
     }
 
     /// Configures the pin to operate in alternate open drain mode
     #[allow(path_statements)]
-    pub fn into_alternate_open_drain<const A: u8>(self) -> Pin<AlternateOD<A>, P, N> {
+    pub fn into_alternate_open_drain<const A: u8>(self) -> Pin<Alternate<OpenDrain, A>, P, N> {
         self.into_alternate::<A>().set_open_drain()
     }
 
@@ -642,15 +646,17 @@ impl PinMode for Output<PushPull> {
 
 pub struct Const<const A: u8>;
 
-pub trait SetAlternate<const A: u8> {
+pub trait SetAlternate<Otype, const A: u8> {
     fn set_alt_mode(&mut self);
     fn restore_mode(&mut self);
 }
-impl SetAlternate<0> for NoPin {
+impl<Otype> SetAlternate<Otype, 0> for NoPin {
     fn set_alt_mode(&mut self) {}
     fn restore_mode(&mut self) {}
 }
-impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<A> for Pin<MODE, P, N> {
+impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<PushPull, A>
+    for Pin<MODE, P, N>
+{
     fn set_alt_mode(&mut self) {
         self.set_alternate::<A>();
     }
@@ -660,20 +666,9 @@ impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<A> for
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> SetAlternate<A> for Pin<Alternate<A>, P, N> {
-    fn set_alt_mode(&mut self) {}
-    fn restore_mode(&mut self) {}
-}
-
-pub trait SetAlternateOD<const A: u8> {
-    fn set_alt_mode(&mut self);
-    fn restore_mode(&mut self);
-}
-impl SetAlternateOD<0> for NoPin {
-    fn set_alt_mode(&mut self) {}
-    fn restore_mode(&mut self) {}
-}
-impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternateOD<A> for Pin<MODE, P, N> {
+impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternate<OpenDrain, A>
+    for Pin<MODE, P, N>
+{
     fn set_alt_mode(&mut self) {
         self.set_alternate::<A>();
         unsafe {
@@ -688,7 +683,16 @@ impl<MODE: PinMode, const P: char, const N: u8, const A: u8> SetAlternateOD<A> f
     }
 }
 
-impl<const P: char, const N: u8, const A: u8> SetAlternateOD<A> for Pin<AlternateOD<A>, P, N> {
+impl<const P: char, const N: u8, const A: u8> SetAlternate<PushPull, A>
+    for Pin<Alternate<PushPull, A>, P, N>
+{
+    fn set_alt_mode(&mut self) {}
+    fn restore_mode(&mut self) {}
+}
+
+impl<const P: char, const N: u8, const A: u8> SetAlternate<OpenDrain, A>
+    for Pin<Alternate<OpenDrain, A>, P, N>
+{
     fn set_alt_mode(&mut self) {}
     fn restore_mode(&mut self) {}
 }
diff --git a/src/i2c.rs b/src/i2c.rs
index f1399787..28b13f75 100644
--- a/src/i2c.rs
+++ b/src/i2c.rs
@@ -4,7 +4,7 @@ use embedded_hal::blocking::i2c::{Read, Write, WriteRead};
 use crate::pac::i2c1;
 use crate::rcc::{Enable, Reset};
 
-use crate::gpio::{Const, SetAlternateOD};
+use crate::gpio::{Const, OpenDrain, SetAlternate};
 #[cfg(feature = "i2c3")]
 use crate::pac::I2C3;
 use crate::pac::{I2C1, I2C2, RCC};
@@ -282,8 +282,8 @@ impl Instance for I2C3 {}
 impl<I2C, SCL, SDA, const SCLA: u8, const SDAA: u8> I2c<I2C, (SCL, SDA)>
 where
     I2C: Instance,
-    SCL: PinScl<I2C, A = Const<SCLA>> + SetAlternateOD<SCLA>,
-    SDA: PinSda<I2C, A = Const<SDAA>> + SetAlternateOD<SDAA>,
+    SCL: PinScl<I2C, A = Const<SCLA>> + SetAlternate<OpenDrain, SCLA>,
+    SDA: PinSda<I2C, A = Const<SDAA>> + SetAlternate<OpenDrain, SDAA>,
 {
     pub fn new<M: Into<Mode>>(i2c: I2C, mut pins: (SCL, SDA), mode: M, clocks: Clocks) -> Self {
         unsafe {
diff --git a/src/i2s.rs b/src/i2s.rs
index 0923780b..719f7be4 100644
--- a/src/i2s.rs
+++ b/src/i2s.rs
@@ -2,7 +2,7 @@
 //!
 //! This module is only available if the `i2s` feature is enabled.
 
-use crate::gpio::{Const, NoPin, SetAlternate};
+use crate::gpio::{Const, NoPin, PushPull, SetAlternate};
 use stm32_i2s_v12x::{Instance, RegisterBlock};
 
 use crate::pac::RCC;
@@ -293,10 +293,10 @@ impl<SPI, WS, CK, MCLK, SD, const WSA: u8, const CKA: u8, const MCLKA: u8, const
     I2s<SPI, (WS, CK, MCLK, SD)>
 where
     SPI: I2sFreq + rcc::Enable + rcc::Reset,
-    WS: PinWs<SPI, A = Const<WSA>> + SetAlternate<WSA>,
-    CK: PinCk<SPI, A = Const<CKA>> + SetAlternate<CKA>,
-    MCLK: PinMck<SPI, A = Const<MCLKA>> + SetAlternate<MCLKA>,
-    SD: PinSd<SPI, A = Const<SDA>> + SetAlternate<SDA>,
+    WS: PinWs<SPI, A = Const<WSA>> + SetAlternate<PushPull, WSA>,
+    CK: PinCk<SPI, A = Const<CKA>> + SetAlternate<PushPull, CKA>,
+    MCLK: PinMck<SPI, A = Const<MCLKA>> + SetAlternate<PushPull, MCLKA>,
+    SD: PinSd<SPI, A = Const<SDA>> + SetAlternate<PushPull, SDA>,
 {
     /// Creates an I2s object around an SPI peripheral and pins
     ///
diff --git a/src/otg_fs.rs b/src/otg_fs.rs
index 5dda424d..a262a805 100644
--- a/src/otg_fs.rs
+++ b/src/otg_fs.rs
@@ -7,7 +7,7 @@ use crate::pac;
 
 use crate::gpio::{
     gpioa::{PA11, PA12},
-    Alternate,
+    Alternate, PushPull,
 };
 use crate::rcc::{Enable, Reset};
 use crate::time::Hertz;
@@ -19,8 +19,8 @@ pub struct USB {
     pub usb_global: pac::OTG_FS_GLOBAL,
     pub usb_device: pac::OTG_FS_DEVICE,
     pub usb_pwrclk: pac::OTG_FS_PWRCLK,
-    pub pin_dm: PA11<Alternate<10>>,
-    pub pin_dp: PA12<Alternate<10>>,
+    pub pin_dm: PA11<Alternate<PushPull, 10>>,
+    pub pin_dp: PA12<Alternate<PushPull, 10>>,
     pub hclk: Hertz,
 }
 
diff --git a/src/otg_hs.rs b/src/otg_hs.rs
index 49859e1d..62a2550b 100644
--- a/src/otg_hs.rs
+++ b/src/otg_hs.rs
@@ -10,7 +10,7 @@ use crate::pac;
 
 use crate::gpio::{
     gpiob::{PB14, PB15},
-    Alternate,
+    Alternate, PushPull,
 };
 use crate::rcc::{Enable, Reset};
 use crate::time::Hertz;
@@ -22,8 +22,8 @@ pub struct USB {
     pub usb_global: pac::OTG_HS_GLOBAL,
     pub usb_device: pac::OTG_HS_DEVICE,
     pub usb_pwrclk: pac::OTG_HS_PWRCLK,
-    pub pin_dm: PB14<Alternate<12>>,
-    pub pin_dp: PB15<Alternate<12>>,
+    pub pin_dm: PB14<Alternate<PushPull, 12>>,
+    pub pin_dp: PB15<Alternate<PushPull, 12>>,
     pub hclk: Hertz,
 }
 
diff --git a/src/sdio.rs b/src/sdio.rs
index cbabd5a7..4f1faa1f 100644
--- a/src/sdio.rs
+++ b/src/sdio.rs
@@ -1,7 +1,7 @@
 //! Sdio host
 
 #[allow(unused_imports)]
-use crate::gpio::{gpioa::*, gpiob::*, gpioc::*, gpiod::*, Alternate};
+use crate::gpio::{gpioa::*, gpiob::*, gpioc::*, gpiod::*, Alternate, PushPull};
 use crate::pac::{self, RCC, SDIO};
 use crate::rcc::{Clocks, Enable, Reset};
 pub use sdio_host::{
@@ -85,32 +85,32 @@ macro_rules! pins {
     feature = "stm32f479"
 ))]
 pins! {
-    CLK: [PC12<Alternate<12>>]
-    CMD: [PD2<Alternate<12>>]
-    D0: [PC8<Alternate<12>>]
-    D1: [PC9<Alternate<12>>]
-    D2: [PC10<Alternate<12>>]
-    D3: [PC11<Alternate<12>>]
+    CLK: [PC12<Alternate<PushPull, 12>>]
+    CMD: [PD2<Alternate<PushPull, 12>>]
+    D0: [PC8<Alternate<PushPull, 12>>]
+    D1: [PC9<Alternate<PushPull, 12>>]
+    D2: [PC10<Alternate<PushPull, 12>>]
+    D3: [PC11<Alternate<PushPull, 12>>]
 }
 
 #[cfg(any(feature = "stm32f412", feature = "stm32f413", feature = "stm32f423"))]
 pins! {
-    CLK: [PB15<Alternate<12>>]
-    CMD: [PA6<Alternate<12>>]
-    D0: [PB4<Alternate<12>>, PB6<Alternate<12>>]
-    D1: [PA8<Alternate<12>>]
-    D2: [PA9<Alternate<12>>]
-    D3: [PB5<Alternate<12>>]
+    CLK: [PB15<Alternate<PushPull, 12>>]
+    CMD: [PA6<Alternate<PushPull, 12>>]
+    D0: [PB4<Alternate<PushPull, 12>>, PB6<Alternate<PushPull, 12>>]
+    D1: [PA8<Alternate<PushPull, 12>>]
+    D2: [PA9<Alternate<PushPull, 12>>]
+    D3: [PB5<Alternate<PushPull, 12>>]
 }
 
 #[cfg(feature = "stm32f411")]
 pins! {
-    CLK: [PB15<Alternate<12>>]
-    CMD: [PA6<Alternate<12>>]
-    D0: [PB4<Alternate<12>>, PB7<Alternate<12>>]
-    D1: [PA8<Alternate<12>>]
-    D2: [PA9<Alternate<12>>]
-    D3: [PB5<Alternate<12>>]
+    CLK: [PB15<Alternate<PushPull, 12>>]
+    CMD: [PA6<Alternate<PushPull, 12>>]
+    D0: [PB4<Alternate<PushPull, 12>>, PB7<Alternate<PushPull, 12>>]
+    D1: [PA8<Alternate<PushPull, 12>>]
+    D2: [PA9<Alternate<PushPull, 12>>]
+    D3: [PB5<Alternate<PushPull, 12>>]
 }
 
 #[derive(Copy, Clone, Eq, PartialEq)]
diff --git a/src/serial.rs b/src/serial.rs
index 0bf662a4..dd954773 100644
--- a/src/serial.rs
+++ b/src/serial.rs
@@ -25,7 +25,7 @@ use embedded_hal::prelude::*;
 use embedded_hal::serial;
 use nb::block;
 
-use crate::gpio::{Const, SetAlternate};
+use crate::gpio::{Const, PushPull, SetAlternate};
 
 #[cfg(feature = "gpiod")]
 use crate::gpio::gpiod;
@@ -669,8 +669,8 @@ impl<USART, PINS, WORD> AsMut<Rx<USART, WORD>> for Serial<USART, PINS, WORD> {
 
 impl<USART, TX, RX, WORD, const TXA: u8, const RXA: u8> Serial<USART, (TX, RX), WORD>
 where
-    TX: PinTx<USART, A = Const<TXA>> + SetAlternate<TXA>,
-    RX: PinRx<USART, A = Const<RXA>> + SetAlternate<RXA>,
+    TX: PinTx<USART, A = Const<TXA>> + SetAlternate<PushPull, TXA>,
+    RX: PinRx<USART, A = Const<RXA>> + SetAlternate<PushPull, RXA>,
     USART: Instance,
 {
     /*
@@ -809,7 +809,7 @@ where
 
 impl<USART, TX, WORD, const TXA: u8> Serial<USART, (TX, NoPin), WORD>
 where
-    TX: PinTx<USART, A = Const<TXA>> + SetAlternate<TXA>,
+    TX: PinTx<USART, A = Const<TXA>> + SetAlternate<PushPull, TXA>,
     USART: Instance,
 {
     pub fn tx(
@@ -824,7 +824,7 @@ where
 
 impl<USART, RX, WORD, const RXA: u8> Serial<USART, (NoPin, RX), WORD>
 where
-    RX: PinRx<USART, A = Const<RXA>> + SetAlternate<RXA>,
+    RX: PinRx<USART, A = Const<RXA>> + SetAlternate<PushPull, RXA>,
     USART: Instance,
 {
     pub fn rx(
diff --git a/src/spi.rs b/src/spi.rs
index b9d50215..3d4e413c 100644
--- a/src/spi.rs
+++ b/src/spi.rs
@@ -1,7 +1,7 @@
 use core::ops::Deref;
 use core::ptr;
 
-use crate::gpio::{Const, NoPin, SetAlternate};
+use crate::gpio::{Const, NoPin, PushPull, SetAlternate};
 use embedded_hal::spi;
 pub use embedded_hal::spi::{Mode, Phase, Polarity};
 
@@ -417,9 +417,9 @@ impl<SPI, SCK, MISO, MOSI, const SCKA: u8, const MISOA: u8, const MOSIA: u8>
     Spi<SPI, (SCK, MISO, MOSI), TransferModeNormal>
 where
     SPI: Instance,
-    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<SCKA>,
-    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<MISOA>,
-    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<MOSIA>,
+    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<PushPull, SCKA>,
+    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<PushPull, MISOA>,
+    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<PushPull, MOSIA>,
 {
     pub fn new(
         spi: SPI,
@@ -459,9 +459,9 @@ impl<SPI, SCK, MISO, MOSI, const SCKA: u8, const MISOA: u8, const MOSIA: u8>
     Spi<SPI, (SCK, MISO, MOSI), TransferModeBidi>
 where
     SPI: Instance,
-    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<SCKA>,
-    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<MISOA>,
-    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<MOSIA>,
+    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<PushPull, SCKA>,
+    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<PushPull, MISOA>,
+    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<PushPull, MOSIA>,
 {
     pub fn new_bidi(
         spi: SPI,
@@ -501,9 +501,9 @@ impl<SPI, SCK, MISO, MOSI, TRANSFER_MODE, const SCKA: u8, const MISOA: u8, const
     Spi<SPI, (SCK, MISO, MOSI), TRANSFER_MODE>
 where
     SPI: Instance,
-    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<SCKA>,
-    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<MISOA>,
-    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<MOSIA>,
+    SCK: PinSck<SPI, A = Const<SCKA>> + SetAlternate<PushPull, SCKA>,
+    MISO: PinMiso<SPI, A = Const<MISOA>> + SetAlternate<PushPull, MISOA>,
+    MOSI: PinMosi<SPI, A = Const<MOSIA>> + SetAlternate<PushPull, MOSIA>,
 {
     pub fn release(mut self) -> (SPI, (SCK, MISO, MOSI)) {
         self.pins.0.restore_mode();
diff --git a/src/timer.rs b/src/timer.rs
index c4c18db1..3326533e 100644
--- a/src/timer.rs
+++ b/src/timer.rs
@@ -483,7 +483,7 @@ use crate::gpio::gpiof::*;
 #[allow(unused)]
 #[cfg(feature = "gpioi")]
 use crate::gpio::gpioi::*;
-use crate::gpio::{gpioa::*, gpiob::*, Alternate, AlternateOD};
+use crate::gpio::{gpioa::*, gpiob::*, Alternate};
 #[allow(unused)]
 use crate::gpio::{gpioc::*, gpioh::*};
 
@@ -496,8 +496,7 @@ pub trait PinC4<TIM> {}
 macro_rules! channel_impl {
     ( $( $TIM:ident, $PINC:ident, $PINX:ident, $AF:literal; )+ ) => {
         $(
-            impl $PINC<crate::pac::$TIM> for $PINX<Alternate<$AF>> {}
-            impl $PINC<crate::pac::$TIM> for $PINX<AlternateOD<$AF>> {}
+            impl<Otype> $PINC<crate::pac::$TIM> for $PINX<Alternate<Otype, $AF>> {}
         )+
     };
 }