ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-s3c64xx / s3c6400.c

diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 51c00f2453c6c62ef9537143c0f31ad8ea416424..4869714c6f1bb015e4b6af08705837169bad2466 100644 (file)
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 
@@ -38,7 +38,8 @@
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
 #include <plat/onenand-core.h>
-#include <plat/s3c6400.h>
+
+#include "common.h"
 
 void __init s3c6400_map_io(void)
 {
@@ -60,7 +61,7 @@ void __init s3c6400_map_io(void)
 void __init s3c6400_init_clocks(int xtal)
 {
        s3c64xx_register_clocks(xtal, S3C6400_CLKDIV0_ARM_MASK);
-       s3c6400_setup_clocks();
+       s3c64xx_setup_clocks();
 }
 
 void __init s3c6400_init_irq(void)
@@ -70,17 +71,18 @@ void __init s3c6400_init_irq(void)
        s3c64xx_init_irq(~0 & ~(0xf << 5), ~0);
 }
 
-static struct sysdev_class s3c6400_sysclass = {
-       .name   = "s3c6400-core",
+static struct bus_type s3c6400_subsys = {
+       .name           = "s3c6400-core",
+       .dev_name       = "s3c6400-core",
 };
 
-static struct sys_device s3c6400_sysdev = {
-       .cls    = &s3c6400_sysclass,
+static struct device s3c6400_dev = {
+       .bus    = &s3c6400_subsys,
 };
 
 static int __init s3c6400_core_init(void)
 {
-       return sysdev_class_register(&s3c6400_sysclass);
+       return subsys_system_register(&s3c6400_subsys, NULL);
 }
 
 core_initcall(s3c6400_core_init);
@@ -89,5 +91,5 @@ int __init s3c6400_init(void)
 {
        printk("S3C6400: Initialising architecture\n");
 
-       return sysdev_register(&s3c6400_sysdev);
+       return device_register(&s3c6400_dev);
 }