From ddda3dc37f23134fa62f6f797aa26c7fafab0aec Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 24 Apr 2021 14:24:07 +0000
Subject: [PATCH] Fixed bug #1156.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_20.3.x@14300 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 os/hal/ports/STM32/STM32L4xx+/hal_lld.h | 9 ++++-----
 readme.txt                              | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h
index b3f5f4b02..29735d5ba 100644
--- a/os/hal/ports/STM32/STM32L4xx+/hal_lld.h
+++ b/os/hal/ports/STM32/STM32L4xx+/hal_lld.h
@@ -1124,8 +1124,8 @@
 #error "HSI16 not enabled, required by STM32_SAI1SEL"
 #endif
 
-#if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) ||                            \
-     (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) &&                           \
+#if ((STM32_SAI2SEL == STM32_SA21SEL_PLLSAI1) ||                            \
+     (STM32_SAI2SEL == STM32_SA21SEL_PLLSAI2)) &&                           \
     (STM32_PLLSRC == STM32_PLLSRC_HSI16)
 #error "HSI16 not enabled, required by STM32_SAI2SEL"
 #endif
@@ -1228,8 +1228,8 @@
       #error "HSE not enabled, required by STM32_SAI1SEL"
     #endif
 
-    #if ((STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI1) |                         \
-         (STM32_SAI2SEL == STM32_SAI1SEL_PLLSAI2)) &&                       \
+    #if ((STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) |                         \
+         (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2)) &&                       \
         (STM32_PLLSRC == STM32_PLLSRC_HSE)
       #error "HSE not enabled, required by STM32_SAI2SEL"
     #endif
@@ -1902,7 +1902,6 @@
  */
 #if (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI2) ||                             \
     (STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI2) ||                             \
-    (STM32_ADCSEL == STM32_ADCSEL_PLLSAI1) ||                               \
     defined(__DOXYGEN__)
 
 #if STM32_PLLSAI2CLKIN == 0
diff --git a/readme.txt b/readme.txt
index aabb19c30..aaee4b8ec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -76,6 +76,7 @@
 *** 20.3.4 ***
 - NEW: Files mcuconf.h for STM32F746, F767, L432, L452, L476, L496 received
        the missing setting STM32_WSPI_QUADSPI1_PRESCALER_VALUE.
+- FIX: Fixed wrong checks related to PLLSAI2 on L4 and L4+ (bug #1156).
 - FIX: Fixed STM32G431 DMA defines error (bug #1155).
 - FIX: Fixed errors in STM32L4xx registry (bug #1154).
 - FIX: Fixed QUADSPI errata fix applied to all platforms (bug #1153).