From daf7ab04ba0f9ee7b9ad053879a4e4eb06d653a7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 20 Mar 2016 14:41:21 +0000 Subject: [PATCH] oxnas: also reset GPIO B registers on boot Clear both, SYS_CTRL_*_SEL and SEC_CTRL_*_SEL on boot instead of writing to SYS_CTRL_*_SEL twice which looks like a copy-paste error. Thanks to anonymous to bring this up in #21892! Signed-off-by: Daniel Golle SVN-Revision: 49042 --- .../oxnas/files/arch/arm/mach-oxnas/mach-ox820.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c index 2a8ada81bf..1e3b12d1a2 100644 --- a/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c +++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c @@ -152,12 +152,12 @@ void ox820_assert_system_reset(enum reboot_mode mode, const char *cmd) writel(0, SYS_CTRL_ALTERNATIVE_SEL); writel(0, SYS_CTRL_PULLUP_SEL); - writel(0, SYS_CTRL_SECONDARY_SEL); - writel(0, SYS_CTRL_TERTIARY_SEL); - writel(0, SYS_CTRL_QUATERNARY_SEL); - writel(0, SYS_CTRL_DEBUG_SEL); - writel(0, SYS_CTRL_ALTERNATIVE_SEL); - writel(0, SYS_CTRL_PULLUP_SEL); + writel(0, SEC_CTRL_SECONDARY_SEL); + writel(0, SEC_CTRL_TERTIARY_SEL); + writel(0, SEC_CTRL_QUATERNARY_SEL); + writel(0, SEC_CTRL_DEBUG_SEL); + writel(0, SEC_CTRL_ALTERNATIVE_SEL); + writel(0, SEC_CTRL_PULLUP_SEL); /* No need to save any state, as the ROM loader can determine whether * reset is due to power cycling or programatic action, just hit the