diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-04-16 08:58:39 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-04-16 08:58:39 -0700 |
| commit | 14867765351b75b5aa366310b4535b363d615247 (patch) | |
| tree | a6e4296de8deaf29e90c4ffa7ca3dea8df5fabb9 /include | |
| parent | 60cc43fc888428bb2f18f08997432d426a243338 (diff) | |
| parent | ccf719b8845d6ca9f24a8708bb39e0df008f4e3f (diff) | |
| download | linux-stable-14867765351b75b5aa366310b4535b363d615247.tar.gz linux-stable-14867765351b75b5aa366310b4535b363d615247.tar.bz2 linux-stable-14867765351b75b5aa366310b4535b363d615247.zip | |
Merge branch 'clk-stm32mp1' into clk-fixes
* clk-stm32mp1:
clk: stm32mp1: remove ck_apb_dbg clock
clk: stm32mp1: set stgen_k clock as critical
clk: stm32mp1: add missing tzc2 clock
clk: stm32mp1: fix SAI3 & SAI4 clocks
clk: stm32mp1: remove unused dfsdm_src[] const
clk: stm32mp1: add missing static
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/stm32mp1-clks.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/stm32mp1-clks.h b/include/dt-bindings/clock/stm32mp1-clks.h index 86e3ec662ef4..90ec780bfc68 100644 --- a/include/dt-bindings/clock/stm32mp1-clks.h +++ b/include/dt-bindings/clock/stm32mp1-clks.h @@ -76,7 +76,7 @@ #define I2C6 63 #define USART1 64 #define RTCAPB 65 -#define TZC 66 +#define TZC1 66 #define TZPC 67 #define IWDG1 68 #define BSEC 69 @@ -123,6 +123,7 @@ #define CRC1 110 #define USBH 111 #define ETHSTP 112 +#define TZC2 113 /* Kernel clocks */ #define SDMMC1_K 118 @@ -228,7 +229,6 @@ #define CK_MCO2 212 /* TRACE & DEBUG clocks */ -#define DBG 213 #define CK_DBG 214 #define CK_TRACE 215 |