diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-02-03 01:59:38 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-02-03 01:59:38 +0300 |
| commit | 54eea32f7ed3037c91853924227585b65df909a8 (patch) | |
| tree | 4e3e9ece8a66f611e980ddc503ca7184db8f83fb /arch/powerpc/platforms | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| parent | b530e7d2108a871279dcf707d9d15a3358767d2b (diff) | |
| download | linux-54eea32f7ed3037c91853924227585b65df909a8.tar.xz | |
Merge branch 'clk-next' into v3.19-rc7
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/512x/clock-commonclk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c index 6eb614a271fb..f691bcabd710 100644 --- a/arch/powerpc/platforms/512x/clock-commonclk.c +++ b/arch/powerpc/platforms/512x/clock-commonclk.c @@ -1168,6 +1168,11 @@ static void mpc5121_clk_provide_backwards_compat(void) } } +/* + * The "fixed-clock" nodes (which includes the oscillator node if the board's + * DT provides one) has already been scanned by the of_clk_init() in + * time_init(). + */ int __init mpc5121_clk_init(void) { struct device_node *clk_np; @@ -1187,12 +1192,6 @@ int __init mpc5121_clk_init(void) mpc512x_clk_preset_data(); /* - * have the device tree scanned for "fixed-clock" nodes (which - * includes the oscillator node if the board's DT provides one) - */ - of_clk_init(NULL); - - /* * add a dummy clock for those situations where a clock spec is * required yet no real clock is involved */ |