diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2017-08-22 00:39:00 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2017-08-22 00:39:00 +0200 |
| commit | 358efd52ceffdf7389e21a7d4deb945e204f8e75 (patch) | |
| tree | 48aef7a3cd8bfff90fedbfc0f2d2342854ecfcdc /include | |
| parent | clk: rockchip: add special approximation to fix up fractional clk's jitter (diff) | |
| parent | clk: rockchip: add rv1108 ACLK_GAMC and PCLK_GMAC ID (diff) | |
| download | linux-358efd52ceffdf7389e21a7d4deb945e204f8e75.tar.xz linux-358efd52ceffdf7389e21a7d4deb945e204f8e75.zip | |
Merge branch 'v4.14-shared/clkids' into v4.14-clk/next
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/rk3228-cru.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rv1108-cru.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h index 56f841c22801..55655ab0a4c4 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h @@ -49,6 +49,7 @@ #define SCLK_EMMC_DRV 117 #define SCLK_SDMMC_SAMPLE 118 #define SCLK_SDIO_SAMPLE 119 +#define SCLK_SDIO_SRC 120 #define SCLK_EMMC_SAMPLE 121 #define SCLK_VOP 122 #define SCLK_HDMI_HDCP 123 diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h index f269d833e41a..2239ae2a19b9 100644 --- a/include/dt-bindings/clock/rv1108-cru.h +++ b/include/dt-bindings/clock/rv1108-cru.h @@ -110,6 +110,7 @@ #define ACLK_CIF2 207 #define ACLK_CIF3 208 #define ACLK_PERI 209 +#define ACLK_GMAC 210 /* pclk gates */ #define PCLK_GPIO1 256 @@ -141,6 +142,7 @@ #define PCLK_EFUSE0 282 #define PCLK_EFUSE1 283 #define PCLK_WDT 284 +#define PCLK_GMAC 285 /* hclk gates */ #define HCLK_I2S0_8CH 320 |