]> 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)
commit8b2be49f2b5ca3c6b127ff5b7938241cebf809e9
tree1bf06e4dfdbb1487cc40c17fd13509ea2077910d
parentefc6c84e2ef000833d62f8bf1bbf882d82d46999
Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"

This reverts commit b937f4c1b0cbac786903121396973c3cdc6c298e.

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