aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 14:32:02 -0400
committerOlof Johansson <olof@lixom.net>2013-04-26 14:35:51 -0400
commit4923ee444a39c8b75027ed01a7812e940194dbec (patch)
tree660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/mach-exynos/common.c
parentbd51de53e1be9896d815bbea30560262216d4616 (diff)
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616. Turns out that multiplatform breaks some uses cases, such as when you have an existing defconfig, since it adds the new EXYNOS_SINGLE config option as a dependecy. As a result, nearly all exynos config options will be disabled by default. Reverting instead of rebasing since this branch is pulled in as a dependency elsewhere. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
-rw-r--r--arch/arm/mach-exynos/common.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 83bd3f0e1519..d63d399c7bae 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -368,9 +368,6 @@ static void __init exynos4_map_io(void)
368 else 368 else
369 iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1)); 369 iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));
370 370
371 if (!IS_ENABLED(CONFIG_EXYNOS_ATAGS))
372 return
373
374 /* initialize device information early */ 371 /* initialize device information early */
375 exynos4_default_sdhci0(); 372 exynos4_default_sdhci0();
376 exynos4_default_sdhci1(); 373 exynos4_default_sdhci1();
@@ -573,8 +570,6 @@ static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)
573 s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no); 570 s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no);
574} 571}
575 572
576
577#ifdef CONFIG_EXYNOS_ATAGS
578static void __iomem *exynos_eint_base; 573static void __iomem *exynos_eint_base;
579 574
580static DEFINE_SPINLOCK(eint_lock); 575static DEFINE_SPINLOCK(eint_lock);
@@ -880,4 +875,3 @@ static int __init exynos_init_irq_eint(void)
880 return 0; 875 return 0;
881} 876}
882arch_initcall(exynos_init_irq_eint); 877arch_initcall(exynos_init_irq_eint);
883#endif