diff options
author | Xing Zheng <zhengxing@rock-chips.com> | 2016-01-07 07:17:36 -0500 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2016-01-16 10:01:21 -0500 |
commit | 3d667920bc8fc0c3b39e4e740352d9367fa4916e (patch) | |
tree | a84bb549b46c5f8c8529065f37f63ccbdcc8f52f | |
parent | c40519350e1d7db03e35e57509352c55948648ba (diff) |
clk: rockchip: rk3036: rename emac ext source clock
There is only support rmii in the RK3036, so we should use the correct
ext clock name as described in the TRM.
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
[update dt-binding document as well]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt | 2 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk-rk3036.c | 2 |
2 files changed, 2 insertions, 2 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 | |||
30 | clock-output-names: | 30 | clock-output-names: |
31 | - "xin24m" - crystal input - required, | 31 | - "xin24m" - crystal input - required, |
32 | - "ext_i2s" - external I2S clock - optional, | 32 | - "ext_i2s" - external I2S clock - optional, |
33 | - "ext_gmac" - external GMAC clock - optional | 33 | - "rmii_clkin" - external EMAC clock - optional |
34 | 34 | ||
35 | Example: Clock controller node: | 35 | Example: Clock controller node: |
36 | 36 | ||
diff --git a/drivers/clk/rockchip/clk-rk3036.c b/drivers/clk/rockchip/clk-rk3036.c index 1f00fab72dfb..bc7fbac83ab7 100644 --- a/drivers/clk/rockchip/clk-rk3036.c +++ b/drivers/clk/rockchip/clk-rk3036.c | |||
@@ -133,7 +133,7 @@ PNAME(mux_spdif_p) = { "spdif_src", "spdif_frac", "xin12m" }; | |||
133 | PNAME(mux_uart0_p) = { "uart0_src", "uart0_frac", "xin24m" }; | 133 | PNAME(mux_uart0_p) = { "uart0_src", "uart0_frac", "xin24m" }; |
134 | PNAME(mux_uart1_p) = { "uart1_src", "uart1_frac", "xin24m" }; | 134 | PNAME(mux_uart1_p) = { "uart1_src", "uart1_frac", "xin24m" }; |
135 | PNAME(mux_uart2_p) = { "uart2_src", "uart2_frac", "xin24m" }; | 135 | PNAME(mux_uart2_p) = { "uart2_src", "uart2_frac", "xin24m" }; |
136 | PNAME(mux_mac_p) = { "mac_pll_src", "ext_gmac" }; | 136 | PNAME(mux_mac_p) = { "mac_pll_src", "rmii_clkin" }; |
137 | PNAME(mux_dclk_p) = { "dclk_lcdc", "dclk_cru" }; | 137 | PNAME(mux_dclk_p) = { "dclk_lcdc", "dclk_cru" }; |
138 | 138 | ||
139 | static struct rockchip_pll_clock rk3036_pll_clks[] __initdata = { | 139 | static struct rockchip_pll_clock rk3036_pll_clks[] __initdata = { |