diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/pcm-pp.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/pcm-telechips.c | 13 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/iaudio7/audio-iaudio7.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/m200/audio-m200.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/wmcodec-pp.c | 18 |
6 files changed, 12 insertions, 42 deletions
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c index c572578383..2c4a6ac87d 100644 --- a/firmware/target/arm/pcm-pp.c +++ b/firmware/target/arm/pcm-pp.c | |||
@@ -373,14 +373,6 @@ void pcm_play_dma_init(void) | |||
373 | /* Initialize default register values. */ | 373 | /* Initialize default register values. */ |
374 | audiohw_init(); | 374 | audiohw_init(); |
375 | 375 | ||
376 | #if !defined(HAVE_WM8731) && !defined(HAVE_WM8751) && !defined(HAVE_WM8975) \ | ||
377 | && !defined(HAVE_WM8758) && !defined(HAVE_AS3514) | ||
378 | /* Power on */ | ||
379 | audiohw_enable_output(true); | ||
380 | /* Unmute the master channel (DAC should be at zero point now). */ | ||
381 | audiohw_mute(false); | ||
382 | #endif | ||
383 | |||
384 | dma_play_data.size = 0; | 376 | dma_play_data.size = 0; |
385 | #if NUM_CORES > 1 | 377 | #if NUM_CORES > 1 |
386 | dma_play_data.core = 0; /* no core in control */ | 378 | dma_play_data.core = 0; /* no core in control */ |
diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c index b3fd9216dc..dc77b36f00 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c | |||
@@ -108,19 +108,18 @@ void pcm_play_dma_init(void) | |||
108 | 108 | ||
109 | /* Initialize default register values. */ | 109 | /* Initialize default register values. */ |
110 | audiohw_init(); | 110 | audiohw_init(); |
111 | 111 | ||
112 | /* Power on */ | ||
113 | audiohw_enable_output(true); | ||
114 | |||
115 | /* Unmute the master channel (DAC should be at zero point now). */ | ||
116 | audiohw_mute(false); | ||
117 | |||
118 | dma_play_data.size = 0; | 112 | dma_play_data.size = 0; |
119 | #if NUM_CORES > 1 | 113 | #if NUM_CORES > 1 |
120 | dma_play_data.core = 0; /* no core in control */ | 114 | dma_play_data.core = 0; /* no core in control */ |
121 | #endif | 115 | #endif |
122 | } | 116 | } |
123 | 117 | ||
118 | void pcm_postinit(void) | ||
119 | { | ||
120 | audiohw_postinit(); | ||
121 | } | ||
122 | |||
124 | void pcm_apply_settings(void) | 123 | void pcm_apply_settings(void) |
125 | { | 124 | { |
126 | pcm_curr_sampr = pcm_freq; | 125 | pcm_curr_sampr = pcm_freq; |
diff --git a/firmware/target/arm/tcc77x/iaudio7/audio-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/audio-iaudio7.c index 4e7f58df47..bcb6843286 100644 --- a/firmware/target/arm/tcc77x/iaudio7/audio-iaudio7.c +++ b/firmware/target/arm/tcc77x/iaudio7/audio-iaudio7.c | |||
@@ -26,11 +26,6 @@ | |||
26 | int audio_channels = 2; | 26 | int audio_channels = 2; |
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | 27 | int audio_output_source = AUDIO_SRC_PLAYBACK; |
28 | 28 | ||
29 | void audiohw_enable_output(bool on) | ||
30 | { | ||
31 | (void) on; | ||
32 | } | ||
33 | |||
34 | void audio_set_output_source(int source) | 29 | void audio_set_output_source(int source) |
35 | { | 30 | { |
36 | int oldmode = set_fiq_status(FIQ_DISABLED); | 31 | int oldmode = set_fiq_status(FIQ_DISABLED); |
diff --git a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c index bd85e0b573..107b2743ae 100644 --- a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c +++ b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | |||
@@ -26,11 +26,6 @@ | |||
26 | int audio_channels = 2; | 26 | int audio_channels = 2; |
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | 27 | int audio_output_source = AUDIO_SRC_PLAYBACK; |
28 | 28 | ||
29 | void audiohw_enable_output(bool on) | ||
30 | { | ||
31 | (void)on; | ||
32 | } | ||
33 | |||
34 | void audio_set_output_source(int source) | 29 | void audio_set_output_source(int source) |
35 | { | 30 | { |
36 | (void)source; | 31 | (void)source; |
diff --git a/firmware/target/arm/tcc77x/m200/audio-m200.c b/firmware/target/arm/tcc77x/m200/audio-m200.c index bd85e0b573..107b2743ae 100644 --- a/firmware/target/arm/tcc77x/m200/audio-m200.c +++ b/firmware/target/arm/tcc77x/m200/audio-m200.c | |||
@@ -26,11 +26,6 @@ | |||
26 | int audio_channels = 2; | 26 | int audio_channels = 2; |
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | 27 | int audio_output_source = AUDIO_SRC_PLAYBACK; |
28 | 28 | ||
29 | void audiohw_enable_output(bool on) | ||
30 | { | ||
31 | (void)on; | ||
32 | } | ||
33 | |||
34 | void audio_set_output_source(int source) | 29 | void audio_set_output_source(int source) |
35 | { | 30 | { |
36 | (void)source; | 31 | (void)source; |
diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/wmcodec-pp.c index 0d751f6b3f..031f5c8d47 100644 --- a/firmware/target/arm/wmcodec-pp.c +++ b/firmware/target/arm/wmcodec-pp.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "system.h" | 29 | #include "system.h" |
30 | #include "audiohw.h" | 30 | #include "audiohw.h" |
31 | #include "i2c-pp.h" | 31 | #include "i2c-pp.h" |
32 | #include "i2s.h" | ||
32 | #include "wmcodec.h" | 33 | #include "wmcodec.h" |
33 | 34 | ||
34 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) | 35 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) |
@@ -43,7 +44,8 @@ | |||
43 | /* | 44 | /* |
44 | * Initialise the PP I2C and I2S. | 45 | * Initialise the PP I2C and I2S. |
45 | */ | 46 | */ |
46 | void audiohw_init(void) { | 47 | void audiohw_init(void) |
48 | { | ||
47 | #ifdef CPU_PP502x | 49 | #ifdef CPU_PP502x |
48 | /* normal outputs for CDI and I2S pin groups */ | 50 | /* normal outputs for CDI and I2S pin groups */ |
49 | DEV_INIT2 &= ~0x300; | 51 | DEV_INIT2 &= ~0x300; |
@@ -95,21 +97,13 @@ void audiohw_init(void) { | |||
95 | outl(inl(0xcf000028) & ~0x8, 0xcf000028); | 97 | outl(inl(0xcf000028) & ~0x8, 0xcf000028); |
96 | #endif /* IPOD_1G2G/3G */ | 98 | #endif /* IPOD_1G2G/3G */ |
97 | #endif | 99 | #endif |
100 | |||
101 | /* reset the I2S controller into known state */ | ||
102 | i2s_reset(); | ||
98 | 103 | ||
99 | #if defined(HAVE_WM8731) || defined(HAVE_WM8751) || defined(HAVE_WM8975) \ | ||
100 | || defined(HAVE_WM8758) | ||
101 | audiohw_preinit(); | 104 | audiohw_preinit(); |
102 | #endif | ||
103 | |||
104 | } | 105 | } |
105 | 106 | ||
106 | #if !defined(HAVE_WM8731) && !defined(HAVE_WM8751) && !defined(HAVE_WM8975) \ | ||
107 | && !defined(HAVE_WM8758) | ||
108 | void audiohw_postinit(void) | ||
109 | { | ||
110 | } | ||
111 | #endif | ||
112 | |||
113 | void wmcodec_write(int reg, int data) | 107 | void wmcodec_write(int reg, int data) |
114 | { | 108 | { |
115 | pp_i2c_send(I2C_AUDIO_ADDRESS, (reg<<1) | ((data&0x100)>>8),data&0xff); | 109 | pp_i2c_send(I2C_AUDIO_ADDRESS, (reg<<1) | ((data&0x100)>>8),data&0xff); |