Merge branch 'yuri-panchul:main' into main

yuri-panchul · Feb 4, 2025 · cb4930b · cb4930b
2 parents 0047b56 + 2584063
commit cb4930b
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/boards/tang_nano_9k_lcd_480_272_tm1638/board_specific_top.sv b/boards/tang_nano_9k_lcd_480_272_tm1638/board_specific_top.sv
@@ -420,17 +420,32 @@ module board_specific_top
             .clk      (    clk               ),
             .reset    (    rst               ),
             .data_in  (    sound             ),
-            .mclk     ( /* SMALL_LCD_DATA */ ),
-            .bclk     (    SMALL_LCD_CLK     ),
-            .lrclk    (    SMALL_LCD_RS      ),
-            .sdata    (    SMALL_LCD_CS      )
+            .mclk     ( /* SMALL_LCD_DATA */ ),  // SCK should be connected to 0 in PCM 5102
+            .bclk     (    SMALL_LCD_CLK     ),  // BCK
+            .sdata    (    SMALL_LCD_CS      ),  // DIN
+            .lrclk    (    SMALL_LCD_RS      )   // LCK
         );
 
         // PCM 5102 can recover mclk using PLL.
         // It is better to put this pin to 0, it works more reliably this way.
 
         assign SMALL_LCD_DATA = 1'b0;
 
+        i2s_audio_out
+        # (
+            .clk_mhz  ( clk_mhz        )
+        )
+        inst_audio_out_alt
+        (
+            .clk      ( clk      ),
+            .reset    ( rst      ),
+            .data_in  ( sound    ),
+            .mclk     (          ),  // SCK should be connected to 0 in PCM 5102
+            .bclk     ( GPIO [3] ),  // BCK
+            .sdata    ( GPIO [4] ),  // DIN
+            .lrclk    ( GPIO [5] )   // LCK
+        );
+
     `endif
 
 endmodule