Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
authorHeiko Stuebner <heiko@sntech.de>
Wed, 13 May 2015 13:47:03 +0000 (15:47 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Wed, 13 May 2015 13:47:03 +0000 (15:47 +0200)
commit3f937cf3db466093c533efbcd601952509727a9d
tree1bf06e4dfdbb1487cc40c17fd13509ea2077910d
parent2a9fe3ca84afff6259820c4f62e579f41476becc
Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"

This reverts commit b403125d3bbf8046c1186e1a49cb17bb5551db14.

As reported by Chris, both commits
        b403125 "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
        0ea001d "ARM: rockchip: disable dapswjdp during suspend"
actually fix the same issue and b403125 is the older one, which got
superseded by 0ea001d. Therefore revert the obsolete one again.

Reported-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm/mach-rockchip/pm.c
arch/arm/mach-rockchip/pm.h