diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2017-01-13 19:13:33 +0300 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2017-01-13 19:13:33 +0300 |
| commit | 7fc505089c84a22ddb1d652267204b3bf4a75d76 (patch) | |
| tree | 10da934102587d315b26d85e0f0cc39b98e63b72 | |
| parent | 8118fe40d4a4a6767ff4e8f612950ef24da590c5 (diff) | |
| parent | 46887082713ec27a72dd2ff1b1fd21349363dad9 (diff) | |
| download | linux-7fc505089c84a22ddb1d652267204b3bf4a75d76.tar.xz | |
Merge branch 'v4.11-shared/clkids' into v4.11-clk/next
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rk3288-cru.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h index d141c1f0c778..eff4319d008b 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -108,6 +108,8 @@ #define PCLK_TSADC 349 #define PCLK_CPU 350 #define PCLK_PERI 351 +#define PCLK_DDRUPCTL 352 +#define PCLK_PUBL 353 /* hclk gates */ #define HCLK_SDMMC 448 diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h index 9a586e2d9c91..08de7de649e2 100644 --- a/include/dt-bindings/clock/rk3288-cru.h +++ b/include/dt-bindings/clock/rk3288-cru.h @@ -168,6 +168,7 @@ #define PCLK_WDT 368 #define PCLK_EFUSE256 369 #define PCLK_EFUSE1024 370 +#define PCLK_ISP_IN 371 /* hclk gates */ #define HCLK_GPS 448 |