summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-s3c2410/Kconfig20
-rw-r--r--arch/arm/mach-s3c2410/Makefile14
-rw-r--r--arch/arm/mach-s3c2412/Kconfig13
-rw-r--r--arch/arm/mach-s3c2412/Makefile12
-rw-r--r--arch/arm/mach-s3c2412/gpio.c62
-rw-r--r--arch/arm/mach-s3c2440/Kconfig37
-rw-r--r--arch/arm/mach-s3c2440/Makefile15
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig56
-rw-r--r--arch/arm/mach-s3c24xx/Makefile6
-rw-r--r--arch/arm/mach-s3c24xx/cpufreq-s3c2410.c (renamed from arch/arm/mach-s3c2410/cpu-freq.c)7
-rw-r--r--arch/arm/mach-s3c24xx/cpufreq-s3c2412.c (renamed from arch/arm/mach-s3c2412/cpu-freq.c)6
-rw-r--r--arch/arm/mach-s3c24xx/cpufreq-s3c2440.c (renamed from arch/arm/mach-s3c2440/s3c2440-cpufreq.c)4
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/hardware.h6
-rw-r--r--arch/arm/mach-s3c24xx/pll-s3c2410.c (renamed from arch/arm/mach-s3c2410/pll.c)5
-rw-r--r--arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c (renamed from arch/arm/mach-s3c2440/s3c2440-pll-12000000.c)5
-rw-r--r--arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c (renamed from arch/arm/mach-s3c2440/s3c2440-pll-16934400.c)5
18 files changed, 71 insertions, 208 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c2950f3e678e..17f49ccb8326 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1086,10 +1086,6 @@ source "arch/arm/mach-socfpga/Kconfig"
1086source "arch/arm/plat-spear/Kconfig" 1086source "arch/arm/plat-spear/Kconfig"
1087 1087
1088source "arch/arm/mach-s3c24xx/Kconfig" 1088source "arch/arm/mach-s3c24xx/Kconfig"
1089if ARCH_S3C24XX
1090source "arch/arm/mach-s3c2412/Kconfig"
1091source "arch/arm/mach-s3c2440/Kconfig"
1092endif
1093 1089
1094if ARCH_S3C64XX 1090if ARCH_S3C64XX
1095source "arch/arm/mach-s3c64xx/Kconfig" 1091source "arch/arm/mach-s3c64xx/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 30c443c406f3..0935dac37f62 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2
173machine-$(CONFIG_ARCH_PXA) += pxa 173machine-$(CONFIG_ARCH_PXA) += pxa
174machine-$(CONFIG_ARCH_REALVIEW) += realview 174machine-$(CONFIG_ARCH_REALVIEW) += realview
175machine-$(CONFIG_ARCH_RPC) += rpc 175machine-$(CONFIG_ARCH_RPC) += rpc
176machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 176machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx
177machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx 177machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx
178machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 178machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0
179machine-$(CONFIG_ARCH_S5PC100) += s5pc100 179machine-$(CONFIG_ARCH_S5PC100) += s5pc100
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
deleted file mode 100644
index 68d89cb96af0..000000000000
--- a/arch/arm/mach-s3c2410/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
1# Copyright 2007 Simtec Electronics
2#
3# Licensed under GPLv2
4
5# cpu frequency scaling support
6
7config S3C2410_CPUFREQ
8 bool
9 depends on CPU_FREQ_S3C24XX && CPU_S3C2410
10 select S3C2410_CPUFREQ_UTILS
11 help
12 CPU Frequency scaling support for S3C2410
13
14config S3C2410_PLLTABLE
15 bool
16 depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL
17 default y
18 help
19 Select the PLL table for the S3C2410
20
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
deleted file mode 100644
index 6b9a316e0041..000000000000
--- a/arch/arm/mach-s3c2410/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
1# arch/arm/mach-s3c2410/Makefile
2#
3# Copyright 2007 Simtec Electronics
4#
5# Licensed under GPLv2
6
7obj-y :=
8obj-m :=
9obj-n :=
10obj- :=
11
12obj-$(CONFIG_S3C2410_CPUFREQ) += cpu-freq.o
13obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o
14
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
deleted file mode 100644
index 495f6928cbaa..000000000000
--- a/arch/arm/mach-s3c2412/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
1# Copyright 2007 Simtec Electronics
2#
3# Licensed under GPLv2
4
5# Note, the S3C2412 IOtiming support is in plat-s3c24xx
6
7config S3C2412_CPUFREQ
8 bool
9 depends on CPU_FREQ_S3C24XX && CPU_S3C2412
10 default y
11 select S3C2412_IOTIMING
12 help
13 CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile
deleted file mode 100644
index 41a6c279fb2f..000000000000
--- a/arch/arm/mach-s3c2412/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
1# arch/arm/mach-s3c2412/Makefile
2#
3# Copyright 2007 Simtec Electronics
4#
5# Licensed under GPLv2
6
7obj-y :=
8obj-m :=
9obj-n :=
10obj- :=
11
12obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o
diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c
deleted file mode 100644
index 4526f6ba31a8..000000000000
--- a/arch/arm/mach-s3c2412/gpio.c
+++ /dev/null
@@ -1,62 +0,0 @@
1/* linux/arch/arm/mach-s3c2412/gpio.c
2 *
3 * Copyright (c) 2007 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk>
5 *
6 * http://armlinux.simtec.co.uk/.
7 *
8 * S3C2412/S3C2413 specific GPIO support
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation.
13*/
14
15#include <linux/kernel.h>
16#include <linux/types.h>
17#include <linux/module.h>
18#include <linux/interrupt.h>
19#include <linux/gpio.h>
20
21#include <asm/mach/arch.h>
22#include <asm/mach/map.h>
23
24#include <mach/regs-gpio.h>
25#include <mach/hardware.h>
26
27#include <plat/gpio-core.h>
28
29int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)
30{
31 struct samsung_gpio_chip *chip = samsung_gpiolib_getchip(pin);
32 unsigned long offs = pin - chip->chip.base;
33 unsigned long flags;
34 unsigned long slpcon;
35
36 offs *= 2;
37
38 if (pin < S3C2410_GPB(0))
39 return -EINVAL;
40
41 if (pin >= S3C2410_GPF(0) &&
42 pin <= S3C2410_GPG(16))
43 return -EINVAL;
44
45 if (pin > S3C2410_GPH(16))
46 return -EINVAL;
47
48 local_irq_save(flags);
49
50 slpcon = __raw_readl(chip->base + 0x0C);
51
52 slpcon &= ~(3 << offs);
53 slpcon |= state << offs;
54
55 __raw_writel(slpcon, chip->base + 0x0C);
56
57 local_irq_restore(flags);
58
59 return 0;
60}
61
62EXPORT_SYMBOL(s3c2412_gpio_set_sleepcfg);
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
deleted file mode 100644
index a4d7fd27bec5..000000000000
--- a/arch/arm/mach-s3c2440/Kconfig
+++ /dev/null
@@ -1,37 +0,0 @@
1# Copyright 2007 Simtec Electronics
2#
3# Licensed under GPLv2
4
5config S3C2440_CPUFREQ
6 bool "S3C2440/S3C2442 CPU Frequency scaling support"
7 depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
8 default y
9 select S3C2410_CPUFREQ_UTILS
10 help
11 CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
12
13config S3C2440_XTAL_12000000
14 bool
15 help
16 Indicate that the build needs to support 12MHz system
17 crystal.
18
19config S3C2440_XTAL_16934400
20 bool
21 help
22 Indicate that the build needs to support 16.9344MHz system
23 crystal.
24
25config S3C2440_PLL_12000000
26 bool
27 depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000
28 default y if CPU_FREQ_S3C24XX_PLL
29 help
30 PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals.
31
32config S3C2440_PLL_16934400
33 bool
34 depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400
35 default y if CPU_FREQ_S3C24XX_PLL
36 help
37 PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
deleted file mode 100644
index 0ddd17fa067e..000000000000
--- a/arch/arm/mach-s3c2440/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
1# arch/arm/mach-s3c2440/Makefile
2#
3# Copyright 2007 Simtec Electronics
4#
5# Licensed under GPLv2
6
7obj-y :=
8obj-m :=
9obj-n :=
10obj- :=
11
12obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o
13
14obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o
15obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 25df14a9e268..67df58bdc096 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -127,6 +127,20 @@ config S3C2410_PM
127 127
128if CPU_S3C2410 128if CPU_S3C2410
129 129
130config S3C2410_CPUFREQ
131 bool
132 depends on CPU_FREQ_S3C24XX && CPU_S3C2410
133 select S3C2410_CPUFREQ_UTILS
134 help
135 CPU Frequency scaling support for S3C2410
136
137config S3C2410_PLL
138 bool
139 depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL
140 default y
141 help
142 Select the PLL table for the S3C2410
143
130config S3C24XX_SIMTEC_NOR 144config S3C24XX_SIMTEC_NOR
131 bool 145 bool
132 help 146 help
@@ -266,6 +280,14 @@ config CPU_S3C2412_ONLY
266 !CPU_S3C2443 && CPU_S3C2412 280 !CPU_S3C2443 && CPU_S3C2412
267 default y 281 default y
268 282
283config S3C2412_CPUFREQ
284 bool
285 depends on CPU_FREQ_S3C24XX && CPU_S3C2412
286 default y
287 select S3C2412_IOTIMING
288 help
289 CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
290
269config S3C2412_DMA 291config S3C2412_DMA
270 bool 292 bool
271 help 293 help
@@ -365,11 +387,45 @@ endif # CPU_S3C2416
365 387
366if CPU_S3C2440 388if CPU_S3C2440
367 389
390config S3C2440_CPUFREQ
391 bool "S3C2440/S3C2442 CPU Frequency scaling support"
392 depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
393 default y
394 select S3C2410_CPUFREQ_UTILS
395 help
396 CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
397
368config S3C2440_DMA 398config S3C2440_DMA
369 bool 399 bool
370 help 400 help
371 Support for S3C2440 specific DMA code5A 401 Support for S3C2440 specific DMA code5A
372 402
403config S3C2440_XTAL_12000000
404 bool
405 help
406 Indicate that the build needs to support 12MHz system
407 crystal.
408
409config S3C2440_XTAL_16934400
410 bool
411 help
412 Indicate that the build needs to support 16.9344MHz system
413 crystal.
414
415config S3C2440_PLL_12000000
416 bool
417 depends on S3C2440_CPUFREQ && S3C2440_XTAL_12000000
418 default y if CPU_FREQ_S3C24XX_PLL
419 help
420 PLL tables for S3C2440 or S3C2442 CPUs with 12MHz crystals.
421
422config S3C2440_PLL_16934400
423 bool
424 depends on S3C2440_CPUFREQ && S3C2440_XTAL_16934400
425 default y if CPU_FREQ_S3C24XX_PLL
426 help
427 PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.
428
373comment "S3C2440 Boards" 429comment "S3C2440 Boards"
374 430
375# 431#
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile
index 0ab6ab15da4c..08b87cdb98b7 100644
--- a/arch/arm/mach-s3c24xx/Makefile
+++ b/arch/arm/mach-s3c24xx/Makefile
@@ -17,10 +17,13 @@ obj- :=
17obj-y += common.o 17obj-y += common.o
18 18
19obj-$(CONFIG_CPU_S3C2410) += s3c2410.o 19obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
20obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o
20obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o 21obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o
22obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o
21obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o 23obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o
22 24
23obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o 25obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o
26obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o
24obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o 27obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o
25obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o 28obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o
26obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o 29obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
@@ -31,7 +34,10 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o
31obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o 34obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o
32obj-$(CONFIG_CPU_S3C2442) += s3c2442.o 35obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
33obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o 36obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o
37obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o
34obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o 38obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o
39obj-$(CONFIG_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o
40obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o
35 41
36obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o 42obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o
37 43
diff --git a/arch/arm/mach-s3c2410/cpu-freq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2410.c
index 5404535da1a5..cfa0dd8723ec 100644
--- a/arch/arm/mach-s3c2410/cpu-freq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2410.c
@@ -1,5 +1,4 @@
1/* linux/arch/arm/mach-s3c2410/cpu-freq.c 1/*
2 *
3 * Copyright (c) 2006-2008 Simtec Electronics 2 * Copyright (c) 2006-2008 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -81,7 +80,7 @@ static int s3c2410_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
81 cfg->divs.p_divisor = pdiv; 80 cfg->divs.p_divisor = pdiv;
82 cfg->divs.h_divisor = hdiv; 81 cfg->divs.h_divisor = hdiv;
83 82
84 return 0 ; 83 return 0;
85} 84}
86 85
87static struct s3c_cpufreq_info s3c2410_cpufreq_info = { 86static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
@@ -131,7 +130,6 @@ static int __init s3c2410_cpufreq_init(void)
131{ 130{
132 return subsys_interface_register(&s3c2410_cpufreq_interface); 131 return subsys_interface_register(&s3c2410_cpufreq_interface);
133} 132}
134
135arch_initcall(s3c2410_cpufreq_init); 133arch_initcall(s3c2410_cpufreq_init);
136 134
137static int s3c2410a_cpufreq_add(struct device *dev, 135static int s3c2410a_cpufreq_add(struct device *dev,
@@ -159,5 +157,4 @@ static int __init s3c2410a_cpufreq_init(void)
159{ 157{
160 return subsys_interface_register(&s3c2410a_cpufreq_interface); 158 return subsys_interface_register(&s3c2410a_cpufreq_interface);
161} 159}
162
163arch_initcall(s3c2410a_cpufreq_init); 160arch_initcall(s3c2410a_cpufreq_init);
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c
index 125be7d5fa60..c8f05f309eee 100644
--- a/arch/arm/mach-s3c2412/cpu-freq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c
@@ -1,5 +1,4 @@
1/* linux/arch/arm/mach-s3c2412/cpu-freq.c 1/*
2 *
3 * Copyright 2008 Simtec Electronics 2 * Copyright 2008 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -111,7 +110,7 @@ static int s3c2412_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
111 110
112 return 0; 111 return 0;
113 112
114 invalid: 113invalid:
115 return -EINVAL; 114 return -EINVAL;
116} 115}
117 116
@@ -255,5 +254,4 @@ static int s3c2412_cpufreq_init(void)
255{ 254{
256 return subsys_interface_register(&s3c2412_cpufreq_interface); 255 return subsys_interface_register(&s3c2412_cpufreq_interface);
257} 256}
258
259arch_initcall(s3c2412_cpufreq_init); 257arch_initcall(s3c2412_cpufreq_init);
diff --git a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2440.c
index 61776764d9f4..72b2cc8a5a85 100644
--- a/arch/arm/mach-s3c2440/s3c2440-cpufreq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2440.c
@@ -1,5 +1,4 @@
1/* linux/arch/arm/plat-s3c24xx/s3c2440-cpufreq.c 1/*
2 *
3 * Copyright (c) 2006-2009 Simtec Electronics 2 * Copyright (c) 2006-2009 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -310,5 +309,4 @@ static int s3c2442_cpufreq_init(void)
310{ 309{
311 return subsys_interface_register(&s3c2442_cpufreq_interface); 310 return subsys_interface_register(&s3c2442_cpufreq_interface);
312} 311}
313
314subsys_initcall(s3c2442_cpufreq_init); 312subsys_initcall(s3c2442_cpufreq_init);
diff --git a/arch/arm/mach-s3c24xx/include/mach/hardware.h b/arch/arm/mach-s3c24xx/include/mach/hardware.h
index aef5631eac58..a6cc14a092fc 100644
--- a/arch/arm/mach-s3c24xx/include/mach/hardware.h
+++ b/arch/arm/mach-s3c24xx/include/mach/hardware.h
@@ -23,12 +23,6 @@ extern int s3c2440_set_dsc(unsigned int pin, unsigned int value);
23 23
24#endif /* CONFIG_CPU_S3C2440 */ 24#endif /* CONFIG_CPU_S3C2440 */
25 25
26#ifdef CONFIG_CPU_S3C2412
27
28extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
29
30#endif /* CONFIG_CPU_S3C2412 */
31
32#endif /* __ASSEMBLY__ */ 26#endif /* __ASSEMBLY__ */
33 27
34#include <asm/sizes.h> 28#include <asm/sizes.h>
diff --git a/arch/arm/mach-s3c2410/pll.c b/arch/arm/mach-s3c24xx/pll-s3c2410.c
index e0b3b347da82..dcf3420a3271 100644
--- a/arch/arm/mach-s3c2410/pll.c
+++ b/arch/arm/mach-s3c24xx/pll-s3c2410.c
@@ -1,5 +1,4 @@
1/* arch/arm/mach-s3c2410/pll.c 1/*
2 *
3 * Copyright (c) 2006-2007 Simtec Electronics 2 * Copyright (c) 2006-2007 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -82,7 +81,6 @@ static int __init s3c2410_pll_init(void)
82 return subsys_interface_register(&s3c2410_plls_interface); 81 return subsys_interface_register(&s3c2410_plls_interface);
83 82
84} 83}
85
86arch_initcall(s3c2410_pll_init); 84arch_initcall(s3c2410_pll_init);
87 85
88static struct subsys_interface s3c2410a_plls_interface = { 86static struct subsys_interface s3c2410a_plls_interface = {
@@ -95,5 +93,4 @@ static int __init s3c2410a_pll_init(void)
95{ 93{
96 return subsys_interface_register(&s3c2410a_plls_interface); 94 return subsys_interface_register(&s3c2410a_plls_interface);
97} 95}
98
99arch_initcall(s3c2410a_pll_init); 96arch_initcall(s3c2410a_pll_init);
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c b/arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c
index 551fb433be87..673781758319 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
+++ b/arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c
@@ -1,5 +1,4 @@
1/* arch/arm/mach-s3c2440/s3c2440-pll-12000000.c 1/*
2 *
3 * Copyright (c) 2006-2007 Simtec Electronics 2 * Copyright (c) 2006-2007 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -83,7 +82,6 @@ static int __init s3c2440_pll_12mhz(void)
83 return subsys_interface_register(&s3c2440_plls12_interface); 82 return subsys_interface_register(&s3c2440_plls12_interface);
84 83
85} 84}
86
87arch_initcall(s3c2440_pll_12mhz); 85arch_initcall(s3c2440_pll_12mhz);
88 86
89static struct subsys_interface s3c2442_plls12_interface = { 87static struct subsys_interface s3c2442_plls12_interface = {
@@ -97,5 +95,4 @@ static int __init s3c2442_pll_12mhz(void)
97 return subsys_interface_register(&s3c2442_plls12_interface); 95 return subsys_interface_register(&s3c2442_plls12_interface);
98 96
99} 97}
100
101arch_initcall(s3c2442_pll_12mhz); 98arch_initcall(s3c2442_pll_12mhz);
diff --git a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c
index 3f15bcf64290..debfa106289b 100644
--- a/arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
+++ b/arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c
@@ -1,5 +1,4 @@
1/* arch/arm/mach-s3c2440/s3c2440-pll-16934400.c 1/*
2 *
3 * Copyright (c) 2006-2008 Simtec Electronics 2 * Copyright (c) 2006-2008 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -111,7 +110,6 @@ static int __init s3c2440_pll_16934400(void)
111{ 110{
112 return subsys_interface_register(&s3c2440_plls169344_interface); 111 return subsys_interface_register(&s3c2440_plls169344_interface);
113} 112}
114
115arch_initcall(s3c2440_pll_16934400); 113arch_initcall(s3c2440_pll_16934400);
116 114
117static struct subsys_interface s3c2442_plls169344_interface = { 115static struct subsys_interface s3c2442_plls169344_interface = {
@@ -124,5 +122,4 @@ static int __init s3c2442_pll_16934400(void)
124{ 122{
125 return subsys_interface_register(&s3c2442_plls169344_interface); 123 return subsys_interface_register(&s3c2442_plls169344_interface);
126} 124}
127
128arch_initcall(s3c2442_pll_16934400); 125arch_initcall(s3c2442_pll_16934400);
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-16 20:18:10 -0400