]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net/stmmac: Use clk_prepare_enable and clk_disable_unprepare
authorStefan Roese <sr@denx.de>
Fri, 21 Sep 2012 01:06:29 +0000 (01:06 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Sep 2012 18:59:52 +0000 (14:59 -0400)
commita630844d898ae8a0b4a3db84af061150682e0d3c
tree8317ae037bf24b70c0fa00d560f46c724045ed5d
parentbf5b30b8a4416de04f1ac1196281ddb318669464
net/stmmac: Use clk_prepare_enable and clk_disable_unprepare

This patch fixes an issue introduced by commit ID 6a81c26f
[net/stmmac: remove conditional compilation of clk code], which
switched from the internal stmmac_clk_{en}{dis}able calls to
clk_{en}{dis}able. By this, calling clk_prepare and clk_unprepare
was removed.

clk_{un}prepare is mandatory for platforms using common clock framework.
Since these drivers are used by SPEAr platform, which supports common
clock framework, add clk_{un}prepare() support for them. Otherwise
the clocks are not correctly en-/disabled and ethernet support doesn't
work.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c