diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-01-30 02:26:31 +0100 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-01-30 02:26:31 +0100 |
| commit | 4fcad2eaaacc0872f15669fc33f55646fd9d844a (patch) | |
| tree | 975d264300cca78c974ff39439e30050d53f8c6a /Documentation | |
| parent | clk: st: avoid uninitialized variable use (diff) | |
| parent | Merge tag 'v4.5-rockchip-clkfixes1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-4fcad2eaaacc0872f15669fc33f55646fd9d844a.tar.xz linux-4fcad2eaaacc0872f15669fc33f55646fd9d844a.zip | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
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.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: |