diff options
| author | Tomasz Figa <tomasz.figa@gmail.com> | 2013-08-25 21:37:34 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-09-17 01:48:27 +0400 |
| commit | c836c90e276ec1b1b4193bb6f0b5e6b11cc69f83 (patch) | |
| tree | 7aba4732b5b76ba35c3bd8e96044154135e5f891 /arch/arm/mach-s3c64xx/s3c6410.c | |
| parent | 81e9c1794f24376b0515756e300476d9fec77c0b (diff) | |
| download | linux-c836c90e276ec1b1b4193bb6f0b5e6b11cc69f83.tar.xz | |
ARM: S3C64XX: Bypass legacy initialization when booting with DT
This patch allows bypassing most of legacy initialization when booting
an S3C64xx-based board using device tree, by adding conditional checks
for DT presence to initcalls which are no longer necessary when booting
with DT..
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c64xx/s3c6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/s3c6410.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index 7e6fa125584a..72b2278953a8 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -10,6 +10,10 @@ * published by the Free Software Foundation. */ +/* + * NOTE: Code in this file is not used when booting with Device Tree support. + */ + #include <linux/kernel.h> #include <linux/types.h> #include <linux/interrupt.h> @@ -21,6 +25,7 @@ #include <linux/device.h> #include <linux/serial_core.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -79,6 +84,10 @@ static struct device s3c6410_dev = { static int __init s3c6410_core_init(void) { + /* Not applicable when using DT. */ + if (of_have_populated_dt()) + return 0; + return subsys_system_register(&s3c6410_subsys, NULL); } |