Re: [PATCH 4/6] clk: stm32mp1: add missing tzc2 clock

[Stephen Boyd]

Quoting gabriel.fernan...@st.com (2018-04-05 23:39:31)
> From: Gabriel Fernandez 
> 
> This patch adds tzc2 clock and rename tzc clock into tzc1
> 
> Signed-off-by: Gabriel Fernandez 
> ---

Applied to clk-next

Re: [PATCH 4/6] clk: stm32mp1: add missing tzc2 clock

[Stephen Boyd]

Quoting gabriel.fernan...@st.com (2018-04-05 23:39:31)
> From: Gabriel Fernandez 
> 
> This patch adds tzc2 clock and rename tzc clock into tzc1
> 
> Signed-off-by: Gabriel Fernandez 
> ---

Applied to clk-next

[PATCH 4/6] clk: stm32mp1: add missing tzc2 clock

[gabriel.fernandez]

From: Gabriel Fernandez 

This patch adds tzc2 clock and rename tzc clock into tzc1

Signed-off-by: Gabriel Fernandez 
---
 drivers/clk/clk-stm32mp1.c| 9 ++---
 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 eefed49..e32fc23 100644
--- a/drivers/clk/clk-stm32mp1.c
+++ b/drivers/clk/clk-stm32mp1.c
@@ -1399,7 +1399,8 @@ enum {
G_USBH,
G_ETHSTP,
G_RTCAPB,
-   G_TZC,
+   G_TZC1,
+   G_TZC2,
G_TZPC,
G_IWDG1,
G_BSEC,
@@ -1500,7 +1501,8 @@ enum {
K_GATE(G_BSEC,  RCC_APB5ENSETR, 16, 0),
K_GATE(G_IWDG1, RCC_APB5ENSETR, 15, 0),
K_GATE(G_TZPC,  RCC_APB5ENSETR, 13, 0),
-   K_GATE(G_TZC,   RCC_APB5ENSETR, 12, 0),
+   K_GATE(G_TZC2,  RCC_APB5ENSETR, 12, 0),
+   K_GATE(G_TZC1,  RCC_APB5ENSETR, 11, 0),
K_GATE(G_RTCAPB,RCC_APB5ENSETR, 8, 0),
K_MGATE(G_USART1,   RCC_APB5ENSETR, 4, 0),
K_MGATE(G_I2C6, RCC_APB5ENSETR, 3, 0),
@@ -1854,7 +1856,8 @@ enum {
PCLK(USART1, "usart1", "pclk5", 0, G_USART1),
PCLK(RTCAPB, "rtcapb", "pclk5", CLK_IGNORE_UNUSED |
 CLK_IS_CRITICAL, G_RTCAPB),
-   PCLK(TZC, "tzc", "pclk5", CLK_IGNORE_UNUSED, G_TZC),
+   PCLK(TZC1, "tzc1", "ck_axi", CLK_IGNORE_UNUSED, G_TZC1),
+   PCLK(TZC2, "tzc2", "ck_axi", CLK_IGNORE_UNUSED, G_TZC2),
PCLK(TZPC, "tzpc", "pclk5", CLK_IGNORE_UNUSED, G_TZPC),
PCLK(IWDG1, "iwdg1", "pclk5", 0, G_IWDG1),
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 86e3ec6..6c807fd 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 TZC66
+#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
-- 
1.9.1

[PATCH 4/6] clk: stm32mp1: add missing tzc2 clock

[gabriel.fernandez]

From: Gabriel Fernandez 

This patch adds tzc2 clock and rename tzc clock into tzc1

Signed-off-by: Gabriel Fernandez 
---
 drivers/clk/clk-stm32mp1.c| 9 ++---
 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 eefed49..e32fc23 100644
--- a/drivers/clk/clk-stm32mp1.c
+++ b/drivers/clk/clk-stm32mp1.c
@@ -1399,7 +1399,8 @@ enum {
G_USBH,
G_ETHSTP,
G_RTCAPB,
-   G_TZC,
+   G_TZC1,
+   G_TZC2,
G_TZPC,
G_IWDG1,
G_BSEC,
@@ -1500,7 +1501,8 @@ enum {
K_GATE(G_BSEC,  RCC_APB5ENSETR, 16, 0),
K_GATE(G_IWDG1, RCC_APB5ENSETR, 15, 0),
K_GATE(G_TZPC,  RCC_APB5ENSETR, 13, 0),
-   K_GATE(G_TZC,   RCC_APB5ENSETR, 12, 0),
+   K_GATE(G_TZC2,  RCC_APB5ENSETR, 12, 0),
+   K_GATE(G_TZC1,  RCC_APB5ENSETR, 11, 0),
K_GATE(G_RTCAPB,RCC_APB5ENSETR, 8, 0),
K_MGATE(G_USART1,   RCC_APB5ENSETR, 4, 0),
K_MGATE(G_I2C6, RCC_APB5ENSETR, 3, 0),
@@ -1854,7 +1856,8 @@ enum {
PCLK(USART1, "usart1", "pclk5", 0, G_USART1),
PCLK(RTCAPB, "rtcapb", "pclk5", CLK_IGNORE_UNUSED |
 CLK_IS_CRITICAL, G_RTCAPB),
-   PCLK(TZC, "tzc", "pclk5", CLK_IGNORE_UNUSED, G_TZC),
+   PCLK(TZC1, "tzc1", "ck_axi", CLK_IGNORE_UNUSED, G_TZC1),
+   PCLK(TZC2, "tzc2", "ck_axi", CLK_IGNORE_UNUSED, G_TZC2),
PCLK(TZPC, "tzpc", "pclk5", CLK_IGNORE_UNUSED, G_TZPC),
PCLK(IWDG1, "iwdg1", "pclk5", 0, G_IWDG1),
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 86e3ec6..6c807fd 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 TZC66
+#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
-- 
1.9.1