1 files changed, 12 insertions, 7 deletions

diff --git a/firmware/sound.c b/firmware/sound.c
index 4d109b3900..fb377f6f6d 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -256,8 +256,9 @@ static void set_prescaled_volume(void)
 /* The WM codecs listed don't have suitable prescaler functionality, so we let
  * the prescaler stay at 0 for these unless SW tone controls are in use */
 #if defined(HAVE_SW_TONE_CONTROLS) || !(defined(HAVE_WM8975) \
-    || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) \
-    || defined(HAVE_WM8758) || defined(HAVE_WM8985)) || defined(HAVE_TSC2100)
+    || defined(HAVE_WM8711) || defined(HAVE_WM8721) || defined(HAVE_WM8731) \
+    || defined(HAVE_WM8751) || defined(HAVE_WM8758) || defined(HAVE_WM8985)) \
+    || defined(HAVE_TSC2100)
 
     prescale = MAX(current_bass, current_treble);
     if (prescale < 0)
@@ -298,8 +299,8 @@ static void set_prescaled_volume(void)
 #if CONFIG_CODEC == MAS3507D
     dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
 #elif defined(HAVE_UDA1380) || defined(HAVE_WM8975) || defined(HAVE_WM8758) \
-   || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) \
-   || defined(HAVE_AS3514) || defined(HAVE_TSC2100)
+   || defined(HAVE_WM8711) || defined(HAVE_WM8721) || defined(HAVE_WM8731) \
+   || defined(HAVE_WM8751) || defined(HAVE_AS3514) || defined(HAVE_TSC2100)
     audiohw_set_master_vol(tenthdb2master(l), tenthdb2master(r));
 #if defined(HAVE_WM8975) || defined(HAVE_WM8758) \
    || (defined(HAVE_WM8751) && !defined(MROBE_100)) \
@@ -625,8 +626,11 @@ void sound_set(int setting, int value)
         sound_set_val(value);
 }
 
-#if (!defined(HAVE_AS3514) && !defined (HAVE_WM8731) && !defined(HAVE_WM8975) \
-  && !defined(HAVE_WM8758) && !defined(HAVE_TSC2100)) || defined(SIMULATOR)
+#if (!defined(HAVE_AS3514) && !defined(HAVE_WM8975) \
+  && !defined(HAVE_WM8758) && !defined(HAVE_TSC2100) \
+  && !defined (HAVE_WM8711) && !defined (HAVE_WM8721) \
+  && !defined (HAVE_WM8731)) \
+  || defined(SIMULATOR)
 int sound_val2phys(int setting, int value)
 {
 #if CONFIG_CODEC == MAS3587F
@@ -664,7 +668,8 @@ int sound_val2phys(int setting, int value)
             break;
     }
     return result;
-#elif defined(HAVE_TLV320) || defined(HAVE_WM8731)
+#elif defined(HAVE_TLV320) || defined(HAVE_WM8711) \
+      || defined(HAVE_WM8721) || defined(HAVE_WM8731)
     int result = 0;
     
     switch(setting)