Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Xing Zheng and committed by
Heiko Stuebner
3d667920 c4051935

+2 -2
+1 -1
Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt
··· 30 30 clock-output-names: 31 31 - "xin24m" - crystal input - required, 32 32 - "ext_i2s" - external I2S clock - optional, 33 - - "ext_gmac" - external GMAC clock - optional 33 + - "rmii_clkin" - external EMAC clock - optional 34 34 35 35 Example: Clock controller node: 36 36
+1 -1
drivers/clk/rockchip/clk-rk3036.c
··· 133 133 PNAME(mux_uart0_p) = { "uart0_src", "uart0_frac", "xin24m" }; 134 134 PNAME(mux_uart1_p) = { "uart1_src", "uart1_frac", "xin24m" }; 135 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 137 PNAME(mux_dclk_p) = { "dclk_lcdc", "dclk_cru" }; 138 138 139 139 static struct rockchip_pll_clock rk3036_pll_clks[] __initdata = {