aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:21 +0000
committerJohn Crispin <blogic@openwrt.org>2016-03-20 14:41:21 +0000
commit4cc7ede8db038cd5c81e3dfc52228f71bf89d612 (patch)
tree4a1cd65b363f68ab2878704da820cbc00359bbed /target/linux/oxnas
parent8b32d35681618c404fbb2543213c32fdff92aa58 (diff)
downloadmaster-187ad058-4cc7ede8db038cd5c81e3dfc52228f71bf89d612.tar.gz
master-187ad058-4cc7ede8db038cd5c81e3dfc52228f71bf89d612.tar.bz2
master-187ad058-4cc7ede8db038cd5c81e3dfc52228f71bf89d612.zip
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 <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49042 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c12
1 files 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