len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

coldfire: Allow building when 88KHz audio is disabled

Browse source 
Change-Id: Ieeacf591ad4233428dca99c347043e61abae1d1f
This commit is contained in:
Solomon Peachy 2020-10-03 15:57:38 -04:00
parent 2b358ffa7f
commit d5167b1221
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/drivers/audio/uda1380.c
View file

@ -227,11 +227,11 @@ void audiohw_set_frequency(int fsel)
MIX_CTL_SEL_NS, MIX_CTL_SEL_NS,
WSPLL_25_50 | SYSCLK_256FS WSPLL_25_50 | SYSCLK_256FS
}, },
[HW_FREQ_88] = HW_HAVE_88_([HW_FREQ_88] =
{ {
MIX_CTL_SEL_NS, MIX_CTL_SEL_NS,
WSPLL_50_100 | SYSCLK_256FS WSPLL_50_100 | SYSCLK_256FS
}, },)
}; };
const unsigned short *ent; const unsigned short *ent;
@ -243,6 +243,7 @@ void audiohw_set_frequency(int fsel)
#ifdef USE_WSPLL #ifdef USE_WSPLL
/* Enable WSPLL if needed (for Iriver H100 and H300 series) */ /* Enable WSPLL if needed (for Iriver H100 and H300 series) */
HW_HAVE_88_(
if (fsel == HW_FREQ_88) if (fsel == HW_FREQ_88)
{ {
/* Only at this case we need use WSPLL on DAC part for Iriver H100 and H300 series, because Coldfire work /* Only at this case we need use WSPLL on DAC part for Iriver H100 and H300 series, because Coldfire work
@ -251,6 +252,7 @@ void audiohw_set_frequency(int fsel)
if (!wspll_enable) wspll_on(true); if (!wspll_enable) wspll_on(true);
} }
else else
)
{ {
/* At this case WSPLL clock and SYSCLK has same value and we don't use WSPLL to avoid WSPLL errors */ /* At this case WSPLL clock and SYSCLK has same value and we don't use WSPLL to avoid WSPLL errors */
if (wspll_enable) wspll_on(false); if (wspll_enable) wspll_on(false);

2
firmware/target/coldfire/pcm-coldfire.c
View file

@ -77,7 +77,7 @@
#if CONFIG_CPU == MCF5249 && defined(HAVE_UDA1380) #if CONFIG_CPU == MCF5249 && defined(HAVE_UDA1380)
static const unsigned char pcm_freq_parms[HW_NUM_FREQ][2] = static const unsigned char pcm_freq_parms[HW_NUM_FREQ][2] =
{ {
[HW_FREQ_88] = { 0x0c, 0x01 }, HW_HAVE_88_([HW_FREQ_88] = { 0x0c, 0x01 },)
[HW_FREQ_44] = { 0x06, 0x01 }, [HW_FREQ_44] = { 0x06, 0x01 },
[HW_FREQ_22] = { 0x04, 0x02 }, [HW_FREQ_22] = { 0x04, 0x02 },
[HW_FREQ_11] = { 0x02, 0x02 }, [HW_FREQ_11] = { 0x02, 0x02 },