diff --git a/Cargo.toml b/Cargo.toml
index f1a52bd4..1ea032e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -151,15 +151,15 @@ crc = "3.0.1"
 enumset = "1.1.3"
 
 [patch.crates-io]
-esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp-hal-procmacros = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
-esp-hal-common = { git = "https://github.com/esp-rs/esp-hal", rev = "deb9f212845212a6f0bfcd9df0a12484ece59894" }
+esp32-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32s2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32s3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32c2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32c3-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32c6-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp32h2-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp-hal-procmacros = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
+esp-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "9a95c0aa880af7271f059797339bf890d2d59c64" }
 esp-wifi = { git = "https://github.com/esp-rs/esp-wifi", rev = "d200a167237f03cf63edce721a5f85fd65d2db84" }
 
 [features]
diff --git a/src/board/hardware/v1.rs b/src/board/hardware/v1.rs
index 89b4dcf9..79081d46 100644
--- a/src/board/hardware/v1.rs
+++ b/src/board/hardware/v1.rs
@@ -8,8 +8,8 @@ use crate::board::{
         self,
         adc::ADC2,
         clock::ClockControl,
+        dma::*,
         embassy,
-        gdma::*,
         gpio::{Analog, Floating, GpioPin, Input, Output, PullUp, PushPull},
         peripherals::{self, Peripherals},
         prelude::*,
@@ -84,7 +84,7 @@ impl super::startup::StartupResources {
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-        let dma = Gdma::new(peripherals.DMA);
+        let dma = Dma::new(peripherals.DMA);
 
         let display = Self::create_display_driver(
             dma.channel0,
diff --git a/src/board/hardware/v2.rs b/src/board/hardware/v2.rs
index e339ffa8..83fc21c9 100644
--- a/src/board/hardware/v2.rs
+++ b/src/board/hardware/v2.rs
@@ -18,8 +18,8 @@ use crate::board::{
     hal::{
         self,
         clock::ClockControl,
+        dma::*,
         embassy,
-        gdma::*,
         gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull},
         peripherals::{self, Peripherals},
         prelude::*,
@@ -113,7 +113,7 @@ impl super::startup::StartupResources {
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-        let dma = Gdma::new(peripherals.DMA);
+        let dma = Dma::new(peripherals.DMA);
 
         let display = Self::create_display_driver(
             dma.channel0,
diff --git a/src/board/hardware/v4.rs b/src/board/hardware/v4.rs
index f60b0cc7..264d2611 100644
--- a/src/board/hardware/v4.rs
+++ b/src/board/hardware/v4.rs
@@ -7,8 +7,8 @@ use crate::board::{
     hal::{
         self,
         clock::ClockControl,
+        dma::*,
         embassy,
-        gdma::*,
         gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
         i2c::I2C,
         peripherals::{self, Peripherals},
@@ -86,7 +86,7 @@ impl super::startup::StartupResources {
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-        let dma = Gdma::new(peripherals.DMA);
+        let dma = Dma::new(peripherals.DMA);
 
         let display = Self::create_display_driver(
             dma.channel0,
diff --git a/src/board/hardware/v6c6.rs b/src/board/hardware/v6c6.rs
index ac302762..9bc4ba79 100644
--- a/src/board/hardware/v6c6.rs
+++ b/src/board/hardware/v6c6.rs
@@ -7,8 +7,8 @@ use crate::board::{
     hal::{
         self,
         clock::ClockControl,
+        dma::*,
         embassy,
-        gdma::*,
         gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
         i2c::I2C,
         peripherals::{self, Peripherals},
@@ -82,7 +82,7 @@ impl super::startup::StartupResources {
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-        let dma = Gdma::new(peripherals.DMA);
+        let dma = Dma::new(peripherals.DMA);
 
         let display = Self::create_display_driver(
             dma.channel0,
diff --git a/src/board/hardware/v6s3.rs b/src/board/hardware/v6s3.rs
index 880fa884..b55ab96e 100644
--- a/src/board/hardware/v6s3.rs
+++ b/src/board/hardware/v6s3.rs
@@ -7,8 +7,8 @@ use crate::board::{
     hal::{
         self,
         clock::ClockControl,
+        dma::*,
         embassy,
-        gdma::*,
         gpio::{Floating, GpioPin, Input, Output, PullUp, PushPull, Unknown},
         i2c::I2C,
         peripherals::{self, Peripherals},
@@ -82,7 +82,7 @@ impl super::startup::StartupResources {
 
         let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-        let dma = Gdma::new(peripherals.DMA);
+        let dma = Dma::new(peripherals.DMA);
 
         let display = Self::create_display_driver(
             dma.channel0,