]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit78474eb40009619d93856c0e5f396b0c1fb5dfff
tree1bf06e4dfdbb1487cc40c17fd13509ea2077910d
parent2aee6c0684827649c27d3fc79040c4f779af5fe3
Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"

This reverts commit b67c4ffe13bc912f6722847dc3d146c631bf0846.

As reported by Chris, both commits
        b67c4ff "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
        539af69 "ARM: rockchip: disable dapswjdp during suspend"
actually fix the same issue and b67c4ff is the older one, which got
superseded by 539af69. 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