Skip to content

L
linux
Commit 7fc50508 authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files
Options

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

parents 8118fe40 46887082
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
include/dt-bindings/clock/rk3188-cru-common.h
View file @ 7fc50508
...@@ -108,6 +108,8 @@ ...@@ -108,6 +108,8 @@
#define PCLK_TSADC 349 #define PCLK_TSADC 349
#define PCLK_CPU 350 #define PCLK_CPU 350
#define PCLK_PERI 351 #define PCLK_PERI 351
#define PCLK_DDRUPCTL 352
#define PCLK_PUBL 353
/* hclk gates */ /* hclk gates */
#define HCLK_SDMMC 448 #define HCLK_SDMMC 448
......
include/dt-bindings/clock/rk3288-cru.h
View file @ 7fc50508
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
#define PCLK_WDT 368 #define PCLK_WDT 368
#define PCLK_EFUSE256 369 #define PCLK_EFUSE256 369
#define PCLK_EFUSE1024 370 #define PCLK_EFUSE1024 370
#define PCLK_ISP_IN 371
/* hclk gates */ /* hclk gates */
#define HCLK_GPS 448 #define HCLK_GPS 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7