diff --git a/firmware/target/arm/tms320dm320/spi-dm320.c b/firmware/target/arm/tms320dm320/spi-dm320.c
index 040955f01a..222228aa8d 100644
--- a/firmware/target/arm/tms320dm320/spi-dm320.c
+++ b/firmware/target/arm/tms320dm320/spi-dm320.c
@@ -124,17 +124,19 @@ void spi_init(void)
     /* Enable TX */
     IO_SERIAL0_TX_ENABLE = 0x0001;
 #ifndef CREATIVE_ZVx
-    /* Set GIO 18 to output for touch screen slave enable */
-    /* Set GIO 29 to output for backlight enable */
-    IO_GIO_DIR1     &= ~(GIO_TS_ENABLE | GIO_BL_ENABLE);
-    IO_GIO_INV1     &= ~(GIO_TS_ENABLE | GIO_BL_ENABLE);    /* non-inverted */
-    IO_GIO_FSEL1    &= ~(0x03<<2);                          /* normal pin */
-    IO_GIO_FSEL2    &= ~(0x03<<8);                          /* normal pin */
+    /* Setup SPI Chip Select Pins:
+     *  12 - RTC
+     *  18 - Touchscreen
+     *  29 - Backlight
+     */
+    /*  12: output, non-inverted, no-irq, falling edge, no-chat, normal */
+    dm320_set_io(12, false, false, false, false, false, 0x00);
     
-    /* Set GIO 12 to output for rtc slave enable */
-    IO_GIO_DIR0     &= ~GIO_RTC_ENABLE;
-    IO_GIO_INV0     &= ~(GIO_RTC_ENABLE);                   /* non-inverted */
-    IO_GIO_FSEL0    &= ~(0x03<<6);                          /* normal pin */
+    /*  18: output, non-inverted, no-irq, falling edge, no-chat, normal */
+    dm320_set_io(18, false, false, false, false, false, 0x00);
+    
+    /*  29: output, non-inverted, no-irq, falling edge, no-chat, normal */
+    dm320_set_io(29, false, false, false, false, false, 0x00);
 #endif
     /* make sure only one is ever enabled at a time */
     spi_disable_all_targets();