diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-04-28 12:08:37 -0400 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-05-04 06:35:29 -0400 |
| commit | e715eb2e73918f4cefbba0b717ff8902e8030b39 (patch) | |
| tree | 1ba12613872342de5ca7882901eec539c1477366 | |
| parent | 7a8d1ec16dfbb7785e82ccc97b0076cc34911701 (diff) | |
vexpress: Initialise the sysregs before setting up the clocks
Following arm64 commit bc3ee18a7a57 (arm64: init: Move of_clk_init to
time_init()), vexpress_osc_of_setup() is called via of_clk_init() long
before initcalls are issued. Initialising the vexpress oscillators
requires the vespress sysregs to be already initialised, so this patch
adds an explicit call to vexpress_sysreg_of_early_init() in vexpress
oscillator setup function.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Tested-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Cc: Mike Turquette <mturquette@linaro.org>
| -rw-r--r-- | drivers/clk/versatile/clk-vexpress-osc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c index a535c7bf8574..422391242b39 100644 --- a/drivers/clk/versatile/clk-vexpress-osc.c +++ b/drivers/clk/versatile/clk-vexpress-osc.c | |||
| @@ -100,6 +100,8 @@ void __init vexpress_osc_of_setup(struct device_node *node) | |||
| 100 | struct clk *clk; | 100 | struct clk *clk; |
| 101 | u32 range[2]; | 101 | u32 range[2]; |
| 102 | 102 | ||
| 103 | vexpress_sysreg_of_early_init(); | ||
| 104 | |||
| 103 | osc = kzalloc(sizeof(*osc), GFP_KERNEL); | 105 | osc = kzalloc(sizeof(*osc), GFP_KERNEL); |
| 104 | if (!osc) | 106 | if (!osc) |
| 105 | return; | 107 | return; |
