summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/drivers/tlv320.c2
-rw-r--r--firmware/pcm_playback.c6
-rw-r--r--firmware/system.c6
-rw-r--r--firmware/target/coldfire/iaudio/x5/system-x5.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/firmware/drivers/tlv320.c b/firmware/drivers/tlv320.c
index bae1f59f95..e2ad5d7594 100644
--- a/firmware/drivers/tlv320.c
+++ b/firmware/drivers/tlv320.c
@@ -81,7 +81,7 @@ void tlv320_init(void)
81 tlv320_write_reg(REG_DAIF, DAIF_IWL_16|DAIF_FOR_I2S); 81 tlv320_write_reg(REG_DAIF, DAIF_IWL_16|DAIF_FOR_I2S);
82 tlv320_set_headphone_vol(0, 0); 82 tlv320_set_headphone_vol(0, 0);
83 tlv320_write_reg(REG_DIA, DIA_ACT); 83 tlv320_write_reg(REG_DIA, DIA_ACT);
84 tlv320_write_reg(REG_SRC, SRC_CLKIN); 84 tlv320_write_reg(REG_SRC, (8 << 2)); /* 44.1kHz */
85} 85}
86 86
87/** 87/**
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index 22dc34d7c2..9e28891e6d 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -118,20 +118,20 @@ void pcm_set_frequency(unsigned int frequency)
118 switch(frequency) 118 switch(frequency)
119 { 119 {
120 case 11025: 120 case 11025:
121 pcm_freq = 0x4; 121 pcm_freq = 0x2;
122#ifdef HAVE_UDA1380 122#ifdef HAVE_UDA1380
123 uda1380_set_nsorder(3); 123 uda1380_set_nsorder(3);
124#endif 124#endif
125 break; 125 break;
126 case 22050: 126 case 22050:
127 pcm_freq = 0x6; 127 pcm_freq = 0x4;
128#ifdef HAVE_UDA1380 128#ifdef HAVE_UDA1380
129 uda1380_set_nsorder(3); 129 uda1380_set_nsorder(3);
130#endif 130#endif
131 break; 131 break;
132 case 44100: 132 case 44100:
133 default: 133 default:
134 pcm_freq = 0xC; 134 pcm_freq = 0x6;
135#ifdef HAVE_UDA1380 135#ifdef HAVE_UDA1380
136 uda1380_set_nsorder(5); 136 uda1380_set_nsorder(5);
137#endif 137#endif
diff --git a/firmware/system.c b/firmware/system.c
index ec7feb7a21..87bec1b2e8 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -600,7 +600,7 @@ void set_cpu_frequency(long frequency)
600 /* Refresh timer for bypass frequency */ 600 /* Refresh timer for bypass frequency */
601 PLLCR &= ~1; /* Bypass mode */ 601 PLLCR &= ~1; /* Bypass mode */
602 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false); 602 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
603 PLLCR = 0x11856005; 603 PLLCR = 0x11c56005;
604 CSCR0 = 0x00001180; /* Flash: 4 wait states */ 604 CSCR0 = 0x00001180; /* Flash: 4 wait states */
605 CSCR1 = 0x00000980; /* LCD: 2 wait states */ 605 CSCR1 = 0x00000980; /* LCD: 2 wait states */
606 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. 606 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
@@ -617,7 +617,7 @@ void set_cpu_frequency(long frequency)
617 /* Refresh timer for bypass frequency */ 617 /* Refresh timer for bypass frequency */
618 PLLCR &= ~1; /* Bypass mode */ 618 PLLCR &= ~1; /* Bypass mode */
619 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false); 619 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
620 PLLCR = 0x1385e005; 620 PLLCR = 0x13c5e005;
621 CSCR0 = 0x00000580; /* Flash: 1 wait state */ 621 CSCR0 = 0x00000580; /* Flash: 1 wait state */
622 CSCR1 = 0x00000180; /* LCD: 0 wait states */ 622 CSCR1 = 0x00000180; /* LCD: 0 wait states */
623 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. 623 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
@@ -633,7 +633,7 @@ void set_cpu_frequency(long frequency)
633 /* Refresh timer for bypass frequency */ 633 /* Refresh timer for bypass frequency */
634 PLLCR &= ~1; /* Bypass mode */ 634 PLLCR &= ~1; /* Bypass mode */
635 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true); 635 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true);
636 PLLCR = 0x10800200; /* Power down PLL, but keep CLSEL and CRSEL */ 636 PLLCR = 0x10c00200; /* Power down PLL, but keep CLSEL and CRSEL */
637 CSCR0 = 0x00000180; /* Flash: 0 wait states */ 637 CSCR0 = 0x00000180; /* Flash: 0 wait states */
638 CSCR1 = 0x00000180; /* LCD: 0 wait states */ 638 CSCR1 = 0x00000180; /* LCD: 0 wait states */
639 DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ 639 DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */
diff --git a/firmware/target/coldfire/iaudio/x5/system-x5.c b/firmware/target/coldfire/iaudio/x5/system-x5.c
index dee605733f..97d5ecc715 100644
--- a/firmware/target/coldfire/iaudio/x5/system-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/system-x5.c
@@ -37,7 +37,7 @@ void set_cpu_frequency(long frequency)
37 /* Refresh timer for bypass frequency */ 37 /* Refresh timer for bypass frequency */
38 PLLCR &= ~1; /* Bypass mode */ 38 PLLCR &= ~1; /* Bypass mode */
39 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false); 39 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
40 PLLCR = 0x13042045; 40 PLLCR = 0x13442045;
41 CSCR0 = 0x00001180; /* Flash: 4 wait states */ 41 CSCR0 = 0x00001180; /* Flash: 4 wait states */
42 CSCR1 = 0x00000980; /* LCD: 2 wait states */ 42 CSCR1 = 0x00000980; /* LCD: 2 wait states */
43 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. 43 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
@@ -54,7 +54,7 @@ void set_cpu_frequency(long frequency)
54 /* Refresh timer for bypass frequency */ 54 /* Refresh timer for bypass frequency */
55 PLLCR &= ~1; /* Bypass mode */ 55 PLLCR &= ~1; /* Bypass mode */
56 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false); 56 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, false);
57 PLLCR = 0x16030045; 57 PLLCR = 0x16430045;
58 CSCR0 = 0x00000580; /* Flash: 1 wait state */ 58 CSCR0 = 0x00000580; /* Flash: 1 wait state */
59 CSCR1 = 0x00000180; /* LCD: 0 wait states */ 59 CSCR1 = 0x00000180; /* LCD: 0 wait states */
60 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. 60 while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked.
@@ -70,7 +70,7 @@ void set_cpu_frequency(long frequency)
70 /* Refresh timer for bypass frequency */ 70 /* Refresh timer for bypass frequency */
71 PLLCR &= ~1; /* Bypass mode */ 71 PLLCR &= ~1; /* Bypass mode */
72 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true); 72 timers_adjust_prescale(CPUFREQ_DEFAULT_MULT, true);
73 PLLCR = 0x10800200; /* Power down PLL, but keep CLSEL and CRSEL */ 73 PLLCR = 0x10400200; /* Power down PLL, but keep CLSEL and CRSEL */
74 CSCR0 = 0x00000180; /* Flash: 0 wait states */ 74 CSCR0 = 0x00000180; /* Flash: 0 wait states */
75 CSCR1 = 0x00000180; /* LCD: 0 wait states */ 75 CSCR1 = 0x00000180; /* LCD: 0 wait states */
76 DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ 76 DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */