summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/init.c
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-06-15 02:03:49 +0200
committerKukjin Kim <kgene.kim@samsung.com>2013-06-15 02:32:58 +0200
commit1f72e4045d42d8cfe81c9c7527429affeae7a2a2 (patch)
tree77d48d3ef7a2c18b637900b97032763d3b0b2d84 /arch/arm/plat-samsung/init.c
parentARM: EXYNOS: Remove legacy EINT initialization code (diff)
downloadlinux-1f72e4045d42d8cfe81c9c7527429affeae7a2a2.tar.xz
linux-1f72e4045d42d8cfe81c9c7527429affeae7a2a2.zip
ARM: EXYNOS: Remove legacy UART initialization code
This patch removes legacy UART initialization code that was used to set up UART platform devices when booting with ATAGS, which is not supported on Exynos any more. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung/init.c')
-rw-r--r--arch/arm/plat-samsung/init.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index 79d10fca9090..3e5c4619caa5 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -87,7 +87,7 @@ void __init s3c24xx_init_clocks(int xtal)
}
/* uart management */
-
+#if IS_ENABLED(CONFIG_SAMSUNG_ATAGS)
static int nr_uarts __initdata = 0;
static struct s3c2410_uartcfg uart_cfgs[CONFIG_SERIAL_SAMSUNG_UARTS];
@@ -134,11 +134,12 @@ void __init s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)
if (cpu == NULL)
return;
- if (cpu->init_uarts == NULL) {
+ if (cpu->init_uarts == NULL && IS_ENABLED(CONFIG_SAMSUNG_ATAGS)) {
printk(KERN_ERR "s3c24xx_init_uarts: cpu has no uart init\n");
} else
(cpu->init_uarts)(cfg, no);
}
+#endif
static int __init s3c_arch_init(void)
{
@@ -152,8 +153,9 @@ static int __init s3c_arch_init(void)
ret = (cpu->init)();
if (ret != 0)
return ret;
-
+#if IS_ENABLED(CONFIG_SAMSUNG_ATAGS)
ret = platform_add_devices(s3c24xx_uart_devs, nr_uarts);
+#endif
return ret;
}