tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Heiko Stuebner 358efd52 5d890c2d

+3
+1
include/dt-bindings/clock/rk3228-cru.h
··· 49 49 #define SCLK_EMMC_DRV 117 50 50 #define SCLK_SDMMC_SAMPLE 118 51 51 #define SCLK_SDIO_SAMPLE 119 52 + #define SCLK_SDIO_SRC 120 52 53 #define SCLK_EMMC_SAMPLE 121 53 54 #define SCLK_VOP 122 54 55 #define SCLK_HDMI_HDCP 123
+2
include/dt-bindings/clock/rv1108-cru.h
··· 110 110 #define ACLK_CIF2 207 111 111 #define ACLK_CIF3 208 112 112 #define ACLK_PERI 209 113 + #define ACLK_GMAC 210 113 114 114 115 /* pclk gates */ 115 116 #define PCLK_GPIO1 256 ··· 142 141 #define PCLK_EFUSE0 282 143 142 #define PCLK_EFUSE1 283 144 143 #define PCLK_WDT 284 144 + #define PCLK_GMAC 285 145 145 146 146 /* hclk gates */ 147 147 #define HCLK_I2S0_8CH 320