From fd9a00c860e2ec7a0f2b910c5e03374c93c4ee27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E4=BA=AE?= Date: Tue, 19 Aug 2014 20:57:45 -0700 Subject: [PATCH] rename macro RK312x_PMU_SYS_REG to RK312X_PMU_SYS_REG MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈亮 --- arch/arm/mach-rockchip/rk312x.c | 4 ++-- include/linux/rockchip/pmu.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rockchip/rk312x.c b/arch/arm/mach-rockchip/rk312x.c index c87792980e69..d6f29566cc14 100755 --- a/arch/arm/mach-rockchip/rk312x.c +++ b/arch/arm/mach-rockchip/rk312x.c @@ -339,9 +339,9 @@ static void rk312x_restart(char mode, const char *cmd) rockchip_restart_get_boot_mode(cmd, &boot_flag, &boot_mode); /* for loader */ - writel_relaxed(boot_flag, RK_PMU_VIRT + RK312x_PMU_SYS_REG0); + writel_relaxed(boot_flag, RK_PMU_VIRT + RK312X_PMU_SYS_REG0); /* for linux */ - writel_relaxed(boot_mode, RK_PMU_VIRT + RK312x_PMU_SYS_REG1); + writel_relaxed(boot_mode, RK_PMU_VIRT + RK312X_PMU_SYS_REG1); dsb(); diff --git a/include/linux/rockchip/pmu.h b/include/linux/rockchip/pmu.h index 9f39950ea519..02f379c929f8 100755 --- a/include/linux/rockchip/pmu.h +++ b/include/linux/rockchip/pmu.h @@ -1,9 +1,6 @@ #ifndef __MACH_ROCKCHIP_PMU_H #define __MACH_ROCKCHIP_PMU_H -#define RK312x_PMU_SYS_REG0 0x38 -#define RK312x_PMU_SYS_REG1 0x3c - #define RK3188_PMU_WAKEUP_CFG0 0x00 #define RK3188_PMU_WAKEUP_CFG1 0x04 #define RK3188_PMU_PWRDN_CON 0x08 -- 2.34.1