summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/audio-as3525.c7
-rw-r--r--firmware/target/arm/as3525/sd-as3525v2.c2
-rw-r--r--firmware/target/arm/as3525/system-as3525.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/audio-as3525.c b/firmware/target/arm/as3525/audio-as3525.c
index b616153eae..27cbaac3d8 100644
--- a/firmware/target/arm/as3525/audio-as3525.c
+++ b/firmware/target/arm/as3525/audio-as3525.c
@@ -47,7 +47,9 @@ void audio_input_mux(int source, unsigned flags)
47 case AUDIO_SRC_PLAYBACK: 47 case AUDIO_SRC_PLAYBACK:
48 if (source != last_source) 48 if (source != last_source)
49 { 49 {
50#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
50 audiohw_set_monitor(false); 51 audiohw_set_monitor(false);
52#endif
51#ifdef HAVE_RECORDING 53#ifdef HAVE_RECORDING
52 audiohw_disable_recording(); 54 audiohw_disable_recording();
53#endif 55#endif
@@ -64,6 +66,8 @@ void audio_input_mux(int source, unsigned flags)
64 break; 66 break;
65#endif 67#endif
66 68
69#if (INPUT_SRC_CAPS & SRC_CAP_FMRADIO)
70
67 case AUDIO_SRC_FMRADIO: /* recording and playback */ 71 case AUDIO_SRC_FMRADIO: /* recording and playback */
68 if (source == last_source 72 if (source == last_source
69#ifdef HAVE_RECORDING 73#ifdef HAVE_RECORDING
@@ -86,9 +90,12 @@ void audio_input_mux(int source, unsigned flags)
86#ifdef HAVE_RECORDING 90#ifdef HAVE_RECORDING
87 audiohw_disable_recording(); 91 audiohw_disable_recording();
88#endif 92#endif
93#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
89 audiohw_set_monitor(true); /* line 2 analog audio path */ 94 audiohw_set_monitor(true); /* line 2 analog audio path */
95#endif
90 } 96 }
91 break; 97 break;
98#endif /* (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) */
92 } 99 }
93 100
94 last_source = source; 101 last_source = source;
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index 338a6d669f..eef368cfc6 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -191,7 +191,7 @@ static const char sd_thread_name[] = "ata/sd";
191static struct mutex sd_mtx SHAREDBSS_ATTR; 191static struct mutex sd_mtx SHAREDBSS_ATTR;
192static struct event_queue sd_queue; 192static struct event_queue sd_queue;
193#ifndef BOOTLOADER 193#ifndef BOOTLOADER
194static bool sd_enabled = false; 194bool sd_enabled = false;
195#endif 195#endif
196 196
197static struct wakeup transfer_completion_signal; 197static struct wakeup transfer_completion_signal;
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 4473e1ce59..bd6069ea39 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -336,7 +336,7 @@ void system_init(void)
336#ifndef BOOTLOADER 336#ifndef BOOTLOADER
337 /* Initialize power management settings */ 337 /* Initialize power management settings */
338 ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING); 338 ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING);
339#ifdef CONFIG_TUNER 339#if CONFIG_TUNER
340 fmradio_i2c_init(); 340 fmradio_i2c_init();
341#endif 341#endif
342#endif /* !BOOTLOADER */ 342#endif /* !BOOTLOADER */