diff options
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c244x-clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c244x-clock.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2440/s3c244x-clock.c b/arch/arm/mach-s3c2440/s3c244x-clock.c index 7f5ea0a169a5..b3fdbdda3d5f 100644 --- a/arch/arm/mach-s3c2440/s3c244x-clock.c +++ b/arch/arm/mach-s3c2440/s3c244x-clock.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 31 | #include <linux/sysdev.h> | ||
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 34 | #include <linux/clk.h> | 33 | #include <linux/clk.h> |
| @@ -73,7 +72,7 @@ static struct clk clk_arm = { | |||
| 73 | }, | 72 | }, |
| 74 | }; | 73 | }; |
| 75 | 74 | ||
| 76 | static int s3c244x_clk_add(struct sys_device *sysdev) | 75 | static int s3c244x_clk_add(struct device *dev) |
| 77 | { | 76 | { |
| 78 | unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); | 77 | unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); |
| 79 | unsigned long clkdivn; | 78 | unsigned long clkdivn; |
| @@ -115,24 +114,28 @@ static int s3c244x_clk_add(struct sys_device *sysdev) | |||
| 115 | return 0; | 114 | return 0; |
| 116 | } | 115 | } |
| 117 | 116 | ||
| 118 | static struct sysdev_driver s3c2440_clk_driver = { | 117 | static struct subsys_interface s3c2440_clk_interface = { |
| 119 | .add = s3c244x_clk_add, | 118 | .name = "s3c2440_clk", |
| 119 | .subsys = &s3c2440_subsys, | ||
| 120 | .add_dev = s3c244x_clk_add, | ||
| 120 | }; | 121 | }; |
| 121 | 122 | ||
| 122 | static int s3c2440_clk_init(void) | 123 | static int s3c2440_clk_init(void) |
| 123 | { | 124 | { |
| 124 | return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_clk_driver); | 125 | return subsys_interface_register(&s3c2440_clk_interface); |
| 125 | } | 126 | } |
| 126 | 127 | ||
| 127 | arch_initcall(s3c2440_clk_init); | 128 | arch_initcall(s3c2440_clk_init); |
| 128 | 129 | ||
| 129 | static struct sysdev_driver s3c2442_clk_driver = { | 130 | static struct subsys_interface s3c2442_clk_interface = { |
| 130 | .add = s3c244x_clk_add, | 131 | .name = "s3c2442_clk", |
| 132 | .subsys = &s3c2442_subsys, | ||
| 133 | .add_dev = s3c244x_clk_add, | ||
| 131 | }; | 134 | }; |
| 132 | 135 | ||
| 133 | static int s3c2442_clk_init(void) | 136 | static int s3c2442_clk_init(void) |
| 134 | { | 137 | { |
| 135 | return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_clk_driver); | 138 | return subsys_interface_register(&s3c2442_clk_interface); |
| 136 | } | 139 | } |
| 137 | 140 | ||
| 138 | arch_initcall(s3c2442_clk_init); | 141 | arch_initcall(s3c2442_clk_init); |
