diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 15:54:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-30 00:49:15 +0100 |
| commit | 15b0bc4041baf0444e4ddd969849bb1d91703f59 (patch) | |
| tree | 3ecfbfc371d3dd863680ca896b51ed422c7ba1f3 /arch/arm | |
| parent | ARM: l2c: exynos: convert to common l2c310 early resume functionality (diff) | |
| download | linux-dev-15b0bc4041baf0444e4ddd969849bb1d91703f59.tar.xz linux-dev-15b0bc4041baf0444e4ddd969849bb1d91703f59.zip | |
ARM: l2c: exynos: convert to generic l2c OF initialisation (and thereby fix it)
exynos was unconditionally calling the L2 cache initialisation from an
early_initcall. This breaks multiplatform kernels. Thankfully,
converting to generic l2c initialisation fixes this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-exynos/exynos.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index fbfc29df3299..a763c0862da9 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -316,12 +316,6 @@ static int __init exynos_core_init(void) } core_initcall(exynos_core_init); -static int __init exynos4_l2x0_cache_init(void) -{ - return l2x0_of_init(0x3c400001, 0xc20fffff); -} -early_initcall(exynos4_l2x0_cache_init); - static void __init exynos_dt_machine_init(void) { struct device_node *i2c_np; @@ -387,6 +381,8 @@ static void __init exynos_reserve(void) DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)") /* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */ /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ + .l2c_aux_val = 0x3c400001, + .l2c_aux_mask = 0xc20fffff, .smp = smp_ops(exynos_smp_ops), .map_io = exynos_init_io, .init_early = exynos_firmware_init, |