summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-01-29 17:24:28 -0800
committerStephen Boyd <sboyd@codeaurora.org>2016-01-29 17:24:28 -0800
commit60c7e2d2edc7a2a3613540e18760a713359946f6 (patch)
tree5b3052c610a3bbd479cb5d0697a896619dd6f4f6 /Documentation
parenteac2d86d60449bc9852f94853cc156897fe9e893 (diff)
parent8931f8e02979e4180566907019d432527c80abf7 (diff)
downloadlinux-60c7e2d2edc7a2a3613540e18760a713359946f6.tar.gz
linux-60c7e2d2edc7a2a3613540e18760a713359946f6.tar.bz2
linux-60c7e2d2edc7a2a3613540e18760a713359946f6.zip
Merge tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes
Pull rockchip fixes from Heiko Stuebner: Fixes for wrong register offsets in both rk3036 and rk3368. Also rename the external input for the emac on rk3036, which should still be ok to do, as that binding was only introduced during this merge-window. * tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: clk: rockchip: rk3368: fix some clock gates clk: rockchip: rk3036: rename emac ext source clock clk: rockchip: rk3036: fix the div offset for emac clock clk: rockchip: rk3036: fix uarts clock error clk: rockchip: rk3036: fix the FLAGs for clock mux
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt2
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: