diff options
author | Yann Gautier <yann.gautier@st.com> | 2019-02-14 10:53:33 +0100 |
---|---|---|
committer | Yann Gautier <yann.gautier@st.com> | 2019-02-14 11:20:23 +0100 |
commit | 0d21680c35f328f1b793f0765760e994d883ff12 (patch) | |
tree | c6e8b6e242aee14fbae6171261a63d31b5759b9d /include | |
parent | 5202cb393da7f6f3a9cf48a49e2a12f3bdee2b16 (diff) | |
download | trusted-firmware-a-0d21680c35f328f1b793f0765760e994d883ff12.tar.gz |
stm32mp1: update clock driver
Remove useless private structure in function prototypes.
Add a reference counter on clocks.
Prepare for future secured/shared/non-secured clocks.
Change-Id: I3dbed81721da5ceff5e10b2c4155b1e340c036ee
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Signed-off-by: Nicolas LE BAYON <nicolas.le.bayon@st.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drivers/st/stm32mp1_clk.h | 32 | ||||
-rw-r--r-- | include/drivers/st/stm32mp1_clkfunc.h | 1 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/drivers/st/stm32mp1_clk.h b/include/drivers/st/stm32mp1_clk.h index 3ba8909425..1e0d949ac5 100644 --- a/include/drivers/st/stm32mp1_clk.h +++ b/include/drivers/st/stm32mp1_clk.h @@ -11,6 +11,38 @@ int stm32mp1_clk_probe(void); int stm32mp1_clk_init(void); + +bool stm32mp1_rcc_is_secure(void); + +void __stm32mp1_clk_enable(unsigned long id, bool caller_is_secure); +void __stm32mp1_clk_disable(unsigned long id, bool caller_is_secure); + +static inline void stm32mp1_clk_enable_non_secure(unsigned long id) +{ + __stm32mp1_clk_enable(id, false); +} + +static inline void stm32mp1_clk_enable_secure(unsigned long id) +{ + __stm32mp1_clk_enable(id, true); +} + +static inline void stm32mp1_clk_disable_non_secure(unsigned long id) +{ + __stm32mp1_clk_disable(id, false); +} + +static inline void stm32mp1_clk_disable_secure(unsigned long id) +{ + __stm32mp1_clk_disable(id, true); +} + +unsigned int stm32mp1_clk_get_refcount(unsigned long id); + +/* SMP protection on RCC registers access */ +void stm32mp1_clk_rcc_regs_lock(void); +void stm32mp1_clk_rcc_regs_unlock(void); + void stm32mp1_stgen_increment(unsigned long long offset_in_ms); #endif /* STM32MP1_CLK_H */ diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h index 41b68fdd04..f303937348 100644 --- a/include/drivers/st/stm32mp1_clkfunc.h +++ b/include/drivers/st/stm32mp1_clkfunc.h @@ -18,7 +18,6 @@ enum stm32mp_osc_id { _LSI, _LSE, _I2S_CKIN, - _USB_PHY_48, NB_OSC, _UNKNOWN_OSC_ID = 0xFF }; |