2 files changed, 19 insertions, 0 deletions

diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c
index 3d378d0072..59fa4cffcf 100644
--- a/firmware/drivers/audio/wm8731.c
+++ b/firmware/drivers/audio/wm8731.c
@@ -167,7 +167,11 @@ void audiohw_preinit(void)
 
     /* 3) Set required values in all other registers except 12h (Active). */
     wmcodec_write(AINTFCE, AINTFCE_FORMAT_I2S | AINTFCE_IWL_16BIT |
+#ifdef CODEC_SLAVE
+                           0);
+#else
                            AINTFCE_MS);
+#endif
     wm8731_write(AAPCTRL, wm8731_regs[AAPCTRL]);
     wm8731_write(DAPCTRL, wm8731_regs[DAPCTRL]);
     wmcodec_write(SAMPCTRL, WM8731_USB24_44100HZ);
diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index 0f61e5d72b..0f05d90ea2 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -67,6 +67,21 @@ static int fd_log = -1;
 #define FM_NRW_PIN      3
 #define FM_CLOCK_PIN    4
 #define FM_DATA_PIN     5
+#elif defined(IAUDIO_7)
+#define GPIO_OUTPUT_EN  GPIOA_DIR
+#define GPIO_OUTPUT_VAL GPIOA
+#define GPIO_INPUT_VAL  GPIOA
+#define FM_CLOCK_PIN    5
+#define FM_DATA_PIN     6
+#define FM_NRW_PIN      7
+//#define udelay(x)       /* Remove hack when D2 has udelay */
+
+static void udelay(int usecs)
+{
+    while (usecs--)
+        asm("nop;nop;");
+}
+
 #elif defined(COWON_D2)
 #define GPIO_OUTPUT_EN  GPIOC_DIR
 #define GPIO_OUTPUT_VAL GPIOC