summaryrefslogtreecommitdiff
path: root/firmware/target/coldfire/iriver
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r--firmware/target/coldfire/iriver/audio-iriver.c6
-rw-r--r--firmware/target/coldfire/iriver/h100/power-h100.c3
-rw-r--r--firmware/target/coldfire/iriver/h100/spdif-h100.c3
3 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/coldfire/iriver/audio-iriver.c b/firmware/target/coldfire/iriver/audio-iriver.c
index bd071430b2..4d22e7c987 100644
--- a/firmware/target/coldfire/iriver/audio-iriver.c
+++ b/firmware/target/coldfire/iriver/audio-iriver.c
@@ -44,7 +44,7 @@ void audio_set_output_source(int source)
44 set_irq_level(level); 44 set_irq_level(level);
45} /* audio_set_output_source */ 45} /* audio_set_output_source */
46 46
47void audio_set_source(int source, unsigned flags) 47void audio_input_mux(int source, unsigned flags)
48{ 48{
49 /* Prevent pops from unneeded switching */ 49 /* Prevent pops from unneeded switching */
50 static int last_source = AUDIO_SRC_PLAYBACK; 50 static int last_source = AUDIO_SRC_PLAYBACK;
@@ -131,6 +131,4 @@ void audio_set_source(int source, unsigned flags)
131 or_l(MUX_BIT, &GPIO_FUNCTION); 131 or_l(MUX_BIT, &GPIO_FUNCTION);
132 132
133 last_source = source; 133 last_source = source;
134} /* audio_set_source */ 134} /* audio_input_mux */
135
136
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c
index ce1c350802..943168967f 100644
--- a/firmware/target/coldfire/iriver/h100/power-h100.c
+++ b/firmware/target/coldfire/iriver/h100/power-h100.c
@@ -89,7 +89,8 @@ void spdif_power_enable(bool on)
89 89
90#ifndef BOOTLOADER 90#ifndef BOOTLOADER
91 /* Make sure the feed is reset */ 91 /* Make sure the feed is reset */
92 spdif_set_output_source(spdif_get_output_source(NULL), true); 92 spdif_set_output_source(spdif_get_output_source(NULL)
93 IF_SPDIF_POWER_(, true));
93#endif 94#endif
94} 95}
95 96
diff --git a/firmware/target/coldfire/iriver/h100/spdif-h100.c b/firmware/target/coldfire/iriver/h100/spdif-h100.c
index ee4a9402ea..beede3fdce 100644
--- a/firmware/target/coldfire/iriver/h100/spdif-h100.c
+++ b/firmware/target/coldfire/iriver/h100/spdif-h100.c
@@ -33,7 +33,8 @@ void spdif_init(void)
33{ 33{
34 /* PHASECONFIG setup: gain = 3*2^13, source = EBUIN */ 34 /* PHASECONFIG setup: gain = 3*2^13, source = EBUIN */
35 PHASECONFIG = (6 << 3) | (4 << 0); 35 PHASECONFIG = (6 << 3) | (4 << 0);
36 spdif_set_output_source(AUDIO_SRC_PLAYBACK, true); 36 spdif_set_output_source(AUDIO_SRC_PLAYBACK
37 IF_SPDIF_POWER_(, true));
37} 38}
38 39
39/* Return the S/PDIF frequency in herz - unrounded */ 40/* Return the S/PDIF frequency in herz - unrounded */