diff options
| author |   Sachin Kamat <sachin.kamat@linaro.org> | 2014-03-21 02:14:30 +0900 |
|---|---|---|
| committer |   Kukjin Kim <kgene.kim@samsung.com> | 2014-03-21 02:14:39 +0900 |
| commit | cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a (patch) | |
| tree | 225319584ce03c06e11fd3f67553124d73666879 /arch/arm/mach-exynos/mach-exynos4-dt.c | |
| parent | ARM: EXYNOS: Consolidate CPU init code (diff) | |
| download | linux-dev-cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a.tar.xz linux-dev-cbf08b9ebdfc75bb13ef80ad3b8e3bea46d8c43a.zip | |
ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files
Since there is very little difference between these two files,
they can be easily combined into one with necessary SoC checks.
While at it also merge the common.c file into this as it does
not have any other users.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c deleted file mode 100644 index fa019fd730bb..000000000000 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Samsung's EXYNOS4 flattened device tree enabled machine - * - * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * Copyright (c) 2010-2011 Linaro Ltd. - * www.linaro.org - * - * 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. -*/ - -#include <linux/of_platform.h> -#include <linux/of_fdt.h> - -#include <asm/mach/arch.h> - -#include "common.h" -#include "mfc.h" - -static void __init exynos4_dt_machine_init(void) -{ - exynos_cpuidle_init(); - exynos_cpufreq_init(); - - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static char const *exynos4_dt_compat[] __initdata = { - "samsung,exynos4210", - "samsung,exynos4212", - "samsung,exynos4412", - NULL -}; - -static void __init exynos4_reserve(void) -{ -#ifdef CONFIG_S5P_DEV_MFC - of_scan_flat_dt(s5p_fdt_alloc_mfc_mem, "samsung,mfc-v5"); -#endif -} -DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") - /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ - .smp = smp_ops(exynos_smp_ops), - .map_io = exynos_init_io, - .init_early = exynos_firmware_init, - .init_machine = exynos4_dt_machine_init, - .init_late = exynos_init_late, - .dt_compat = exynos4_dt_compat, - .restart = exynos4_restart, - .reserve = exynos4_reserve, -MACHINE_END |