]> git.baikalelectronics.ru Git - kernel.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)
commita755bd13a87fab0dbabf6bec65919b8709463afb
tree8bac884735479465a8f3e6fc69a32dc295199794
parent05dddb5222c107e807710b5aa82238c8f650cb6c
ARM: sunxi: Reintroduce the restart code for A10/A20 SoCs

This partly reverts commits eeb737442f96 (ARM: sunxi: Remove reset code from
the platform) and 4b5628e93457 (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