1 files changed, 166 insertions, 151 deletions

diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c
index 13cfab75ba..6809bf823f 100644
--- a/firmware/drivers/audio/wm8975.c
+++ b/firmware/drivers/audio/wm8975.c
@@ -34,9 +34,6 @@
 #include "audiohw.h"
 #include "i2s.h"
 
-/* use zero crossing to reduce clicks during volume changes */
-#define VOLUME_ZC_WAIT (1<<7)
-
 const struct sound_settings_info audiohw_settings[] = {
     [SOUND_VOLUME]        = {"dB", 0,  1, -74,   6, -25},
     [SOUND_BASS]          = {"dB", 0,  1,  -6,   9,   0},
@@ -45,12 +42,38 @@ 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,  23},
+    [SOUND_RIGHT_GAIN]    = {"dB", 1,  1,   0,  63,  23},
+    [SOUND_MIC_GAIN]      = {"dB", 1,  1,   0,  63,   0},
 #endif
 };
 
+static unsigned short wm8975_regs[] =
+{
+    [LINVOL]   = LINVOL_LZCEN | 23, /* 0dB */
+    [RINVOL]   = RINVOL_RIVU | RINVOL_RZCEN | 23, /* 0dB */
+    [DAPCTRL]  = DAPCTRL_DACMU,
+    [PWRMGMT1] = PWRMGMT1_VMIDSEL_5K | PWRMGMT1_VREF,
+    [PWRMGMT2] = PWRMGMT2_DACL | PWRMGMT2_DACR | PWRMGMT2_LOUT1 
+                 | PWRMGMT2_ROUT1 | PWRMGMT2_LOUT2 | PWRMGMT2_ROUT2,
+};
+
+static void wm8975_write(int reg, unsigned val)
+{
+    wm8975_regs[reg] = val;
+    wmcodec_write(reg, val);
+}
+
+static void wm8975_write_and(int reg, unsigned bits)
+{
+    wm8975_write(reg, wm8975_regs[reg] & bits);
+}
+
+static void wm8975_write_or(int reg, unsigned bits)
+{
+    wm8975_write(reg, wm8975_regs[reg] | bits);
+}
+
 /* convert tenth of dB volume (-730..60) to master volume register value */
 int tenthdb2master(int db)
 {
@@ -67,65 +90,83 @@ int tenthdb2master(int db)
     }
 }
 
-#define IPOD_PCM_LEVEL 0x65       /* -6dB */
+int sound_val2phys(int setting, int value)
+{
+    int result;
+
+    switch(setting)
+    {
+#ifdef HAVE_RECORDING
+    case SOUND_LEFT_GAIN:
+    case SOUND_RIGHT_GAIN:
+        result = ((value - 23) * 15) / 2;
+        break;
+    case SOUND_MIC_GAIN:
+        result = ((value - 23) * 15) / 2 + 200;
+        break;
+#endif
+    default:
+        result = value;
+        break;
+    }
 
+    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();
-
-        /*
-         * 1. Switch on power supplies.
-         *    By default the WM8750L is in Standby Mode, the DAC is
-         *    digitally muted and the Audio Interface, Line outputs
-         *    and Headphone outputs are all OFF (DACMU = 1 Power
-         *    Management registers 1 and 2 are all zeros).
-         */
-        wmcodec_write(RESET, 0x1ff);    /*Reset*/
-        wmcodec_write(RESET, 0x0);
-    
-         /* 2. Enable Vmid and VREF. */
-        wmcodec_write(PWRMGMT1, 0xc0);    /*Pwr Mgmt(1)*/
+    if (mute) {
+        /* Set DACMU = 1 to soft-mute the audio DACs. */
+        wm8975_write_or(DAPCTRL, DAPCTRL_DACMU);
+    } else {
+        /* Set DACMU = 0 to soft-un-mute the audio DACs. */
+        wm8975_write_and(DAPCTRL, ~DAPCTRL_DACMU);
+    }
+}
 
-        /* From app notes: allow Vref to stabilize to reduce clicks */
-        sleep(HZ/4);
-    
-         /* 3. Enable DACs as required. */
-        wmcodec_write(PWRMGMT2, 0x180);    /*Pwr Mgmt(2)*/
-    
-         /* 4. Enable line and / or headphone output buffers as required. */
-        wmcodec_write(PWRMGMT2, 0x1f8);    /*Pwr Mgmt(2)*/
-    
-        /* BCLKINV=0(Dont invert BCLK) MS=1(Enable Master) LRSWAP=0 LRP=0 */
-        /* IWL=00(16 bit) FORMAT=10(I2S format) */
-        wmcodec_write(AINTFCE, 0x42);
+#define IPOD_PCM_LEVEL 0x65       /* -6dB */
+
+void audiohw_preinit(void)
+{
+    i2s_reset();
+
+    /* POWER UP SEQUENCE */
+    wmcodec_write(RESET, RESET_RESET);
+
+    /* 2. Enable Vmid and VREF, quick startup. */
+    wm8975_write(PWRMGMT1, wm8975_regs[PWRMGMT1]);
+    sleep(HZ/50);
+    wm8975_regs[PWRMGMT1] &= ~PWRMGMT1_VMIDSEL_MASK;
+    wm8975_write(PWRMGMT1, wm8975_regs[PWRMGMT1] | PWRMGMT1_VMIDSEL_50K);
     
-        /* The iPod can handle multiple frequencies, but fix at 44.1KHz for now */
-        audiohw_set_sample_rate(WM8975_44100HZ);
+    /* 4. Enable DACs, line and headphone output buffers as required. */
+    wm8975_write(PWRMGMT2, wm8975_regs[PWRMGMT2]);
     
-        /* set the volume to -6dB */
-        wmcodec_write(LOUT1VOL, VOLUME_ZC_WAIT | IPOD_PCM_LEVEL);
-        wmcodec_write(ROUT1VOL, VOLUME_ZC_WAIT | 0x100 | IPOD_PCM_LEVEL);
+    wmcodec_write(AINTFCE, AINTFCE_MS | AINTFCE_LRP_I2S_RLO
+                         | AINTFCE_IWL_16BIT | AINTFCE_FORMAT_I2S);
+
+    wm8975_write(DAPCTRL, wm8975_regs[DAPCTRL] );
+
+    audiohw_set_sample_rate(WM8975_44100HZ);
 
-        wmcodec_write(LOUTMIX1, 0x150);    /* Left out Mix(def) */
-        wmcodec_write(LOUTMIX2, 0x50);
+    /* set the volume to -6dB */
+    wmcodec_write(LOUT1VOL, LOUT1VOL_LO1ZC | IPOD_PCM_LEVEL);
+    wmcodec_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | IPOD_PCM_LEVEL);
+
+    wmcodec_write(LOUTMIX1, LOUTMIX1_LD2LO| LOUTMIX1_LI2LOVOL(5));
+    wmcodec_write(LOUTMIX2, LOUTMIX2_RI2LOVOL(5));
     
-        wmcodec_write(ROUTMIX1, 0x50);    /* Right out Mix(def) */
-        wmcodec_write(ROUTMIX2, 0x150);
+    wmcodec_write(ROUTMIX1, ROUTMIX1_LI2ROVOL(5));
+    wmcodec_write(ROUTMIX2, ROUTMIX2_RD2RO| ROUTMIX2_RI2ROVOL(5));
     
-        wmcodec_write(MOUTMIX1, 0x0);     /* Mono out Mix */
-        wmcodec_write(MOUTMIX2, 0x0);
-
-        audiohw_mute(0);
-    } else {
-        audiohw_mute(1);
-    }
+    wmcodec_write(MOUTMIX1, 0);
+    wmcodec_write(MOUTMIX2, 0);
 }
 
+void audiohw_postinit(void)
+{
+    audiohw_mute(false);
+}
 
 
 void audiohw_set_master_vol(int vol_l, int vol_r)
@@ -137,163 +178,137 @@ void audiohw_set_master_vol(int vol_l, int vol_r)
     /* 0101111 == mute (0x2f) */
 
     /* OUT1 */
-    wmcodec_write(LOUT1VOL, VOLUME_ZC_WAIT | vol_l);
-    wmcodec_write(ROUT1VOL, VOLUME_ZC_WAIT | 0x100 | vol_r);
+    wmcodec_write(LOUT1VOL, LOUT1VOL_LO1ZC | vol_l);
+    wmcodec_write(ROUT1VOL, ROUT1VOL_RO1VU | ROUT1VOL_RO1ZC | vol_r);
 }
 
 void audiohw_set_lineout_vol(int vol_l, int vol_r)
 {
     /* OUT2 */
-    wmcodec_write(LOUT2VOL, VOLUME_ZC_WAIT | vol_l);
-    wmcodec_write(ROUT2VOL, VOLUME_ZC_WAIT | 0x100 | vol_r);
+    wmcodec_write(LOUT2VOL, LOUT2VOL_LO2ZC | vol_l);
+    wmcodec_write(ROUT2VOL, ROUT2VOL_RO2VU | ROUT2VOL_RO2ZC | vol_r);
 }
 
 void audiohw_set_bass(int value)
 {
     const int regvalues[] = {
-        11, 10, 10, 9, 8, 8, 0xf, 6, 6, 5, 4, 4, 3, 2, 1, 0
+        11, 10, 10, 9, 8, 8, 0xf, 6, 6, 5, 4, 4, 3, 2, 2, 1
     };
 
     if ((value >= -6) && (value <= 9)) {
         /* We use linear bass control with 200 Hz cutoff */
-        wmcodec_write(BASSCTRL, regvalues[value + 6] | 0x40);
+        wmcodec_write(BASSCTRL, regvalues[value + 6] | BASSCTRL_BC);
     }
 }
 
 void audiohw_set_treble(int value)
 {
     const int regvalues[] = {
-        11, 10, 10, 9, 8, 8, 0xf, 6, 6, 5, 4, 4, 3, 2, 1, 0
+        11, 10, 10, 9, 8, 8, 0xf, 6, 6, 5, 4, 4, 3, 2, 2, 1
     };
 
     if ((value >= -6) && (value <= 9)) {
         /* We use linear treble control with 4 kHz cutoff */
-        wmcodec_write(TREBCTRL, regvalues[value + 6] | 0x40);
-    }
-}
-
-void audiohw_mute(bool mute)
-{
-    if (mute)
-    {
-        /* Set DACMU = 1 to soft-mute the audio DACs. */
-        wmcodec_write(DACCTRL, 0x8);
-    } else {
-        /* Set DACMU = 0 to soft-un-mute the audio DACs. */
-        wmcodec_write(DACCTRL, 0x0);
+        wmcodec_write(TREBCTRL, regvalues[value + 6] | TREBCTRL_TC);
     }
 }
 
 /* Nice shutdown of WM8975 codec */
 void audiohw_close(void)
 {
-    /* 1. Set DACMU = 1 to soft-mute the audio DACs. */
-    wmcodec_write(DACCTRL, 0x8);
+    audiohw_mute(true);
 
     /* 2. Disable all output buffers. */
-    wmcodec_write(PWRMGMT2, 0x0);     /*Pwr Mgmt(2)*/
+    wmcodec_write(PWRMGMT2, 0x0);
 
     /* 3. Switch off the power supplies. */
-    wmcodec_write(PWRMGMT1, 0x0);     /*Pwr Mgmt(1)*/
+    wmcodec_write(PWRMGMT1, 0x0);
 }
 
-/* Change the order of the noise shaper, 5th order is recommended above 32kHz */
 void audiohw_set_nsorder(int order)
 {
     (void)order;
 }
 
 /* Note: Disable output before calling this function */
-void audiohw_set_sample_rate(int sampling_control) {
-
-  wmcodec_write(0x08, sampling_control);
-
+void audiohw_set_sample_rate(int sampling_control)
+{
+  wmcodec_write(SAMPCTRL, sampling_control);
 }
 
+#ifdef HAVE_RECORDING
 void audiohw_enable_recording(bool source_mic)
 {
-     (void)source_mic;
-
-    /* reset the I2S controller into known state */
-    i2s_reset();
-
-    /*
-     * 1. Switch on power supplies.
-     *    By default the WM8750L is in Standby Mode, the DAC is
-     *    digitally muted and the Audio Interface, Line outputs
-     *    and Headphone outputs are all OFF (DACMU = 1 Power
-     *    Management registers 1 and 2 are all zeros).
-     */
-    wmcodec_write(0x0f, 0x1ff);
-    wmcodec_write(0x0f, 0x000);
-
-     /* 2. Enable Vmid and VREF. */
-    wmcodec_write(0x19, 0xc0);               /*Pwr Mgmt(1)*/
-
-     /* 3. Enable ADCs as required. */
-    wmcodec_write(0x19, 0xcc);               /*Pwr Mgmt(1)*/
-    wmcodec_write(0x1a, 0x180);              /*Pwr Mgmt(2)*/
-
-     /* 4. Enable line and / or headphone output buffers as required. */
-    wmcodec_write(0x19, 0xfc);               /*Pwr Mgmt(1)*/
+    wm8975_regs[PWRMGMT1] |= PWRMGMT1_AINL | PWRMGMT1_AINR
+                           | PWRMGMT1_ADCL | PWRMGMT1_ADCR;
+    wm8975_write(PWRMGMT1, wm8975_regs[PWRMGMT1]);
 
-    /* BCLKINV=0(Dont invert BCLK) MS=1(Enable Master) LRSWAP=0 LRP=0 */
-    /* IWL=00(16 bit) FORMAT=10(I2S format) */
-    wmcodec_write(0x07, 0x42);
+    /* NOTE: When switching to digital monitoring we will not want
+     * the DACs disabled. Also the outputs shouldn't be disabled
+     * when recording from line in (dock connector) - needs testing. */
+    wm8975_regs[PWRMGMT2] &= ~(PWRMGMT2_LOUT1 | PWRMGMT2_ROUT1
+                               | PWRMGMT2_LOUT2 | PWRMGMT2_ROUT2);
+    wm8975_write(PWRMGMT2, wm8975_regs[PWRMGMT2]);
 
-    /* The iPod can handle multiple frequencies, but fix at 44.1KHz for now */
-    audiohw_set_sample_rate(WM8975_44100HZ);
-
-    /* unmute inputs */
-    wmcodec_write(0x00, 0x17);               /* LINVOL (def 0dB) */
-    wmcodec_write(0x01, 0x117);              /* RINVOL (def 0dB) */
+    wm8975_write_or(LINVOL, LINVOL_LINMUTE);
+    wm8975_write_or(RINVOL, RINVOL_RINMUTE);
 
-    wmcodec_write(0x15, 0x1d7);                /* LADCVOL max vol x was ff */
-    wmcodec_write(0x16, 0x1d7);                /* RADCVOL max vol x was ff */
+    wmcodec_write(ADDCTRL3, ADDCTRL3_VROI);
 
     if (source_mic) {
-        /* VSEL=10(def) DATSEL=10 (use right ADC only) */
-        wmcodec_write(0x17, 0xc9);                 /* Additional control(1) */
-
-        /* VROI=1 (sets output resistance to 40kohms) */
-        wmcodec_write(0x1b, 0x40);                 /* Additional control(3) */
-
-        /* LINSEL=1 (LINPUT2) LMICBOOST=10 (20dB boost) */
-        wmcodec_write(0x20, 0x60);               /* ADCL signal path */
-        wmcodec_write(0x21, 0x60);               /* ADCR signal path */
+        wmcodec_write(ADDCTRL1, ADDCTRL1_VSEL_LOWBIAS | ADDCTRL1_DATSEL_RADC
+                              | ADDCTRL1_TOEN);
+        wmcodec_write(ADCLPATH, 0);
+        wmcodec_write(ADCRPATH, ADCRPATH_RINSEL_RIN2 | ADCRPATH_RMICBOOST_20dB);
     } else {
-        /* VSEL=10(def) DATSEL=00 (left->left, right->right) */
-        wmcodec_write(0x17, 0xc1);                 /* Additional control(1) */
-
-        /* VROI=1 (sets output resistance to 40kohms) */
-        wmcodec_write(0x1b, 0x40);                 /* Additional control(3) */
-
-        /* LINSEL=0 (LINPUT1) LMICBOOST=00 (bypass boost) */
-        wmcodec_write(0x20, 0x00);               /* ADCL signal path */
-        /* RINSEL=0 (RINPUT1) RMICBOOST=00 (bypass boost) */
-        wmcodec_write(0x21, 0x00);               /* ADCR signal path */
+        wmcodec_write(ADDCTRL1, ADDCTRL1_VSEL_LOWBIAS | ADDCTRL1_DATSEL_NORMAL
+                              | ADDCTRL1_TOEN);
+        wmcodec_write(ADCLPATH, ADCLPATH_LINSEL_LIN1 | ADCLPATH_LMICBOOST_OFF);
+        wmcodec_write(ADCRPATH, ADCRPATH_RINSEL_RIN1 | ADCRPATH_RMICBOOST_OFF);
     }
+    wm8975_write_and(LINVOL, ~LINVOL_LINMUTE);
+    wm8975_write_and(RINVOL, ~RINVOL_RINMUTE);
 }
- 
-void audiohw_disable_recording(void) {
-    /* 1. Set DACMU = 1 to soft-mute the audio DACs. */
-    wmcodec_write(0x05, 0x8);
 
-    /* 2. Disable all output buffers. */
-    wmcodec_write(0x1a, 0x0);        /*Pwr Mgmt(2)*/
+void audiohw_disable_recording(void) 
+{
+    /* mute inputs */
+    wm8975_write_or(LINVOL, LINVOL_LINMUTE);
+    wm8975_write_or(RINVOL, RINVOL_RINMUTE);
 
-    /* 3. Switch off the power supplies. */
-    wmcodec_write(0x19, 0x0);        /*Pwr Mgmt(1)*/
-}
+    wmcodec_write(ADDCTRL3, 0);
 
-void audiohw_set_recvol(int left, int right, int type) {
+    wm8975_regs[PWRMGMT2] |= PWRMGMT2_DACL | PWRMGMT2_DACR
+                           | PWRMGMT2_LOUT1 | PWRMGMT2_ROUT1
+                           | PWRMGMT2_LOUT2 | PWRMGMT2_ROUT2;
+    wm8975_write(PWRMGMT2, wm8975_regs[PWRMGMT2]);
 
-    (void)left;
-    (void)right;
-    (void)type;
+    wm8975_regs[PWRMGMT1] &= ~(PWRMGMT1_AINL | PWRMGMT1_AINR
+                               | PWRMGMT1_ADCL | PWRMGMT1_ADCR);
+    wm8975_write(PWRMGMT1, wm8975_regs[PWRMGMT1]);
 }
 
-void audiohw_set_monitor(bool enable) {
+void audiohw_set_recvol(int left, int right, int type)
+{
+    switch (type)
+    {
+    case AUDIO_GAIN_MIC:  /* Mic uses right ADC */
+        wm8975_regs[RINVOL] &= ~RINVOL_MASK;
+        wm8975_write_or(RINVOL, left & RINVOL_MASK);
+        break;
+    case AUDIO_GAIN_LINEIN:
+        wm8975_regs[LINVOL] &= ~LINVOL_MASK;
+        wm8975_write_or(LINVOL, left & LINVOL_MASK);
+        wm8975_regs[RINVOL] &= ~RINVOL_MASK;
+        wm8975_write_or(RINVOL, right & RINVOL_MASK);
+        break;
+    default:
+        return;
+    }
+}
 
+void audiohw_set_monitor(bool enable)
+{
     (void)enable;
 }
+#endif /* HAVE_RECORDING */