diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /arch/arm/mach-s3c64xx/s3c6410.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/arm/mach-s3c64xx/s3c6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/s3c6410.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c index 72b2278..31c29fd 100644 --- a/arch/arm/mach-s3c64xx/s3c6410.c +++ b/arch/arm/mach-s3c64xx/s3c6410.c @@ -10,10 +10,6 @@ * 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> @@ -25,7 +21,6 @@ #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> @@ -67,6 +62,13 @@ void __init s3c6410_map_io(void) s3c_cfcon_setname("s3c64xx-pata"); } +void __init s3c6410_init_clocks(int xtal) +{ + printk(KERN_DEBUG "%s: initialising clocks\n", __func__); + s3c64xx_register_clocks(xtal, S3C6410_CLKDIV0_ARM_MASK); + s3c64xx_setup_clocks(); +} + void __init s3c6410_init_irq(void) { /* VIC0 is missing IRQ7, VIC1 is fully populated. */ @@ -84,10 +86,6 @@ 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); } |