diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2015-05-13 16:47:03 +0300 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2015-05-13 16:47:03 +0300 |
| commit | 3f937cf3db466093c533efbcd601952509727a9d (patch) | |
| tree | 1bf06e4dfdbb1487cc40c17fd13509ea2077910d /arch/arm/mach-rockchip/pm.h | |
| parent | 2a9fe3ca84afff6259820c4f62e579f41476becc (diff) | |
| download | linux-3f937cf3db466093c533efbcd601952509727a9d.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-rockchip/pm.h')
| -rw-r--r-- | arch/arm/mach-rockchip/pm.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h index f8a747bc1437..3e8d39c0c3d5 100644 --- a/arch/arm/mach-rockchip/pm.h +++ b/arch/arm/mach-rockchip/pm.h @@ -48,10 +48,6 @@ static inline void rockchip_suspend_init(void) #define RK3288_PMU_WAKEUP_RST_CLR_CNT 0x44 #define RK3288_PMU_PWRMODE_CON1 0x90 -#define RK3288_GRF_SOC_CON0 0x244 -#define GRF_FORCE_JTAG BIT(12) -#define GRF_FORCE_JTAG_WRITE BIT(28) - #define RK3288_SGRF_SOC_CON0 (0x0000) #define RK3288_SGRF_FAST_BOOT_ADDR (0x0120) #define SGRF_PCLK_WDT_GATE BIT(6) |