From: 陈亮 Date: Wed, 20 Aug 2014 03:57:45 +0000 (-0700) Subject: rename macro RK312x_PMU_SYS_REG to RK312X_PMU_SYS_REG X-Git-Tag: firefly_0821_release~4846 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd9a00c860e2ec7a0f2b910c5e03374c93c4ee27;p=firefly-linux-kernel-4.4.55.git rename macro RK312x_PMU_SYS_REG to RK312X_PMU_SYS_REG Signed-off-by: 陈亮 --- 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