Commit 51cec870 authored by Heiko Stuebner's avatar Heiko Stuebner

Merge branch 'v4.15-shared/clkids' into v4.15-clk/next

parents 9edb39d7 4e07533f
...@@ -68,12 +68,14 @@ ...@@ -68,12 +68,14 @@
#define ACLK_LCDC1 196 #define ACLK_LCDC1 196
#define ACLK_GPU 197 #define ACLK_GPU 197
#define ACLK_SMC 198 #define ACLK_SMC 198
#define ACLK_CIF 199 #define ACLK_CIF1 199
#define ACLK_IPP 200 #define ACLK_IPP 200
#define ACLK_RGA 201 #define ACLK_RGA 201
#define ACLK_CIF0 202 #define ACLK_CIF0 202
#define ACLK_CPU 203 #define ACLK_CPU 203
#define ACLK_PERI 204 #define ACLK_PERI 204
#define ACLK_VEPU 205
#define ACLK_VDPU 206
/* pclk gates */ /* pclk gates */
#define PCLK_GRF 320 #define PCLK_GRF 320
...@@ -134,8 +136,11 @@ ...@@ -134,8 +136,11 @@
#define HCLK_NANDC0 467 #define HCLK_NANDC0 467
#define HCLK_CPU 468 #define HCLK_CPU 468
#define HCLK_PERI 469 #define HCLK_PERI 469
#define HCLK_CIF1 470
#define HCLK_VEPU 471
#define HCLK_VDPU 472
#define CLK_NR_CLKS (HCLK_PERI + 1) #define CLK_NR_CLKS (HCLK_VDPU + 1)
/* soft-reset indices */ /* soft-reset indices */
#define SRST_MCORE 2 #define SRST_MCORE 2
......
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
#define PCLK_ISP 366 #define PCLK_ISP 366
#define PCLK_VIP 367 #define PCLK_VIP 367
#define PCLK_WDT 368 #define PCLK_WDT 368
#define PCLK_EFUSE256 369
/* hclk gates */ /* hclk gates */
#define HCLK_SFC 448 #define HCLK_SFC 448
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment