summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx1.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-24 12:49:56 +0200
committerShawn Guo <shawnguo@kernel.org>2016-06-28 04:26:20 +0200
commit6f98cb22e4089c3eb63ff86fac010291a0e30241 (patch)
treedba416187bb35b1a76e7bca6b36ecc8cffa15d2c /arch/arm/mach-imx/mm-imx1.c
parentARM: i.MX: Do not explicitly call l2x0_of_init() (diff)
downloadlinux-6f98cb22e4089c3eb63ff86fac010291a0e30241.tar.xz
linux-6f98cb22e4089c3eb63ff86fac010291a0e30241.zip
ARM: imx: remove cpu_is_mx1 check
There is only one call site for this, and it's easily replaced by initializing the reset value at boot time. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx1.c')
-rw-r--r--arch/arm/mach-imx/mm-imx1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mm-imx1.c b/arch/arm/mach-imx/mm-imx1.c
index e065fedb3ad4..9a42f19be81e 100644
--- a/arch/arm/mach-imx/mm-imx1.c
+++ b/arch/arm/mach-imx/mm-imx1.c
@@ -50,7 +50,7 @@ void __init mx1_init_irq(void)
void __init imx1_soc_init(void)
{
- mxc_arch_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
+ imx1_reset_init(MX1_IO_ADDRESS(MX1_WDT_BASE_ADDR));
mxc_device_init();
mxc_register_gpio("imx1-gpio", 0, MX1_GPIO1_BASE_ADDR, SZ_256,