1 files changed, 15 insertions, 5 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
index 7a877e1415..0bb9e49506 100644
--- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c
@@ -41,13 +41,23 @@ static struct i2c_node wm8978_i2c_node =
 
 void audiohw_init(void)
 {
-    /* USB PLL = 338.688MHz, /30 = 11.2896MHz = 256Fs */
+    /* How SYSCLK for codec is derived (USBPLL=338.688MHz).
+     *
+     * SSI post dividers (SSI2 PODF=4, SSI2 PRE PODF=0):
+     * 338688000Hz / 5 = 67737600Hz = ssi2_clk
+     * 
+     * SSI bit clock dividers (DIV2=1, PSR=0, PM=0):
+     * ssi2_clk / 4 = 16934400Hz = INT_BIT_CLK (MCLK)
+     *
+     * WM Codec post divider (MCLKDIV=1.5):
+     * INT_BIT_CLK (MCLK) / 1.5 = 11289600Hz = 256*fs = SYSCLK
+     */
     imx31_regmod32(&CLKCTL_PDR1,
-                   PDR1_SSI1_PODFw(64-1) | PDR1_SSI2_PODFw(5-1),
-                   PDR1_SSI1_PODF | PDR1_SSI2_PODF);
-    imx31_regmod32(&CLKCTL_PDR1,
-                   PDR1_SSI1_PRE_PODFw(4-1) | PDR1_SSI2_PRE_PODFw(1-1),
+                   PDR1_SSI1_PODFw(64-1) | PDR1_SSI2_PODFw(5-1) |
+                   PDR1_SSI1_PRE_PODFw(8-1) | PDR1_SSI2_PRE_PODFw(1-1),
+                   PDR1_SSI1_PODF | PDR1_SSI2_PODF |
                    PDR1_SSI1_PRE_PODF | PDR1_SSI2_PRE_PODF);
+
     i2c_enable_node(&wm8978_i2c_node, true);
 
     audiohw_preinit();