summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:18 +0200
commite5fc57847e7a68ad4a662e9799afb103211e4073 (patch)
treefba7865660b3acf477eac3998affeeca83e57638 /arch/arm/mach-imx
parentd11999163ba62a239022d7ba98bc524730575db8 (diff)
parente208e049f98de40157eb3d8f8f7cbb61147a5040 (diff)
downloadbarebox-e5fc57847e7a68ad4a662e9799afb103211e4073.tar.gz
barebox-e5fc57847e7a68ad4a662e9799afb103211e4073.tar.xz
Merge branch 'for-next/reset-source'
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/imx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index ad9b3c4d3e..0942d50695 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -199,9 +199,7 @@ void imx_set_reset_reason(void __iomem *srsr,
}
}
- reset_source_set_priority(type,
- RESET_SOURCE_DEFAULT_PRIORITY);
- reset_source_set_instance(type, instance);
+ reset_source_set_prinst(type, RESET_SOURCE_DEFAULT_PRIORITY, instance);
pr_info("i.MX reset reason %s (SRSR: 0x%08x)\n",
reset_source_name(), reg);