1 files changed, 103 insertions, 143 deletions

diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c
index 7918d03274..d698049a8b 100644
--- a/firmware/drivers/audio/wm8758.c
+++ b/firmware/drivers/audio/wm8758.c
@@ -41,117 +41,113 @@ const struct sound_settings_info audiohw_settings[] = {
     [SOUND_CHANNELS]      = {"",   0,  1,   0,   5,   0},
     [SOUND_STEREO_WIDTH]  = {"%",  0,  5,   0, 250, 100},
 #ifdef HAVE_RECORDING
-    [SOUND_LEFT_GAIN]     = {"dB", 1,  1,-128,  96,   0},
-    [SOUND_RIGHT_GAIN]    = {"dB", 1,  1,-128,  96,   0},
-    [SOUND_MIC_GAIN]      = {"dB", 1,  1,-128, 108,  16},
+    [SOUND_LEFT_GAIN]     = {"dB", 1,  1,   0,  63,  16},
+    [SOUND_RIGHT_GAIN]    = {"dB", 1,  1,   0,  63,  16},
+    [SOUND_MIC_GAIN]      = {"dB", 1,  1,   0,  63,  16},
 #endif
     [SOUND_BASS_CUTOFF]   = {"",   0,  1,   1,   4,   1},
     [SOUND_TREBLE_CUTOFF] = {"",   0,  1,   1,   4,   1},
 };
 
 /* shadow registers */
-unsigned int eq1_reg;
-unsigned int eq5_reg;
+static unsigned short eq1_reg = EQ1_EQ3DMODE | EQ_GAIN_VALUE(0);
+static unsigned short eq5_reg = EQ_GAIN_VALUE(0);
 
 /* convert tenth of dB volume (-57..6) to master volume register value */
 int tenthdb2master(int db)
 {
-    /* +6 to -57dB in 1dB steps == 64 levels = 6 bits */
-    /* 0111111 == +6dB  (0x3f) = 63) */
-    /* 0111001 == 0dB   (0x39) = 57) */
-    /* 0000001 == -56dB (0x01) = */
-    /* 0000000 == -57dB (0x00) */
-
-    /* 1000000 == Mute (0x40) */
-
     if (db < VOLUME_MIN) {
         return 0x40;
     } else {
-        return((db/10)+57);
+        return (db/10)+57;
     }
 }
 
-/* convert tenth of dB volume (-780..0) to mixer volume register value */
-int tenthdb2mixer(int db)
+int sound_val2phys(int setting, int value)
 {
-    if (db < -660)                 /* 1.5 dB steps */
-        return (2640 - db) / 15;
-    else if (db < -600)            /* 0.75 dB steps */
-        return (990 - db) * 2 / 15;
-    else if (db < -460)            /* 0.5 dB steps */
-        return (460 - db) / 5; 
-    else                           /* 0.25 dB steps */
-        return -db * 2 / 5;
-}
+    int result;
 
-#define IPOD_PCM_LEVEL 0x65       /* -6dB */
+    switch(setting)
+    {
+#ifdef HAVE_RECORDING
+    case SOUND_LEFT_GAIN:
+    case SOUND_RIGHT_GAIN:
+    case SOUND_MIC_GAIN:
+        result = ((value - 16) * 15) / 2;
+        break;
+#endif
+    default:
+        result = value;
+        break;
+    }
 
-//#define BASSCTRL   0x
-//#define TREBCTRL   0x0b
+    return result;
+}
 
-/* Silently enable / disable audio output */
-void audiohw_enable_output(bool enable)
+void audiohw_mute(bool mute)
 {
-    if (enable) 
-    {
-        /* reset the I2S controller into known state */
-        i2s_reset();
-
-        /* TODO: Review the power-up sequence to prevent pops */
+    if (mute) {
+        wmcodec_write(DACCTRL, DACCTRL_SOFTMUTE);
+    } else {
+        wmcodec_write(DACCTRL, 0);
+    }
+}
 
-        wmcodec_write(RESET, 0x1ff);    /*Reset*/
-    
-        wmcodec_write(PWRMGMT1, 0x2b);
-        wmcodec_write(PWRMGMT2, 0x180);
-        wmcodec_write(PWRMGMT3, 0x6f);
+void audiohw_preinit(void)
+{
+    i2s_reset();
 
-        wmcodec_write(AINTFCE, 0x10);
-        wmcodec_write(CLKCTRL, 0x49);
+    wmcodec_write(RESET, RESET_RESET);
 
-        wmcodec_write(OUTCTRL, 1);
+    wmcodec_write(PWRMGMT1, PWRMGMT1_PLLEN | PWRMGMT1_BIASEN
+                          | PWRMGMT1_VMIDSEL_5K);
+    wmcodec_write(PWRMGMT2, PWRMGMT2_ROUT1EN | PWRMGMT2_LOUT1EN);
+    wmcodec_write(PWRMGMT3, PWRMGMT3_LOUT2EN | PWRMGMT3_ROUT2EN
+                          | PWRMGMT3_RMIXEN | PWRMGMT3_LMIXEN
+                          | PWRMGMT3_DACENR | PWRMGMT3_DACENL);
+                          
+    wmcodec_write(AINTFCE, AINTFCE_IWL_16BIT | AINTFCE_FORMAT_I2S);
+    wmcodec_write(OUTCTRL, OUTCTRL_VROI);
+    wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */
 
-        /* The iPod can handle multiple frequencies, but fix at 44.1KHz
-           for now */
-        audiohw_set_sample_rate(WM8758_44100HZ);
+    audiohw_set_sample_rate(WM8758_44100HZ);
     
-        wmcodec_write(LOUTMIX,0x1); /* Enable mixer */
-        wmcodec_write(ROUTMIX,0x1); /* Enable mixer */
-        audiohw_mute(0);
-    } else {
-        audiohw_mute(1);
-    }
+    wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX);
+    wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX);
+}
+
+void audiohw_postinit(void)
+{
+    wmcodec_write(PWRMGMT1, PWRMGMT1_PLLEN | PWRMGMT1_BIASEN
+                          | PWRMGMT1_VMIDSEL_75K); 
+                          /* lower the VMID power consumption */
+    audiohw_mute(false);
 }
 
 void audiohw_set_master_vol(int vol_l, int vol_r)
 {
     /* OUT1 */
-    wmcodec_write(LOUT1VOL, 0x080 | vol_l);
-    wmcodec_write(ROUT1VOL, 0x180 | vol_r);
+    wmcodec_write(LOUT1VOL, LOUT1VOL_LOUT1ZC | vol_l);
+    wmcodec_write(ROUT1VOL, ROUT1VOL_OUT1VU | ROUT1VOL_ROUT1ZC | vol_r);
 }
 
 void audiohw_set_lineout_vol(int vol_l, int vol_r)
 {
     /* OUT2 */
-    wmcodec_write(LOUT2VOL, vol_l);
-    wmcodec_write(ROUT2VOL, 0x100 | vol_r);
-}
-
-void audiohw_set_mixer_vol(int channel1, int channel2)
-{
-    (void)channel1;
-    (void)channel2;
+    wmcodec_write(LOUT2VOL, LOUT2VOL_LOUT2ZC | vol_l);
+    wmcodec_write(ROUT2VOL, ROUT2VOL_OUT2VU | ROUT2VOL_ROUT2ZC | vol_r);
 }
 
 void audiohw_set_bass(int value)
 {
     eq1_reg = (eq1_reg & ~EQ_GAIN_MASK) | EQ_GAIN_VALUE(value);
-    wmcodec_write(EQ1, 0x100 | eq1_reg);
+    wmcodec_write(EQ1, eq1_reg);
 }
 
 void audiohw_set_bass_cutoff(int value)
 {
     eq1_reg = (eq1_reg & ~EQ_CUTOFF_MASK) | EQ_CUTOFF_VALUE(value);
-    wmcodec_write(EQ1, 0x100 | eq1_reg);
+    wmcodec_write(EQ1, eq1_reg);
 }
 
 void audiohw_set_treble(int value)
@@ -166,31 +162,16 @@ void audiohw_set_treble_cutoff(int value)
     wmcodec_write(EQ5, eq5_reg); 
 }
 
-void audiohw_mute(bool mute)
-{
-    if (mute)
-    {
-        /* Set DACMU = 1 to soft-mute the audio DACs. */
-        wmcodec_write(DACCTRL, 0x40);
-    } else {
-        /* Set DACMU = 0 to soft-un-mute the audio DACs. */
-        wmcodec_write(DACCTRL, 0x0);
-    }
-}
-
 /* Nice shutdown of WM8758 codec */
 void audiohw_close(void)
 {
-    audiohw_mute(1);
-
-    wmcodec_write(PWRMGMT3, 0x0);
-
-    wmcodec_write(PWRMGMT1, 0x0);
+    audiohw_mute(true);
 
-    wmcodec_write(PWRMGMT2, 0x40);
+    wmcodec_write(PWRMGMT3, 0);
+    wmcodec_write(PWRMGMT1, 0);
+    wmcodec_write(PWRMGMT2, PWRMGMT2_SLEEP);
 }
 
-/* Change the order of the noise shaper, 5th order is recommended above 32kHz */
 void audiohw_set_nsorder(int order)
 {
     (void)order;
@@ -202,89 +183,68 @@ void audiohw_set_sample_rate(int sampling_control)
     /**** We force 44.1KHz for now. ****/
     (void)sampling_control;
 
-    /* set clock div */
-    wmcodec_write(CLKCTRL, 1 | (0 << 2) | (2 << 5));
-
     /* setup PLL for MHZ=11.2896 */
-    wmcodec_write(PLLN, (1 << 4) | 0x7);
+    wmcodec_write(PLLN, PLLN_PLLPRESCALE | 0x7);
     wmcodec_write(PLLK1, 0x21);
     wmcodec_write(PLLK2, 0x161);
     wmcodec_write(PLLK3, 0x26);
 
     /* set clock div */
-    wmcodec_write(CLKCTRL, 1 | (1 << 2) | (2 << 5) | (1 << 8));
+    wmcodec_write(CLKCTRL, CLKCTRL_CLKSEL | CLKCTRL_MCLKDIV_2
+                         | CLKCTRL_BCLKDIV_2 | CLKCTRL_MS);
 
-    /* set srate */
-    wmcodec_write(SRATECTRL, (0 << 1));
+    wmcodec_write(ADDCTRL, ADDCTRL_SR_48kHz | ADDCTRL_SLOWCLKEN);
+    /* SLOWCLK enabled for zero cross timeout to work */
 }
 
 void audiohw_enable_recording(bool source_mic)
 {
     (void)source_mic; /* We only have a line-in (I think) */
- 
-    /* reset the I2S controller into known state */
-    i2s_reset();
- 
-    wmcodec_write(RESET, 0x1ff);    /*Reset*/
     
-    wmcodec_write(PWRMGMT1, 0x2b);
-    wmcodec_write(PWRMGMT2, 0x18f);  /* Enable ADC - 0x0c enables left/right PGA input, and 0x03 turns on power to the ADCs */
-    wmcodec_write(PWRMGMT3, 0x6f);
+    wmcodec_write(PWRMGMT2, PWRMGMT2_ROUT1EN | PWRMGMT2_LOUT1EN
+                          | PWRMGMT2_INPGAENR | PWRMGMT2_INPGAENL
+                          | PWRMGMT2_ADCENR | PWRMGMT2_ADCENL);
 
-    wmcodec_write(AINTFCE, 0x10);
-    wmcodec_write(CLKCTRL, 0x49);
+    wmcodec_write(INCTRL, INCTRL_R2_2INPGA | INCTRL_L2_2INPGA);
 
-    wmcodec_write(OUTCTRL, 1);
-
-    /* The iPod can handle multiple frequencies, but fix at 44.1KHz
-       for now */
-    audiohw_set_sample_rate(WM8758_44100HZ);
-
-    wmcodec_write(INCTRL,0x44);  /* Connect L2 and R2 inputs */
-
-    /* Set L2/R2_2BOOSTVOL to 0db (bits 4-6) */
-    /* 000 = disabled
-       001 = -12dB
-       010 = -9dB
-       011 = -6dB
-       100 = -3dB
-       101 = 0dB
-       110 = 3dB
-       111 = 6dB
-    */
-    wmcodec_write(LADCBOOST,0x50);
-    wmcodec_write(RADCBOOST,0x50);
-
-    /* Set L/R input PGA Volume to 0db */
-    //    wm8758_write(LINPGAVOL,0x3f);
-    //    wm8758_write(RINPGAVOL,0x13f);
+    wmcodec_write(LADCBOOST, LADCBOOST_L2_2BOOST(5));
+    wmcodec_write(RADCBOOST, RADCBOOST_R2_2BOOST(5));
 
     /* Enable monitoring */
-    wmcodec_write(LOUTMIX,0x17); /* Enable output mixer - BYPL2LMIX @ 0db*/
-    wmcodec_write(ROUTMIX,0x17); /* Enable output mixer - BYPR2RMIX @ 0db*/
-
-    audiohw_mute(0);
+    wmcodec_write(LOUTMIX, LOUTMIX_BYP2LMIXVOL(5)
+                         | LOUTMIX_BYPL2LMIX | LOUTMIX_DACL2LMIX);
+    wmcodec_write(ROUTMIX, ROUTMIX_BYP2RMIXVOL(5)
+                         | ROUTMIX_BYPR2RMIX | ROUTMIX_DACR2RMIX);
 }
 
-void audiohw_disable_recording(void) {
-    audiohw_mute(1);
-
-    wmcodec_write(PWRMGMT3, 0x0);
+void audiohw_disable_recording(void) 
+{
+    wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX);
+    wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX);
 
-    wmcodec_write(PWRMGMT1, 0x0);
- 
-    wmcodec_write(PWRMGMT2, 0x40);
+    wmcodec_write(PWRMGMT2, PWRMGMT2_ROUT1EN | PWRMGMT2_LOUT1EN);
 }
 
-void audiohw_set_recvol(int left, int right, int type) {
-
-    (void)left;
-    (void)right;
-    (void)type;
+void audiohw_set_recvol(int left, int right, int type)
+{
+    switch (type)
+    {
+    case AUDIO_GAIN_MIC:
+        right = left;
+        /* fall through */
+    case AUDIO_GAIN_LINEIN:
+        wmcodec_write(LINPGAVOL, LINPGAVOL_INPGAZCL
+                               | (left & LINPGAVOL_INPGAVOL_MASK));
+        wmcodec_write(RINPGAVOL, RINPGAVOL_INPGAVU | RINPGAVOL_INPGAZCR
+                               | (right & RINPGAVOL_INPGAVOL_MASK));
+        break;
+    default:
+        return;
+    }
 }
 
-void audiohw_set_monitor(bool enable) {
-
+void audiohw_set_monitor(bool enable) 
+{
     (void)enable;
 }