diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2017-03-10 13:18:53 +0300 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2017-03-10 13:18:53 +0300 |
| commit | 4d00542b27e2fd34761b93e9077fae09a19ffc0d (patch) | |
| tree | c25f1d8fd657b12872a2067cc7064ed28ab91a64 | |
| parent | 60aadea57ed98e734a7e9edb3076b5a72eff0b0d (diff) | |
| parent | 710fbd769c9c9ba80f5b2727dd6bf4e06bb69b9e (diff) | |
| download | linux-4d00542b27e2fd34761b93e9077fae09a19ffc0d.tar.xz | |
Merge branch 'v4.12-shared/clkids' into v4.12-clk/next
| -rw-r--r-- | include/dt-bindings/clock/rk3328-cru.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rk3368-cru.h | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h index ee702c8e4c09..d2b26a4b43eb 100644 --- a/include/dt-bindings/clock/rk3328-cru.h +++ b/include/dt-bindings/clock/rk3328-cru.h @@ -97,6 +97,7 @@ #define SCLK_MAC2IO_SRC 99 #define SCLK_MAC2IO 100 #define SCLK_MAC2PHY 101 +#define SCLK_MAC2IO_EXT 102 /* dclk gates */ #define DCLK_LCDC 120 diff --git a/include/dt-bindings/clock/rk3368-cru.h b/include/dt-bindings/clock/rk3368-cru.h index 9c5dd9ba2f6c..aeb83e581a11 100644 --- a/include/dt-bindings/clock/rk3368-cru.h +++ b/include/dt-bindings/clock/rk3368-cru.h @@ -44,13 +44,12 @@ #define SCLK_I2S_8CH 82 #define SCLK_SPDIF_8CH 83 #define SCLK_I2S_2CH 84 -#define SCLK_TIMER0 85 -#define SCLK_TIMER1 86 -#define SCLK_TIMER2 87 -#define SCLK_TIMER3 88 -#define SCLK_TIMER4 89 -#define SCLK_TIMER5 90 -#define SCLK_TIMER6 91 +#define SCLK_TIMER00 85 +#define SCLK_TIMER01 86 +#define SCLK_TIMER02 87 +#define SCLK_TIMER03 88 +#define SCLK_TIMER04 89 +#define SCLK_TIMER05 90 #define SCLK_OTGPHY0 93 #define SCLK_OTG_ADP 96 #define SCLK_HSICPHY480M 97 @@ -82,6 +81,12 @@ #define SCLK_SFC 126 #define SCLK_MAC 127 #define SCLK_MACREF_OUT 128 +#define SCLK_TIMER10 133 +#define SCLK_TIMER11 134 +#define SCLK_TIMER12 135 +#define SCLK_TIMER13 136 +#define SCLK_TIMER14 137 +#define SCLK_TIMER15 138 #define DCLK_VOP 190 #define MCLK_CRYPTO 191 |