diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2016-04-25 20:48:19 (GMT) |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-04-25 20:48:19 (GMT) |
| commit | de87985e42c48063a81a583883e3e4c8e945e3a8 (patch) | |
| tree | 594aa94d287a5860d66a234649fe2f68a9eb81e6 | |
| parent | f3d40914d3d52e2f155c4e65bc2ab5f5d1efb0ab (diff) | |
| parent | 55df45843901847f33816f8246ca2538aadd339a (diff) | |
| download | linux-de87985e42c48063a81a583883e3e4c8e945e3a8.tar.xz | |
Merge branch 'v4.7-shared/clkids' into v4.7-clk/next
| -rw-r--r-- | include/dt-bindings/clock/rk3399-cru.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h index f60fe6e..50a44cf 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -72,7 +72,7 @@ #define SCLK_MACREF_OUT 106 #define SCLK_VOP0_PWM 107 #define SCLK_VOP1_PWM 108 -#define SCLK_RGA 109 +#define SCLK_RGA_CORE 109 #define SCLK_ISP0 110 #define SCLK_ISP1 111 #define SCLK_HDMI_CEC 112 @@ -129,6 +129,8 @@ #define SCLK_DPHY_TX0_CFG 163 #define SCLK_DPHY_TX1RX1_CFG 164 #define SCLK_DPHY_RX0_CFG 165 +#define SCLK_RMII_SRC 166 +#define SCLK_PCIEPHY_REF100M 167 #define DCLK_VOP0 180 #define DCLK_VOP1 181 @@ -671,6 +673,7 @@ #define SRST_P_EDP_CTRL 285 /* cru_softrst_con18 */ +#define SRST_A_GPU 288 #define SRST_A_GPU_NOC 289 #define SRST_A_GPU_GRF 290 #define SRST_PVTM_GPU 291 |