9
0
Fork 0

ARM: i.MX: Add src fixup

Some boards or SoCs need the SRC_SCR[WARM_RESET_ENABLE] bit cleared,
otherwise they won't come up after a watchdog reset. This was observed
on one i.MX6ul based custom board. The Linux Kernel does the same since
2012: 0575fb7 ARM: 7198/1: arm/imx6: add restart support for imx6q.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2016-11-15 10:05:47 +01:00
parent fa2511bd42
commit 74b5d3587a
3 changed files with 62 additions and 0 deletions

View File

@ -80,6 +80,10 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND
depends on MTD_WRITE
default y
config RESET_IMX_SRC
def_bool y
depends on ARCH_IMX6 || ARCH_IMX50 || ARCH_IMX51 || ARCH_IMX53
comment "Freescale i.MX System-on-Chip"
config ARCH_IMX1

View File

@ -25,5 +25,6 @@ obj-y += devices.o imx.o
obj-pbl-y += esdctl.o boot.o
obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o
obj-$(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND) += imx-bbu-external-nand.o
obj-$(CONFIG_RESET_IMX_SRC) += src.o
lwl-y += cpu_init.o
pbl-y += xload-spi.o xload-esdhc.o xload-common.o xload-imx-nand.o

57
arch/arm/mach-imx/src.c Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright 2016 Sascha Hauer <s.hauer@pengutronix.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#include <common.h>
#include <init.h>
#include <io.h>
#include <linux/err.h>
#define SRC_SCR 0x0
#define SCR_WARM_RESET_ENABLE BIT(0)
static int imx_src_reset_probe(struct device_d *dev)
{
struct resource *res;
u32 val;
void __iomem *membase;
res = dev_request_mem_resource(dev, 0);
if (IS_ERR(res))
return PTR_ERR(res);
membase = IOMEM(res->start);
/*
* Generate cold reset for warm reset sources. Needed for
* some boards to come up properly after reset.
*/
val = readl(membase + SRC_SCR);
val &= ~SCR_WARM_RESET_ENABLE;
writel(val, membase + SRC_SCR);
return 0;
}
static const struct of_device_id imx_src_dt_ids[] = {
{ .compatible = "fsl,imx51-src", },
{ /* sentinel */ },
};
static struct driver_d imx_src_reset_driver = {
.name = "imx-src",
.probe = imx_src_reset_probe,
.of_compatible = DRV_OF_COMPAT(imx_src_dt_ids),
};
static int imx_src_reset_init(void)
{
return platform_driver_register(&imx_src_reset_driver);
}
postcore_initcall(imx_src_reset_init);