Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xduoox3: Work out clocks for 176/192KHz support.

Browse source 
Note:  PCM mix buffer sizes are _way_ too small for these high bitrates

(We really need to make the mixer stuff use dynamic buffer sizes based
 on the bitrate.  Maybe pre-allocate a max size based on upper bitrate limit,
 but use only part of it at lower bitrates?  So we can have sane latency..)

Change-Id: Id7b4afd73dba7f1ffb84b2e1c016859fae5d6835
This commit is contained in:
Solomon Peachy 2020-10-01 17:12:35 -04:00
parent db22dae2f9
commit f4f3255edf
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config/xduoox3.h
View file

@ -106,7 +106,7 @@
#define HAVE_SW_TONE_CONTROLS #define HAVE_SW_TONE_CONTROLS
/* define the bitmask of hardware sample rates */ /* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
#define AB_REPEAT_ENABLE #define AB_REPEAT_ENABLE

23
firmware/target/mips/ingenic_jz47xx/codec-jz4760.c
View file

@ -208,9 +208,6 @@ void audiohw_set_frequency(int fsel)
// bclk is 2,3,4,6,8,12 ONLY // bclk is 2,3,4,6,8,12 ONLY
// mclk is 1..512 // mclk is 1..512
// for cs4398, BCLK must be 4 for single-rate, 2 for double-rate, 1 for quad-rate!
// 11.025 and 22.050 are a little wonky.
switch(fsel) switch(fsel)
{ {
case HW_FREQ_8: // 0.512 MHz case HW_FREQ_8: // 0.512 MHz
@ -222,8 +219,6 @@ void audiohw_set_frequency(int fsel)
case HW_FREQ_11: // 0.7056 MHz case HW_FREQ_11: // 0.7056 MHz
pll1_speed = 508000000 / 3; pll1_speed = 508000000 / 3;
mclk_div = 180 / 3; mclk_div = 180 / 3;
// pll1_speed = 0;
// mclk_div = 272;
bclk_div = 4; bclk_div = 4;
func_mode = 0; func_mode = 0;
break; break;
@ -242,8 +237,6 @@ void audiohw_set_frequency(int fsel)
case HW_FREQ_22: // 1.4112 MHz case HW_FREQ_22: // 1.4112 MHz
pll1_speed = 508000000 / 3; pll1_speed = 508000000 / 3;
mclk_div = 90 / 3; mclk_div = 90 / 3;
// pll1_speed = 0;
// mclk_div = 136;
bclk_div = 4; bclk_div = 4;
func_mode = 0; func_mode = 0;
break; break;
@ -263,8 +256,6 @@ void audiohw_set_frequency(int fsel)
case HW_FREQ_44: // 2.8224 MHz case HW_FREQ_44: // 2.8224 MHz
pll1_speed = 508000000 / 3; pll1_speed = 508000000 / 3;
mclk_div = 45 / 3; mclk_div = 45 / 3;
// pll1_speed = 0;
// mclk_div = 68;
bclk_div = 4; bclk_div = 4;
dem = CS4398_DEM_44100; dem = CS4398_DEM_44100;
func_mode = 0; func_mode = 0;
@ -285,8 +276,6 @@ void audiohw_set_frequency(int fsel)
case HW_FREQ_88: // 5.6448 MHz case HW_FREQ_88: // 5.6448 MHz
pll1_speed = 508000000 / 3; pll1_speed = 508000000 / 3;
mclk_div = 45 / 3; mclk_div = 45 / 3;
// pll1_speed = 0;
// mclk_div = 68;
bclk_div = 2; bclk_div = 2;
func_mode = 1; func_mode = 1;
break; break;
@ -296,6 +285,18 @@ void audiohw_set_frequency(int fsel)
bclk_div = 2; bclk_div = 2;
func_mode = 1; func_mode = 1;
break; break;
case HW_FREQ_176: // 11.2896 MHz
pll1_speed = 508000000*2;
mclk_div = 45;
bclk_div = 2;
func_mode = 2;
break;
case HW_FREQ_192: // 12.288 MHz
pll1_speed = 516000000;
mclk_div = 42/2;
bclk_div = 2;
func_mode = 2;
break;
default: default:
return; return;
} }