diff options
author | Romain Naour <romain.naour@openwide.fr> | 2013-01-09 21:47:03 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-05 06:15:55 -0500 |
commit | c1fcd403ced3ad0d63418cc1120e1562283b16ce (patch) | |
tree | 18c8e636319516ee51c29c580293c849eaea13a2 /arch/arm/mach-s5pv210 | |
parent | 7488335dcf382574c47fb27fcbad3f04a9841db6 (diff) |
ARM: SAMSUNG: Rename s5p-time to samsung-time
Signed-off-by: Naour Romain <romain.naour@openwide.fr>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-torbreck.c | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 92ad72f0ef98..0963283a7c5d 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -12,10 +12,10 @@ if ARCH_S5PV210 | |||
12 | config CPU_S5PV210 | 12 | config CPU_S5PV210 |
13 | bool | 13 | bool |
14 | select S5P_EXT_INT | 14 | select S5P_EXT_INT |
15 | select S5P_HRT | ||
16 | select S5P_PM if PM | 15 | select S5P_PM if PM |
17 | select S5P_SLEEP if PM | 16 | select S5P_SLEEP if PM |
18 | select SAMSUNG_DMADEV | 17 | select SAMSUNG_DMADEV |
18 | select SAMSUNG_HRT | ||
19 | help | 19 | help |
20 | Enable S5PV210 CPU support | 20 | Enable S5PV210 CPU support |
21 | 21 | ||
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 11900a8e88a3..ed2b85485b9d 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <plat/fb.h> | 38 | #include <plat/fb.h> |
39 | #include <plat/fimc-core.h> | 39 | #include <plat/fimc-core.h> |
40 | #include <plat/sdhci.h> | 40 | #include <plat/sdhci.h> |
41 | #include <plat/s5p-time.h> | 41 | #include <plat/samsung-time.h> |
42 | 42 | ||
43 | #include "common.h" | 43 | #include "common.h" |
44 | 44 | ||
@@ -651,7 +651,7 @@ static void __init aquila_map_io(void) | |||
651 | s5pv210_init_io(NULL, 0); | 651 | s5pv210_init_io(NULL, 0); |
652 | s3c24xx_init_clocks(24000000); | 652 | s3c24xx_init_clocks(24000000); |
653 | s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); | 653 | s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs)); |
654 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 654 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
655 | } | 655 | } |
656 | 656 | ||
657 | static void __init aquila_machine_init(void) | 657 | static void __init aquila_machine_init(void) |
@@ -686,6 +686,6 @@ MACHINE_START(AQUILA, "Aquila") | |||
686 | .init_irq = s5pv210_init_irq, | 686 | .init_irq = s5pv210_init_irq, |
687 | .map_io = aquila_map_io, | 687 | .map_io = aquila_map_io, |
688 | .init_machine = aquila_machine_init, | 688 | .init_machine = aquila_machine_init, |
689 | .init_time = s5p_timer_init, | 689 | .init_time = samsung_timer_init, |
690 | .restart = s5pv210_restart, | 690 | .restart = s5pv210_restart, |
691 | MACHINE_END | 691 | MACHINE_END |
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 3a38f7b34b94..256439448364 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <plat/keypad.h> | 47 | #include <plat/keypad.h> |
48 | #include <plat/sdhci.h> | 48 | #include <plat/sdhci.h> |
49 | #include <plat/clock.h> | 49 | #include <plat/clock.h> |
50 | #include <plat/s5p-time.h> | 50 | #include <plat/samsung-time.h> |
51 | #include <plat/mfc.h> | 51 | #include <plat/mfc.h> |
52 | #include <plat/camport.h> | 52 | #include <plat/camport.h> |
53 | 53 | ||
@@ -908,7 +908,7 @@ static void __init goni_map_io(void) | |||
908 | s5pv210_init_io(NULL, 0); | 908 | s5pv210_init_io(NULL, 0); |
909 | s3c24xx_init_clocks(clk_xusbxti.rate); | 909 | s3c24xx_init_clocks(clk_xusbxti.rate); |
910 | s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); | 910 | s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs)); |
911 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 911 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
912 | } | 912 | } |
913 | 913 | ||
914 | static void __init goni_reserve(void) | 914 | static void __init goni_reserve(void) |
@@ -973,7 +973,7 @@ MACHINE_START(GONI, "GONI") | |||
973 | .init_irq = s5pv210_init_irq, | 973 | .init_irq = s5pv210_init_irq, |
974 | .map_io = goni_map_io, | 974 | .map_io = goni_map_io, |
975 | .init_machine = goni_machine_init, | 975 | .init_machine = goni_machine_init, |
976 | .init_time = s5p_timer_init, | 976 | .init_time = samsung_timer_init, |
977 | .reserve = &goni_reserve, | 977 | .reserve = &goni_reserve, |
978 | .restart = s5pv210_restart, | 978 | .restart = s5pv210_restart, |
979 | MACHINE_END | 979 | MACHINE_END |
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index 28bd0248a3e2..7c0ed07a78a3 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/platform_data/ata-samsung_cf.h> | 29 | #include <linux/platform_data/ata-samsung_cf.h> |
30 | #include <linux/platform_data/i2c-s3c2410.h> | 30 | #include <linux/platform_data/i2c-s3c2410.h> |
31 | #include <plat/pm.h> | 31 | #include <plat/pm.h> |
32 | #include <plat/s5p-time.h> | 32 | #include <plat/samsung-time.h> |
33 | #include <plat/mfc.h> | 33 | #include <plat/mfc.h> |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
@@ -120,7 +120,7 @@ static void __init smdkc110_map_io(void) | |||
120 | s5pv210_init_io(NULL, 0); | 120 | s5pv210_init_io(NULL, 0); |
121 | s3c24xx_init_clocks(24000000); | 121 | s3c24xx_init_clocks(24000000); |
122 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | 122 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); |
123 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 123 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
124 | } | 124 | } |
125 | 125 | ||
126 | static void __init smdkc110_reserve(void) | 126 | static void __init smdkc110_reserve(void) |
@@ -153,7 +153,7 @@ MACHINE_START(SMDKC110, "SMDKC110") | |||
153 | .init_irq = s5pv210_init_irq, | 153 | .init_irq = s5pv210_init_irq, |
154 | .map_io = smdkc110_map_io, | 154 | .map_io = smdkc110_map_io, |
155 | .init_machine = smdkc110_machine_init, | 155 | .init_machine = smdkc110_machine_init, |
156 | .init_time = s5p_timer_init, | 156 | .init_time = samsung_timer_init, |
157 | .restart = s5pv210_restart, | 157 | .restart = s5pv210_restart, |
158 | .reserve = &smdkc110_reserve, | 158 | .reserve = &smdkc110_reserve, |
159 | MACHINE_END | 159 | MACHINE_END |
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 3c73f36869bb..d50b6f124465 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <plat/keypad.h> | 44 | #include <plat/keypad.h> |
45 | #include <plat/pm.h> | 45 | #include <plat/pm.h> |
46 | #include <plat/fb.h> | 46 | #include <plat/fb.h> |
47 | #include <plat/s5p-time.h> | 47 | #include <plat/samsung-time.h> |
48 | #include <plat/backlight.h> | 48 | #include <plat/backlight.h> |
49 | #include <plat/mfc.h> | 49 | #include <plat/mfc.h> |
50 | #include <plat/clock.h> | 50 | #include <plat/clock.h> |
@@ -285,7 +285,7 @@ static void __init smdkv210_map_io(void) | |||
285 | s5pv210_init_io(NULL, 0); | 285 | s5pv210_init_io(NULL, 0); |
286 | s3c24xx_init_clocks(clk_xusbxti.rate); | 286 | s3c24xx_init_clocks(clk_xusbxti.rate); |
287 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | 287 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); |
288 | s5p_set_timer_source(S5P_PWM2, S5P_PWM4); | 288 | samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4); |
289 | } | 289 | } |
290 | 290 | ||
291 | static void __init smdkv210_reserve(void) | 291 | static void __init smdkv210_reserve(void) |
@@ -329,7 +329,7 @@ MACHINE_START(SMDKV210, "SMDKV210") | |||
329 | .init_irq = s5pv210_init_irq, | 329 | .init_irq = s5pv210_init_irq, |
330 | .map_io = smdkv210_map_io, | 330 | .map_io = smdkv210_map_io, |
331 | .init_machine = smdkv210_machine_init, | 331 | .init_machine = smdkv210_machine_init, |
332 | .init_time = s5p_timer_init, | 332 | .init_time = samsung_timer_init, |
333 | .restart = s5pv210_restart, | 333 | .restart = s5pv210_restart, |
334 | .reserve = &smdkv210_reserve, | 334 | .reserve = &smdkv210_reserve, |
335 | MACHINE_END | 335 | MACHINE_END |
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c index 2d4c5531819c..579afe89842a 100644 --- a/arch/arm/mach-s5pv210/mach-torbreck.c +++ b/arch/arm/mach-s5pv210/mach-torbreck.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <plat/devs.h> | 26 | #include <plat/devs.h> |
27 | #include <plat/cpu.h> | 27 | #include <plat/cpu.h> |
28 | #include <linux/platform_data/i2c-s3c2410.h> | 28 | #include <linux/platform_data/i2c-s3c2410.h> |
29 | #include <plat/s5p-time.h> | 29 | #include <plat/samsung-time.h> |
30 | 30 | ||
31 | #include "common.h" | 31 | #include "common.h" |
32 | 32 | ||
@@ -106,7 +106,7 @@ static void __init torbreck_map_io(void) | |||
106 | s5pv210_init_io(NULL, 0); | 106 | s5pv210_init_io(NULL, 0); |
107 | s3c24xx_init_clocks(24000000); | 107 | s3c24xx_init_clocks(24000000); |
108 | s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs)); | 108 | s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs)); |
109 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 109 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
110 | } | 110 | } |
111 | 111 | ||
112 | static void __init torbreck_machine_init(void) | 112 | static void __init torbreck_machine_init(void) |
@@ -130,6 +130,6 @@ MACHINE_START(TORBRECK, "TORBRECK") | |||
130 | .init_irq = s5pv210_init_irq, | 130 | .init_irq = s5pv210_init_irq, |
131 | .map_io = torbreck_map_io, | 131 | .map_io = torbreck_map_io, |
132 | .init_machine = torbreck_machine_init, | 132 | .init_machine = torbreck_machine_init, |
133 | .init_time = s5p_timer_init, | 133 | .init_time = samsung_timer_init, |
134 | .restart = s5pv210_restart, | 134 | .restart = s5pv210_restart, |
135 | MACHINE_END | 135 | MACHINE_END |