aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-rockchip/pm.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-13 16:17:33 +0200
committerArnd Bergmann <arnd@arndb.de>2015-05-13 16:17:33 +0200
commit6c28ab9fef9b4eca350d68ed0090f92fe37f969f (patch)
treee7f361fc83d13b7c7823abf925eb0365ad9e5fa0 /arch/arm/mach-rockchip/pm.h
parent31fc835fc787aad38e8985d593f8ad0d18825323 (diff)
parent3f937cf3db466093c533efbcd601952509727a9d (diff)
Merge tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
The previous two suspend related fixes both fix the same issue so only one of them (the newer one) is actually needed. * tag 'v4.1-rockchip-socfixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"
Diffstat (limited to 'arch/arm/mach-rockchip/pm.h')
-rw-r--r--arch/arm/mach-rockchip/pm.h4
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)

Privacy Policy