From d78c3b8345b7143d8ceb70d4df6343c08d88ee67 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 5 Feb 2014 15:00:03 +0000 Subject: [PATCH] L-series clock block for MIDI doesn't use XS1_CLKBCLK_REF when MIDI on XUD tile (#15267) --- module_usb_audio/main.xc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc index f1ae822b..e9a85f51 100755 --- a/module_usb_audio/main.xc +++ b/module_usb_audio/main.xc @@ -121,9 +121,20 @@ on tile[AUDIO_IO_TILE] : buffered port:1 p_midi_rx = PORT_MIDI_IN; #endif /* Clock blocks */ -#ifdef MIDI +#ifdef MIDI +#if defined (ARCH_L) && (AUDIO_IO_TILE == XUD_TILE) +/* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI + * if MIDI and XUD on same tile. See XUD documentation. + * + * This is a clash with S/PDIF Tx but simultaneous S/PDIF and MIDI not currently supported on single tile device + * + */ +on tile[AUDIO_IO_TILE] : clock clk_midi = XS1_CLKBLK_1; +#else on tile[AUDIO_IO_TILE] : clock clk_midi = XS1_CLKBLK_REF; #endif +#endif + on tile[AUDIO_IO_TILE] : clock clk_audio_mclk = XS1_CLKBLK_2; /* Master clock */ #if(AUDIO_IO_TILE != XUD_TILE)