diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-12 15:43:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-12 15:43:19 -0400 |
| commit | 015289580f81733f7358227743e3e5881653a797 (patch) | |
| tree | beca1eea1bfa7b4e4740b9e7a08493711b7b8bee /drivers/clk | |
| parent | dd758c6720266c9b7bcd8d0da91a64a2fa1e181a (diff) | |
| parent | 7bb75023a720432a32840c6df543aae92653b23d (diff) | |
| download | u-boot-015289580f81733f7358227743e3e5881653a797.zip u-boot-015289580f81733f7358227743e3e5881653a797.tar.gz u-boot-015289580f81733f7358227743e3e5881653a797.tar.bz2 | |
Merge tag 'u-boot-stm32-20190412' of https://github.com/patrickdelaunay/u-boot
stm32 patches for v2019.07-rc1
- Add trusted boot with TF-A for stm32mp1
- stm32mp1 dts files sync'ed with Linux version
- add STM32MP1 Discovery boards (DK1 and DK2)
- add STMFX gpio expander driver
- misc improvement for stm3mp1 supports
- rename stpmu1 to stpmic1 (official name)
- stm32_qspi: move to exec_op (spi nor driver for stm32 mpu and mcu)
- add STM32 FMC2 NAND flash controller driver
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk_stm32mp1.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c index aebc6f0..24859fd 100644 --- a/drivers/clk/clk_stm32mp1.c +++ b/drivers/clk/clk_stm32mp1.c @@ -15,10 +15,12 @@ #include <dt-bindings/clock/stm32mp1-clks.h> #include <dt-bindings/clock/stm32mp1-clksrc.h> +#ifndef CONFIG_STM32MP1_TRUSTED #if !defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD) /* activate clock tree initialization in the driver */ #define STM32MP1_CLOCK_TREE_INIT #endif +#endif #define MAX_HSI_HZ 64000000 |