diff options
author | Gabriel Fernandez <gabriel.fernandez@st.com> | 2018-04-06 02:39:31 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-04-06 16:43:16 -0400 |
commit | a1bf646f719f14464be93e163cfa7d003c472e6e (patch) | |
tree | ebb035e39cfbbe39705bb5e24a6250afb2b683dd | |
parent | 4cd2136031f246ae099f18d4568290c64187ddf8 (diff) |
clk: stm32mp1: add missing tzc2 clock
This patch adds tzc2 clock and rename tzc clock into tzc1
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r-- | drivers/clk/clk-stm32mp1.c | 9 | ||||
-rw-r--r-- | include/dt-bindings/clock/stm32mp1-clks.h | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/clk/clk-stm32mp1.c b/drivers/clk/clk-stm32mp1.c index eefed49897d5..e32fc23c6c2b 100644 --- a/drivers/clk/clk-stm32mp1.c +++ b/drivers/clk/clk-stm32mp1.c | |||
@@ -1399,7 +1399,8 @@ enum { | |||
1399 | G_USBH, | 1399 | G_USBH, |
1400 | G_ETHSTP, | 1400 | G_ETHSTP, |
1401 | G_RTCAPB, | 1401 | G_RTCAPB, |
1402 | G_TZC, | 1402 | G_TZC1, |
1403 | G_TZC2, | ||
1403 | G_TZPC, | 1404 | G_TZPC, |
1404 | G_IWDG1, | 1405 | G_IWDG1, |
1405 | G_BSEC, | 1406 | G_BSEC, |
@@ -1500,7 +1501,8 @@ static struct stm32_gate_cfg per_gate_cfg[G_LAST] = { | |||
1500 | K_GATE(G_BSEC, RCC_APB5ENSETR, 16, 0), | 1501 | K_GATE(G_BSEC, RCC_APB5ENSETR, 16, 0), |
1501 | K_GATE(G_IWDG1, RCC_APB5ENSETR, 15, 0), | 1502 | K_GATE(G_IWDG1, RCC_APB5ENSETR, 15, 0), |
1502 | K_GATE(G_TZPC, RCC_APB5ENSETR, 13, 0), | 1503 | K_GATE(G_TZPC, RCC_APB5ENSETR, 13, 0), |
1503 | K_GATE(G_TZC, RCC_APB5ENSETR, 12, 0), | 1504 | K_GATE(G_TZC2, RCC_APB5ENSETR, 12, 0), |
1505 | K_GATE(G_TZC1, RCC_APB5ENSETR, 11, 0), | ||
1504 | K_GATE(G_RTCAPB, RCC_APB5ENSETR, 8, 0), | 1506 | K_GATE(G_RTCAPB, RCC_APB5ENSETR, 8, 0), |
1505 | K_MGATE(G_USART1, RCC_APB5ENSETR, 4, 0), | 1507 | K_MGATE(G_USART1, RCC_APB5ENSETR, 4, 0), |
1506 | K_MGATE(G_I2C6, RCC_APB5ENSETR, 3, 0), | 1508 | K_MGATE(G_I2C6, RCC_APB5ENSETR, 3, 0), |
@@ -1854,7 +1856,8 @@ static const struct clock_config stm32mp1_clock_cfg[] = { | |||
1854 | PCLK(USART1, "usart1", "pclk5", 0, G_USART1), | 1856 | PCLK(USART1, "usart1", "pclk5", 0, G_USART1), |
1855 | PCLK(RTCAPB, "rtcapb", "pclk5", CLK_IGNORE_UNUSED | | 1857 | PCLK(RTCAPB, "rtcapb", "pclk5", CLK_IGNORE_UNUSED | |
1856 | CLK_IS_CRITICAL, G_RTCAPB), | 1858 | CLK_IS_CRITICAL, G_RTCAPB), |
1857 | PCLK(TZC, "tzc", "pclk5", CLK_IGNORE_UNUSED, G_TZC), | 1859 | PCLK(TZC1, "tzc1", "ck_axi", CLK_IGNORE_UNUSED, G_TZC1), |
1860 | PCLK(TZC2, "tzc2", "ck_axi", CLK_IGNORE_UNUSED, G_TZC2), | ||
1858 | PCLK(TZPC, "tzpc", "pclk5", CLK_IGNORE_UNUSED, G_TZPC), | 1861 | PCLK(TZPC, "tzpc", "pclk5", CLK_IGNORE_UNUSED, G_TZPC), |
1859 | PCLK(IWDG1, "iwdg1", "pclk5", 0, G_IWDG1), | 1862 | PCLK(IWDG1, "iwdg1", "pclk5", 0, G_IWDG1), |
1860 | PCLK(BSEC, "bsec", "pclk5", CLK_IGNORE_UNUSED, G_BSEC), | 1863 | PCLK(BSEC, "bsec", "pclk5", CLK_IGNORE_UNUSED, G_BSEC), |
diff --git a/include/dt-bindings/clock/stm32mp1-clks.h b/include/dt-bindings/clock/stm32mp1-clks.h index 86e3ec662ef4..6c807fd2c8d5 100644 --- a/include/dt-bindings/clock/stm32mp1-clks.h +++ b/include/dt-bindings/clock/stm32mp1-clks.h | |||
@@ -76,7 +76,7 @@ | |||
76 | #define I2C6 63 | 76 | #define I2C6 63 |
77 | #define USART1 64 | 77 | #define USART1 64 |
78 | #define RTCAPB 65 | 78 | #define RTCAPB 65 |
79 | #define TZC 66 | 79 | #define TZC1 66 |
80 | #define TZPC 67 | 80 | #define TZPC 67 |
81 | #define IWDG1 68 | 81 | #define IWDG1 68 |
82 | #define BSEC 69 | 82 | #define BSEC 69 |
@@ -123,6 +123,7 @@ | |||
123 | #define CRC1 110 | 123 | #define CRC1 110 |
124 | #define USBH 111 | 124 | #define USBH 111 |
125 | #define ETHSTP 112 | 125 | #define ETHSTP 112 |
126 | #define TZC2 113 | ||
126 | 127 | ||
127 | /* Kernel clocks */ | 128 | /* Kernel clocks */ |
128 | #define SDMMC1_K 118 | 129 | #define SDMMC1_K 118 |