diff options
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
-rw-r--r-- | arch/arm/mach-exynos/common.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 742edd3bbec3..4eb39cdf75ea 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -540,7 +540,8 @@ static struct irq_domain_ops combiner_irq_domain_ops = { | |||
540 | .map = combiner_irq_domain_map, | 540 | .map = combiner_irq_domain_map, |
541 | }; | 541 | }; |
542 | 542 | ||
543 | void __init combiner_init(void __iomem *combiner_base, struct device_node *np) | 543 | static void __init combiner_init(void __iomem *combiner_base, |
544 | struct device_node *np) | ||
544 | { | 545 | { |
545 | int i, irq, irq_base; | 546 | int i, irq, irq_base; |
546 | unsigned int max_nr, nr_irq; | 547 | unsigned int max_nr, nr_irq; |
@@ -712,31 +713,6 @@ static int __init exynos4_l2x0_cache_init(void) | |||
712 | early_initcall(exynos4_l2x0_cache_init); | 713 | early_initcall(exynos4_l2x0_cache_init); |
713 | #endif | 714 | #endif |
714 | 715 | ||
715 | static int __init exynos5_l2_cache_init(void) | ||
716 | { | ||
717 | unsigned int val; | ||
718 | |||
719 | if (!soc_is_exynos5250()) | ||
720 | return 0; | ||
721 | |||
722 | asm volatile("mrc p15, 0, %0, c1, c0, 0\n" | ||
723 | "bic %0, %0, #(1 << 2)\n" /* cache disable */ | ||
724 | "mcr p15, 0, %0, c1, c0, 0\n" | ||
725 | "mrc p15, 1, %0, c9, c0, 2\n" | ||
726 | : "=r"(val)); | ||
727 | |||
728 | val |= (1 << 9) | (1 << 5) | (2 << 6) | (2 << 0); | ||
729 | |||
730 | asm volatile("mcr p15, 1, %0, c9, c0, 2\n" : : "r"(val)); | ||
731 | asm volatile("mrc p15, 0, %0, c1, c0, 0\n" | ||
732 | "orr %0, %0, #(1 << 2)\n" /* cache enable */ | ||
733 | "mcr p15, 0, %0, c1, c0, 0\n" | ||
734 | : : "r"(val)); | ||
735 | |||
736 | return 0; | ||
737 | } | ||
738 | early_initcall(exynos5_l2_cache_init); | ||
739 | |||
740 | static int __init exynos_init(void) | 716 | static int __init exynos_init(void) |
741 | { | 717 | { |
742 | printk(KERN_INFO "EXYNOS: Initializing architecture\n"); | 718 | printk(KERN_INFO "EXYNOS: Initializing architecture\n"); |