diff --git a/firmware/application/audio.cpp b/firmware/application/audio.cpp
index ac04e106c..c732fcbbb 100644
--- a/firmware/application/audio.cpp
+++ b/firmware/application/audio.cpp
@@ -27,6 +27,7 @@ using portapack::clock_manager;
 
 #include "wm8731.hpp"
 using wolfson::wm8731::WM8731;
+#include "portapack_hal.hpp"
 
 #include "i2s.hpp"
 using namespace lpc43xx;
@@ -160,6 +161,9 @@ void init() {
 		i2s0_config_rx,
 		i2s0_config_dma
 	);
+
+	// Set pin mode, since it's likely GPIO (as left after CPLD JTAG interactions).
+	portapack::pin_i2s0_rx_sda.mode(3);
 }
 
 void shutdown() {
diff --git a/firmware/common/portapack_hal.hpp b/firmware/common/portapack_hal.hpp
index 00098f23c..716e86789 100644
--- a/firmware/common/portapack_hal.hpp
+++ b/firmware/common/portapack_hal.hpp
@@ -56,6 +56,12 @@ constexpr GPIO gpio_cpld_tdo = gpio[GPIO1_8];	// P1_5
 constexpr GPIO gpio_cpld_tck = gpio[GPIO3_0];	// P6_1
 constexpr GPIO gpio_cpld_tdi = gpio[GPIO3_1];	// P6_2
 
+constexpr auto pin_i2s0_mclk   = pins[CLK2];
+constexpr auto pin_i2s0_sck    = pins[P3_0];
+constexpr auto pin_i2s0_ws     = pins[P3_1];
+constexpr auto pin_i2s0_tx_sda = pins[P3_2];
+constexpr auto pin_i2s0_rx_sda = pins[P6_2];
+
 } /* namespace portapack */
 
 #endif/*__PORTAPACK_HAL_H__*/