forked from Minki/linux
18cb680f1a
It's inappropriate to call clk_prepare() in mxc_restart(), because the restart routine could be called in atomic context. Move clk_get() and clk_prepare() into mxc_arch_reset_init() and only have the atomic part clk_enable() be called in mxc_restart(). As a result, mxc_arch_reset_init() needs to be called after clk gets initialized. While there, it also changes printk(KERN_ERR ...) to pr_err() and adds __init annotation for mxc_arch_reset_init(). Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
49 lines
1.2 KiB
C
49 lines
1.2 KiB
C
/*
|
|
* Copyright 2012 Sascha Hauer, Pengutronix
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/irq.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/time.h>
|
|
|
|
#include "common.h"
|
|
#include "hardware.h"
|
|
#include "mx31.h"
|
|
|
|
static void __init imx31_dt_init(void)
|
|
{
|
|
mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char *imx31_dt_board_compat[] __initdata = {
|
|
"fsl,imx31",
|
|
NULL
|
|
};
|
|
|
|
static void __init imx31_dt_timer_init(void)
|
|
{
|
|
mx31_clocks_init_dt();
|
|
}
|
|
|
|
DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
|
|
.map_io = mx31_map_io,
|
|
.init_early = imx31_init_early,
|
|
.init_irq = mx31_init_irq,
|
|
.handle_irq = imx31_handle_irq,
|
|
.init_time = imx31_dt_timer_init,
|
|
.init_machine = imx31_dt_init,
|
|
.dt_compat = imx31_dt_board_compat,
|
|
.restart = mxc_restart,
|
|
MACHINE_END
|