resolve conflicts

2024-05-13 11:27:41 +01:00
parent 70a45d219c a11195b54a
commit 1308f3a1cb
4 changed files with 24 additions and 7 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ UNRELEASED
  * FIXED:     ADAT Tx called too frequently
  * CHANGED:   aud_to_host buffer size and the condition to come out of underflow
    in decoupler to fix buffer underflow seen in ADAT tests
+  * FIXED:     Initialise SMUX based on DEFAULT_FREQ in clockgen

 4.0.0
 -----