p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Heiko Stuebner 2017-08-22 00:39:00 +02:00
parent 5d890c2df9 1858698e0a
commit 358efd52ce
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dt-bindings/clock/rk3228-cru.h
View File

@ -49,6 +49,7 @@
#define SCLK_EMMC_DRV 117 #define SCLK_EMMC_DRV 117
#define SCLK_SDMMC_SAMPLE 118 #define SCLK_SDMMC_SAMPLE 118
#define SCLK_SDIO_SAMPLE 119 #define SCLK_SDIO_SAMPLE 119
#define SCLK_SDIO_SRC 120
#define SCLK_EMMC_SAMPLE 121 #define SCLK_EMMC_SAMPLE 121
#define SCLK_VOP 122 #define SCLK_VOP 122
#define SCLK_HDMI_HDCP 123 #define SCLK_HDMI_HDCP 123

2
include/dt-bindings/clock/rv1108-cru.h
View File

@ -110,6 +110,7 @@
#define ACLK_CIF2 207 #define ACLK_CIF2 207
#define ACLK_CIF3 208 #define ACLK_CIF3 208
#define ACLK_PERI 209 #define ACLK_PERI 209
#define ACLK_GMAC 210
/* pclk gates */ /* pclk gates */
#define PCLK_GPIO1 256 #define PCLK_GPIO1 256
@ -141,6 +142,7 @@
#define PCLK_EFUSE0 282 #define PCLK_EFUSE0 282
#define PCLK_EFUSE1 283 #define PCLK_EFUSE1 283
#define PCLK_WDT 284 #define PCLK_WDT 284
#define PCLK_GMAC 285
/* hclk gates */ /* hclk gates */
#define HCLK_I2S0_8CH 320 #define HCLK_I2S0_8CH 320