summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/sound.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/firmware/sound.c b/firmware/sound.c
index a3a8eed806..7e29fddec5 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -26,7 +26,7 @@
26#include "mas.h" 26#include "mas.h"
27#ifdef HAVE_UDA1380 27#ifdef HAVE_UDA1380
28#include "uda1380.h" 28#include "uda1380.h"
29#elif defined(HAVE_WM8975) 29#elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
30#include "wm8975.h" 30#include "wm8975.h"
31#elif defined(HAVE_WM8758) 31#elif defined(HAVE_WM8758)
32#include "wm8758.h" 32#include "wm8758.h"
@@ -75,7 +75,7 @@ static const struct sound_settings_info sound_settings_table[] = {
75 [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, 75 [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble},
76#elif defined(HAVE_TLV320) 76#elif defined(HAVE_TLV320)
77 [SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -20, sound_set_volume}, 77 [SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -20, sound_set_volume},
78#elif defined(HAVE_WM8975) 78#elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
79 [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume}, 79 [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume},
80 [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, 80 [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass},
81 [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, 81 [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble},
@@ -316,7 +316,7 @@ static int tenthdb2master(int db)
316 } 316 }
317} 317}
318 318
319#elif defined(HAVE_WM8975) 319#elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
320/* volume/balance/treble/bass interdependency */ 320/* volume/balance/treble/bass interdependency */
321#define VOLUME_MIN -730 321#define VOLUME_MIN -730
322#define VOLUME_MAX 60 322#define VOLUME_MAX 60
@@ -424,7 +424,7 @@ static int tenthdb2mixer(int db)
424 424
425#if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \ 425#if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \
426 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined(HAVE_WM8731) \ 426 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined(HAVE_WM8731) \
427 || defined(HAVE_WM8721) || defined(HAVE_TLV320) 427 || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
428 /* volume/balance/treble/bass interdependency main part */ 428 /* volume/balance/treble/bass interdependency main part */
429#define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN) 429#define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN)
430 430
@@ -457,7 +457,7 @@ static void set_prescaled_volume(void)
457#elif defined(HAVE_UDA1380) 457#elif defined(HAVE_UDA1380)
458 uda1380_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); 458 uda1380_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
459#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ 459#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
460 || defined(HAVE_WM8731) || defined(HAVE_WM8721) 460 || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
461 wmcodec_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); 461 wmcodec_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
462#endif 462#endif
463 463
@@ -484,9 +484,9 @@ static void set_prescaled_volume(void)
484#elif defined(HAVE_UDA1380) 484#elif defined(HAVE_UDA1380)
485 uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r)); 485 uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r));
486#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ 486#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
487 || defined(HAVE_WM8731) || defined(HAVE_WM8721) 487 || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
488 wmcodec_set_master_vol(tenthdb2master(l), tenthdb2master(r)); 488 wmcodec_set_master_vol(tenthdb2master(l), tenthdb2master(r));
489#if defined(HAVE_WM8975) || defined(HAVE_WM8758) 489#if defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8751)
490 wmcodec_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); 490 wmcodec_set_lineout_vol(tenthdb2master(0), tenthdb2master(0));
491#endif 491#endif
492 492
@@ -599,7 +599,7 @@ void sound_set_volume(int value)
599 mas_codec_writereg(0x10, tmp); 599 mas_codec_writereg(0x10, tmp);
600#elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \ 600#elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \
601 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ 601 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \
602 || defined(HAVE_WM8721) || defined(HAVE_TLV320) 602 || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
603 current_volume = value * 10; /* tenth of dB */ 603 current_volume = value * 10; /* tenth of dB */
604 set_prescaled_volume(); 604 set_prescaled_volume();
605#elif CONFIG_CPU == PNX0101 605#elif CONFIG_CPU == PNX0101
@@ -617,7 +617,7 @@ void sound_set_balance(int value)
617 mas_codec_writereg(0x11, tmp); 617 mas_codec_writereg(0x11, tmp);
618#elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \ 618#elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \
619 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ 619 || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \
620 || defined(HAVE_WM8721) || defined(HAVE_TLV320) 620 || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
621 current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ 621 current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */
622 set_prescaled_volume(); 622 set_prescaled_volume();
623#elif CONFIG_CPU == PNX0101 623#elif CONFIG_CPU == PNX0101
@@ -643,7 +643,7 @@ void sound_set_bass(int value)
643 current_bass = value * 10; 643 current_bass = value * 10;
644 set_prescaled_volume(); 644 set_prescaled_volume();
645#elif defined HAVE_WM8975 || defined HAVE_WM8758 \ 645#elif defined HAVE_WM8975 || defined HAVE_WM8758 \
646 || defined HAVE_WM8731 || defined(HAVE_WM8721) 646 || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751)
647 current_bass = value * 10; 647 current_bass = value * 10;
648 wmcodec_set_bass(value); 648 wmcodec_set_bass(value);
649 set_prescaled_volume(); 649 set_prescaled_volume();
@@ -669,7 +669,7 @@ void sound_set_treble(int value)
669 current_treble = value * 10; 669 current_treble = value * 10;
670 set_prescaled_volume(); 670 set_prescaled_volume();
671#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ 671#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
672 || defined(HAVE_WM8731) || defined(HAVE_WM8721) 672 || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
673 wmcodec_set_treble(value); 673 wmcodec_set_treble(value);
674 current_treble = value * 10; 674 current_treble = value * 10;
675 set_prescaled_volume(); 675 set_prescaled_volume();