diff options
| author |   Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-08-23 10:44:02 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-08-26 15:55:58 +0200 |
| commit | 699e36e5b8e9f77b2be4c23f0b309e53be4b2880 (patch) | |
| tree | dd8cd0a7de48e32b85e5a996ad11aca0109a540f /drivers/clocksource | |
| parent | clocksource/drivers/pxa: Fix include files for compilation (diff) | |
| download | linux-dev-699e36e5b8e9f77b2be4c23f0b309e53be4b2880.tar.xz linux-dev-699e36e5b8e9f77b2be4c23f0b309e53be4b2880.zip | |
clocksource/drivers/timer-atmel-pit: Enable mck clock
mck is needed to get the PIT working. Explicitly prepare_enable it instead
of assuming it is enabled.
This solves an issue where the system is freezing when the ETM/ETB drivers
are enabled.
Reported-by: Olivier Schonken <olivier.schonken@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index 1ffac0cb0cb7..3494bc5a21d5 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -261,6 +261,12 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) return PTR_ERR(data->mck); } + ret = clk_prepare_enable(data->mck); + if (ret) { + pr_err("Unable to enable mck\n"); + return ret; + } + /* Get the interrupts property */ data->irq = irq_of_parse_and_map(node, 0); if (!data->irq) { |