iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: EXYNOS: replace EXYNOS_BOOT_VECTOR_* macros by static inlines

Browse Source 
Replace EXYNOS_BOOT_VECTOR_ADDR and EXYNOS_BOOT_VECTOR_FLAG macros
by exynos_boot_vector_addr() and exynos_boot_vector_flag() static
inlines.

This patch shouldn't cause any functionality changes.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2014-09-25 17:59:40 +09:00 committed by Kukjin Kim
parent 2b9d9c321b
commit 134abc297e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/mach-exynos/pm.c
View File

@ -128,16 +128,23 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)
return -ENOENT; return -ENOENT;
} }
#define EXYNOS_BOOT_VECTOR_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \ static inline void __iomem *exynos_boot_vector_addr(void)
pmu_base_addr + S5P_INFORM7 : \ {
(samsung_rev() == EXYNOS4210_REV_1_0 ? \ if (samsung_rev() == EXYNOS4210_REV_1_1)
(sysram_base_addr + 0x24) : \ return pmu_base_addr + S5P_INFORM7;
pmu_base_addr + S5P_INFORM0)) else if (samsung_rev() == EXYNOS4210_REV_1_0)
#define EXYNOS_BOOT_VECTOR_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \ return sysram_base_addr + 0x24;
pmu_base_addr + S5P_INFORM6 : \ return pmu_base_addr + S5P_INFORM0;
(samsung_rev() == EXYNOS4210_REV_1_0 ? \ }
(sysram_base_addr + 0x20) : \
pmu_base_addr + S5P_INFORM1)) static inline void __iomem *exynos_boot_vector_flag(void)
{
if (samsung_rev() == EXYNOS4210_REV_1_1)
return pmu_base_addr + S5P_INFORM6;
else if (samsung_rev() == EXYNOS4210_REV_1_0)
return sysram_base_addr + 0x20;
return pmu_base_addr + S5P_INFORM1;
}
#define S5P_CHECK_AFTR 0xFCBA0D10 #define S5P_CHECK_AFTR 0xFCBA0D10
#define S5P_CHECK_SLEEP 0x00000BAD #define S5P_CHECK_SLEEP 0x00000BAD
@ -222,8 +229,9 @@ static void exynos_set_wakeupmask(long mask)
static void exynos_cpu_set_boot_vector(long flags) static void exynos_cpu_set_boot_vector(long flags)
{ {
__raw_writel(virt_to_phys(exynos_cpu_resume), EXYNOS_BOOT_VECTOR_ADDR); __raw_writel(virt_to_phys(exynos_cpu_resume),
__raw_writel(flags, EXYNOS_BOOT_VECTOR_FLAG); exynos_boot_vector_addr());
__raw_writel(flags, exynos_boot_vector_flag());
} }
static int exynos_aftr_finisher(unsigned long flags) static int exynos_aftr_finisher(unsigned long flags)