diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:04:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:04:01 +0100 |
| commit | 0a7348925f58839fbb4c86b7e34f43b91beb0586 (patch) | |
| tree | 8db1b38503cc444f78b13ed1a3d6816708cf181c /Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt | |
| parent | Merge tag 'perf-core-for-mingo-20160226' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | Linux 4.5-rc6 (diff) | |
| download | linux-0a7348925f58839fbb4c86b7e34f43b91beb0586.tar.xz linux-0a7348925f58839fbb4c86b7e34f43b91beb0586.zip | |
Merge tag 'v4.5-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt b/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt index ace05992a262..20df350b9ef3 100644 --- a/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt +++ b/Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt @@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following clock-output-names: - "xin24m" - crystal input - required, - "ext_i2s" - external I2S clock - optional, - - "ext_gmac" - external GMAC clock - optional + - "rmii_clkin" - external EMAC clock - optional Example: Clock controller node: |