]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Sun, 29 Jun 2014 13:48:53 +0000 (15:48 +0200)
committerOlof Johansson <olof@lixom.net>
Sat, 5 Jul 2014 04:50:10 +0000 (21:50 -0700)
commitd767af5e66ee11928bd17df32b342a8737177376
tree8bac884735479465a8f3e6fc69a32dc295199794
parent5acd78c59ab16a40e8e2002d133df0349e0863c1
ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs

This partly reverts commits 553600502b84 (ARM: sunxi: Remove reset code from
the platform) and 5e669ec583e2 (ARM: sunxi: Remove init_machine callback) for
the sun4i, sun5i and sun7i families.

This is needed because the watchdog counterpart of these commits was dropped,
and didn't make it into 3.16. In order to still be able to reboot the board, we
need to reintroduce that code. Of course, the long term view is still to get
rid of that code in mach-sunxi.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-sunxi/sunxi.c