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>
This commit is contained in:
@@ -11,12 +11,18 @@
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
/*
|
||||
* NOTE: Code in this file is not used on S3C64xx when booting with
|
||||
* Device Tree support.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
@@ -148,8 +154,12 @@ static int __init s3c_arch_init(void)
|
||||
|
||||
// do the correct init for cpu
|
||||
|
||||
if (cpu == NULL)
|
||||
if (cpu == NULL) {
|
||||
/* Not needed when booting with device tree. */
|
||||
if (of_have_populated_dt())
|
||||
return 0;
|
||||
panic("s3c_arch_init: NULL cpu\n");
|
||||
}
|
||||
|
||||
ret = (cpu->init)();
|
||||
if (ret != 0)
|
||||
|
Reference in New Issue
Block a user