aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>2018-03-23 12:50:36 +0000
committergdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>2018-03-23 12:50:36 +0000
commitba262ba2e1e52076eca09e96648131e4a8f2f00d (patch)
treeec06e83f68c94f43bd317dcd0c382c6d29d68ccc
parentd12bb7fd4571caf79fb9177829d3c9aba60c175b (diff)
downloadChibiOS-ba262ba2e1e52076eca09e96648131e4a8f2f00d.tar.gz
ChibiOS-ba262ba2e1e52076eca09e96648131e4a8f2f00d.tar.bz2
ChibiOS-ba262ba2e1e52076eca09e96648131e4a8f2f00d.zip
Fixed bug #929.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11847 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r--os/hal/ports/STM32/STM32F7xx/hal_lld.h2
-rw-r--r--readme.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F7xx/hal_lld.h b/os/hal/ports/STM32/STM32F7xx/hal_lld.h
index 47c91b62c..c5a1d966e 100644
--- a/os/hal/ports/STM32/STM32F7xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32F7xx/hal_lld.h
@@ -1941,7 +1941,7 @@
#if (STM32_CK48MSEL == STM32_CK48MSEL_PLL) || defined(__DOXYGEN__)
#define STM32_PLL48CLK (STM32_PLLVCO / STM32_PLLQ_VALUE)
#elif STM32_CK48MSEL == STM32_CK48MSEL_PLLSAI
-#define STM32_PLL48CLK (STM32_PLLSAIVCO / STM32_PLLSAIQ_VALUE)
+#define STM32_PLL48CLK (STM32_PLLSAIVCO / STM32_PLLSAIP_VALUE)
#else
#error "invalid source selected for PLL48CLK clock"
#endif
diff --git a/readme.txt b/readme.txt
index 8f59dfb04..72c0414a4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -110,8 +110,10 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed invalid SAI1 clock selection on STM32F7xx (bug #929)(backported
+ to 18.2.1 and 17.6.4).
- HAL: Fixed invalid clock checks for SDMMC1 and SDMMC2 on STM32F7xx
- (bug #928)(backported to 18.2.1 and 17.6.4).
+ (bug #928)(backported to 18.2.1).
- HAL: Fixed useless writes in read-only CFGR_SWS field on all STM32Fxx
(bug #927)(backported to 18.2.1 and 17.6.4).
- HAL: Fixed typo in hal_pal.h (bug #926)(backported to 18.2.1).