diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-15 10:05:47 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:27:23 +0100 |
commit | 74b5d3587adb34193f9241a5bdcd8cd89e92dca7 (patch) | |
tree | 50d47aa86f27737234b5597201cb971f85c82814 /arch | |
parent | fa2511bd42277289952f7a7a7d46ecd29e4b9d41 (diff) | |
download | barebox-74b5d3587adb34193f9241a5bdcd8cd89e92dca7.tar.gz barebox-74b5d3587adb34193f9241a5bdcd8cd89e92dca7.tar.xz |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/src.c | 57 |
3 files changed, 62 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 28ac9f420b..b8d51ea376 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -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 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 1f1a099209..ee839f7443 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -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 diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c new file mode 100644 index 0000000000..73350d15e1 --- /dev/null +++ b/arch/arm/mach-imx/src.c @@ -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); |