diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:23:34 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 23:23:34 +0200 |
commit | 2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d (patch) | |
tree | fc7ebd87473156d46ca18b49c4da6f963c32318f /arch/arm/mach-exynos | |
parent | 28fd837204236cf5b5533525e5b53c5176fa97a3 (diff) | |
parent | f6361c6b3880063c2248d4e453331e3dc1efbf83 (diff) | |
download | op-kernel-dev-2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d.zip op-kernel-dev-2b3a47d7a0cda3b35d95a4935d502ff5abab2c4d.tar.gz |
Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Pull "Samsung cleanup for 3.18" from Kukjin Kim:
- remove unused <mach/memory.h> in exynos
- local <mach/regs-clock.h> for s5pv210
- cleanup boot address calculate for exynos
- remove separate restart code for s3c24xx
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: remove separate restart code
ARM: EXYNOS: Do not calculate boot address twice
ARM: S5PV210: move <mach/regs-clock.h> into mach-s5pv210/
ARM: EXYNOS: remove unused <mach/memory.h>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/memory.h | 26 | ||||
-rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 4 |
2 files changed, 2 insertions, 28 deletions
diff --git a/arch/arm/mach-exynos/include/mach/memory.h b/arch/arm/mach-exynos/include/mach/memory.h deleted file mode 100644 index e19df1f..0000000 --- a/arch/arm/mach-exynos/include/mach/memory.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS4 - Memory definitions - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H __FILE__ - -#define PLAT_PHYS_OFFSET UL(0x40000000) - -#ifndef CONFIG_ARM_LPAE -/* Maximum of 256MiB in one bank */ -#define MAX_PHYSMEM_BITS 32 -#define SECTION_SIZE_BITS 28 -#else -#define MAX_PHYSMEM_BITS 36 -#define SECTION_SIZE_BITS 31 -#endif - -#endif /* __ASM_ARCH_MEMORY_H */ diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index a9f1cf7..41ae28d 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -224,7 +224,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) ret = PTR_ERR(boot_reg); goto fail; } - __raw_writel(boot_addr, cpu_boot_reg(core_id)); + __raw_writel(boot_addr, boot_reg); } call_firmware_op(cpu_boot, core_id); @@ -313,7 +313,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus) if (IS_ERR(boot_reg)) break; - __raw_writel(boot_addr, cpu_boot_reg(core_id)); + __raw_writel(boot_addr, boot_reg); } } } |