Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 7f78b6eb 编写于 作者: R Romain Naour 提交者： Kukjin Kim
浏览文件
操作

ARM: S3C24XX: Add samsung-time support for s3c24xx 

Signed-off-by: NNaour Romain <romain.naour@openwide.fr>
Reviewed-by: NTomasz Figa <tomasz.figa@gmail.com>
[heiko@sntech.de: tested on a s3c2416 based machine]
Reviewed-and-Tested-by: NHeiko Stuebner <heiko@sntech.de>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 c1fcd403
隐藏空白更改
内联 并排
Showing with 100 addition and 35 deletion
arch/arm/Kconfig
浏览文件 @ 7f78b6eb
...@@ -770,8 +770,10 @@ config ARCH_SA1100 ...@@ -770,8 +770,10 @@ config ARCH_SA1100
config ARCH_S3C24XX config ARCH_S3C24XX
bool "Samsung S3C24XX SoCs" bool "Samsung S3C24XX SoCs"
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARCH_USES_GETTIMEOFFSET
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select GENERIC_GPIO
select HAVE_CLK select HAVE_CLK
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C2410_WATCHDOG if WATCHDOG
......
arch/arm/mach-s3c24xx/Kconfig
浏览文件 @ 7f78b6eb
...@@ -30,6 +30,7 @@ config CPU_S3C2410 ...@@ -30,6 +30,7 @@ config CPU_S3C2410
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
select S3C2410_PM if PM select S3C2410_PM if PM
select SAMSUNG_HRT
help help
Support for S3C2410 and S3C2410A family from the S3C24XX line Support for S3C2410 and S3C2410A family from the S3C24XX line
of Samsung Mobile CPUs. of Samsung Mobile CPUs.
...@@ -41,6 +42,7 @@ config CPU_S3C2412 ...@@ -41,6 +42,7 @@ config CPU_S3C2412
select CPU_LLSERIAL_S3C2440 select CPU_LLSERIAL_S3C2440
select S3C2412_DMA if S3C24XX_DMA select S3C2412_DMA if S3C24XX_DMA
select S3C2412_PM if PM select S3C2412_PM if PM
select SAMSUNG_HRT
help help
Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
...@@ -53,6 +55,7 @@ config CPU_S3C2416 ...@@ -53,6 +55,7 @@ config CPU_S3C2416
select S3C2443_COMMON select S3C2443_COMMON
select S3C2443_DMA if S3C24XX_DMA select S3C2443_DMA if S3C24XX_DMA
select SAMSUNG_CLKSRC select SAMSUNG_CLKSRC
select SAMSUNG_HRT
help help
Support for the S3C2416 SoC from the S3C24XX line Support for the S3C2416 SoC from the S3C24XX line
...@@ -63,6 +66,7 @@ config CPU_S3C2440 ...@@ -63,6 +66,7 @@ config CPU_S3C2440
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM if PM select S3C2410_PM if PM
select S3C2440_DMA if S3C24XX_DMA select S3C2440_DMA if S3C24XX_DMA
select SAMSUNG_HRT
help help
Support for S3C2440 Samsung Mobile CPU based systems. Support for S3C2440 Samsung Mobile CPU based systems.
...@@ -72,6 +76,7 @@ config CPU_S3C2442 ...@@ -72,6 +76,7 @@ config CPU_S3C2442
select CPU_LLSERIAL_S3C2440 select CPU_LLSERIAL_S3C2440
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM if PM select S3C2410_PM if PM
select SAMSUNG_HRT
help help
Support for S3C2442 Samsung Mobile CPU based systems. Support for S3C2442 Samsung Mobile CPU based systems.
...@@ -87,6 +92,7 @@ config CPU_S3C2443 ...@@ -87,6 +92,7 @@ config CPU_S3C2443
select S3C2443_COMMON select S3C2443_COMMON
select S3C2443_DMA if S3C24XX_DMA select S3C2443_DMA if S3C24XX_DMA
select SAMSUNG_CLKSRC select SAMSUNG_CLKSRC
select SAMSUNG_HRT
help help
Support for the S3C2443 SoC from the S3C24XX line Support for the S3C2443 SoC from the S3C24XX line
......
arch/arm/mach-s3c24xx/mach-amlm5900.c
浏览文件 @ 7f78b6eb
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
static struct resource amlm5900_nor_resource = static struct resource amlm5900_nor_resource =
...@@ -160,6 +162,7 @@ static void __init amlm5900_map_io(void) ...@@ -160,6 +162,7 @@ static void __init amlm5900_map_io(void)
s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc)); s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs)); s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
#ifdef CONFIG_FB_S3C2410 #ifdef CONFIG_FB_S3C2410
...@@ -237,6 +240,6 @@ MACHINE_START(AML_M5900, "AML_M5900") ...@@ -237,6 +240,6 @@ MACHINE_START(AML_M5900, "AML_M5900")
.map_io = amlm5900_map_io, .map_io = amlm5900_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = amlm5900_init, .init_machine = amlm5900_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-anubis.c
浏览文件 @ 7f78b6eb
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <linux/platform_data/asoc-s3c24xx_simtec.h> #include <linux/platform_data/asoc-s3c24xx_simtec.h>
#include <plat/samsung-time.h>
#include "anubis.h" #include "anubis.h"
#include "common.h" #include "common.h"
...@@ -410,6 +411,7 @@ static void __init anubis_map_io(void) ...@@ -410,6 +411,7 @@ static void __init anubis_map_io(void)
s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc)); s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs)); s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
/* check for the newer revision boards with large page nand */ /* check for the newer revision boards with large page nand */
...@@ -444,6 +446,6 @@ MACHINE_START(ANUBIS, "Simtec-Anubis") ...@@ -444,6 +446,6 @@ MACHINE_START(ANUBIS, "Simtec-Anubis")
.map_io = anubis_map_io, .map_io = anubis_map_io,
.init_machine = anubis_init, .init_machine = anubis_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-at2440evb.c
浏览文件 @ 7f78b6eb
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <linux/platform_data/mmc-s3cmci.h> #include <linux/platform_data/mmc-s3cmci.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
...@@ -192,6 +193,7 @@ static void __init at2440evb_map_io(void) ...@@ -192,6 +193,7 @@ static void __init at2440evb_map_io(void)
s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc)); s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));
s3c24xx_init_clocks(16934400); s3c24xx_init_clocks(16934400);
s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs)); s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init at2440evb_init(void) static void __init at2440evb_init(void)
...@@ -210,6 +212,6 @@ MACHINE_START(AT2440EVB, "AT2440EVB") ...@@ -210,6 +212,6 @@ MACHINE_START(AT2440EVB, "AT2440EVB")
.map_io = at2440evb_map_io, .map_io = at2440evb_map_io,
.init_machine = at2440evb_init, .init_machine = at2440evb_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-bast.c
浏览文件 @ 7f78b6eb
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "bast.h" #include "bast.h"
#include "common.h" #include "common.h"
...@@ -576,6 +577,7 @@ static void __init bast_map_io(void) ...@@ -576,6 +577,7 @@ static void __init bast_map_io(void)
s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs)); s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init bast_init(void) static void __init bast_init(void)
...@@ -605,6 +607,6 @@ MACHINE_START(BAST, "Simtec-BAST") ...@@ -605,6 +607,6 @@ MACHINE_START(BAST, "Simtec-BAST")
.map_io = bast_map_io, .map_io = bast_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = bast_init, .init_machine = bast_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-gta02.c
浏览文件 @ 7f78b6eb
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "gta02.h" #include "gta02.h"
...@@ -501,6 +502,7 @@ static void __init gta02_map_io(void) ...@@ -501,6 +502,7 @@ static void __init gta02_map_io(void)
s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc)); s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs)); s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
...@@ -589,6 +591,6 @@ MACHINE_START(NEO1973_GTA02, "GTA02") ...@@ -589,6 +591,6 @@ MACHINE_START(NEO1973_GTA02, "GTA02")
.map_io = gta02_map_io, .map_io = gta02_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = gta02_machine_init, .init_machine = gta02_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-h1940.c
浏览文件 @ 7f78b6eb
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#include <plat/pll.h> #include <plat/pll.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "h1940.h" #include "h1940.h"
...@@ -646,6 +646,7 @@ static void __init h1940_map_io(void) ...@@ -646,6 +646,7 @@ static void __init h1940_map_io(void)
s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc)); s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs)); s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
/* setup PM */ /* setup PM */
...@@ -741,6 +742,6 @@ MACHINE_START(H1940, "IPAQ-H1940") ...@@ -741,6 +742,6 @@ MACHINE_START(H1940, "IPAQ-H1940")
.reserve = h1940_reserve, .reserve = h1940_reserve,
.init_irq = h1940_init_irq, .init_irq = h1940_init_irq,
.init_machine = h1940_init, .init_machine = h1940_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-jive.c
浏览文件 @ 7f78b6eb
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-s3c2410_udc.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "s3c2412-power.h" #include "s3c2412-power.h"
...@@ -506,6 +507,7 @@ static void __init jive_map_io(void) ...@@ -506,6 +507,7 @@ static void __init jive_map_io(void)
s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc)); s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs)); s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void jive_power_off(void) static void jive_power_off(void)
...@@ -661,6 +663,6 @@ MACHINE_START(JIVE, "JIVE") ...@@ -661,6 +663,6 @@ MACHINE_START(JIVE, "JIVE")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = jive_map_io, .map_io = jive_map_io,
.init_machine = jive_machine_init, .init_machine = jive_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2412_restart, .restart = s3c2412_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-mini2440.c
浏览文件 @ 7f78b6eb
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include <sound/s3c24xx_uda134x.h> #include <sound/s3c24xx_uda134x.h>
...@@ -525,6 +526,7 @@ static void __init mini2440_map_io(void) ...@@ -525,6 +526,7 @@ static void __init mini2440_map_io(void)
s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc)); s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs)); s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
/* /*
...@@ -687,6 +689,6 @@ MACHINE_START(MINI2440, "MINI2440") ...@@ -687,6 +689,6 @@ MACHINE_START(MINI2440, "MINI2440")
.map_io = mini2440_map_io, .map_io = mini2440_map_io,
.init_machine = mini2440_init, .init_machine = mini2440_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-n30.c
浏览文件 @ 7f78b6eb
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <linux/platform_data/mmc-s3cmci.h> #include <linux/platform_data/mmc-s3cmci.h>
#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-s3c2410_udc.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
...@@ -535,6 +536,7 @@ static void __init n30_map_io(void) ...@@ -535,6 +536,7 @@ static void __init n30_map_io(void)
n30_hwinit(); n30_hwinit();
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
/* GPB3 is the line that controls the pull-up for the USB D+ line */ /* GPB3 is the line that controls the pull-up for the USB D+ line */
...@@ -588,7 +590,7 @@ MACHINE_START(N30, "Acer-N30") ...@@ -588,7 +590,7 @@ MACHINE_START(N30, "Acer-N30")
Ben Dooks <ben-linux@fluff.org> Ben Dooks <ben-linux@fluff.org>
*/ */
.atag_offset = 0x100, .atag_offset = 0x100,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.init_machine = n30_init, .init_machine = n30_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = n30_map_io, .map_io = n30_map_io,
...@@ -599,7 +601,7 @@ MACHINE_START(N35, "Acer-N35") ...@@ -599,7 +601,7 @@ MACHINE_START(N35, "Acer-N35")
/* Maintainer: Christer Weinigel <christer@weinigel.se> /* Maintainer: Christer Weinigel <christer@weinigel.se>
*/ */
.atag_offset = 0x100, .atag_offset = 0x100,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.init_machine = n30_init, .init_machine = n30_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = n30_map_io, .map_io = n30_map_io,
......
arch/arm/mach-s3c24xx/mach-nexcoder.c
浏览文件 @ 7f78b6eb
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
...@@ -135,6 +136,7 @@ static void __init nexcoder_map_io(void) ...@@ -135,6 +136,7 @@ static void __init nexcoder_map_io(void)
s3c24xx_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc)); s3c24xx_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs)); s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
nexcoder_sensorboard_init(); nexcoder_sensorboard_init();
} }
...@@ -151,6 +153,6 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") ...@@ -151,6 +153,6 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
.map_io = nexcoder_map_io, .map_io = nexcoder_map_io,
.init_machine = nexcoder_init, .init_machine = nexcoder_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-osiris.c
浏览文件 @ 7f78b6eb
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
...@@ -384,6 +385,7 @@ static void __init osiris_map_io(void) ...@@ -384,6 +385,7 @@ static void __init osiris_map_io(void)
s3c24xx_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc)); s3c24xx_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(osiris_uartcfgs, ARRAY_SIZE(osiris_uartcfgs)); s3c24xx_init_uarts(osiris_uartcfgs, ARRAY_SIZE(osiris_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
/* check for the newer revision boards with large page nand */ /* check for the newer revision boards with large page nand */
...@@ -426,6 +428,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") ...@@ -426,6 +428,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
.map_io = osiris_map_io, .map_io = osiris_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = osiris_init, .init_machine = osiris_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-otom.c
浏览文件 @ 7f78b6eb
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "otom.h" #include "otom.h"
...@@ -101,6 +102,7 @@ static void __init otom11_map_io(void) ...@@ -101,6 +102,7 @@ static void __init otom11_map_io(void)
s3c24xx_init_io(otom11_iodesc, ARRAY_SIZE(otom11_iodesc)); s3c24xx_init_io(otom11_iodesc, ARRAY_SIZE(otom11_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(otom11_uartcfgs, ARRAY_SIZE(otom11_uartcfgs)); s3c24xx_init_uarts(otom11_uartcfgs, ARRAY_SIZE(otom11_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init otom11_init(void) static void __init otom11_init(void)
...@@ -115,6 +117,6 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1") ...@@ -115,6 +117,6 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
.map_io = otom11_map_io, .map_io = otom11_map_io,
.init_machine = otom11_init, .init_machine = otom11_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-qt2410.c
浏览文件 @ 7f78b6eb
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "common-smdk.h" #include "common-smdk.h"
...@@ -304,6 +305,7 @@ static void __init qt2410_map_io(void) ...@@ -304,6 +305,7 @@ static void __init qt2410_map_io(void)
s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc)); s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc));
s3c24xx_init_clocks(12*1000*1000); s3c24xx_init_clocks(12*1000*1000);
s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs)); s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init qt2410_machine_init(void) static void __init qt2410_machine_init(void)
...@@ -343,6 +345,6 @@ MACHINE_START(QT2410, "QT2410") ...@@ -343,6 +345,6 @@ MACHINE_START(QT2410, "QT2410")
.map_io = qt2410_map_io, .map_io = qt2410_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = qt2410_machine_init, .init_machine = qt2410_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-rx1950.c
浏览文件 @ 7f78b6eb
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/regs-iic.h> #include <plat/regs-iic.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "h1940.h" #include "h1940.h"
...@@ -741,6 +742,7 @@ static void __init rx1950_map_io(void) ...@@ -741,6 +742,7 @@ static void __init rx1950_map_io(void)
s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc));
s3c24xx_init_clocks(16934000); s3c24xx_init_clocks(16934000);
s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
/* setup PM */ /* setup PM */
...@@ -813,6 +815,6 @@ MACHINE_START(RX1950, "HP iPAQ RX1950") ...@@ -813,6 +815,6 @@ MACHINE_START(RX1950, "HP iPAQ RX1950")
.reserve = rx1950_reserve, .reserve = rx1950_reserve,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = rx1950_init_machine, .init_machine = rx1950_init_machine,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-rx3715.c
浏览文件 @ 7f78b6eb
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/pm.h> #include <plat/pm.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "h1940.h" #include "h1940.h"
...@@ -179,6 +180,7 @@ static void __init rx3715_map_io(void) ...@@ -179,6 +180,7 @@ static void __init rx3715_map_io(void)
s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc)); s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc));
s3c24xx_init_clocks(16934000); s3c24xx_init_clocks(16934000);
s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs)); s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
/* H1940 and RX3715 need to reserve this for suspend */ /* H1940 and RX3715 need to reserve this for suspend */
...@@ -212,6 +214,6 @@ MACHINE_START(RX3715, "IPAQ-RX3715") ...@@ -212,6 +214,6 @@ MACHINE_START(RX3715, "IPAQ-RX3715")
.reserve = rx3715_reserve, .reserve = rx3715_reserve,
.init_irq = rx3715_init_irq, .init_irq = rx3715_init_irq,
.init_machine = rx3715_init_machine, .init_machine = rx3715_init_machine,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-smdk2410.c
浏览文件 @ 7f78b6eb
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "common-smdk.h" #include "common-smdk.h"
...@@ -100,6 +101,7 @@ static void __init smdk2410_map_io(void) ...@@ -100,6 +101,7 @@ static void __init smdk2410_map_io(void)
s3c24xx_init_io(smdk2410_iodesc, ARRAY_SIZE(smdk2410_iodesc)); s3c24xx_init_io(smdk2410_iodesc, ARRAY_SIZE(smdk2410_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs)); s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init smdk2410_init(void) static void __init smdk2410_init(void)
...@@ -116,6 +118,6 @@ MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc ...@@ -116,6 +118,6 @@ MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc
.map_io = smdk2410_map_io, .map_io = smdk2410_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = smdk2410_init, .init_machine = smdk2410_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-smdk2413.c
浏览文件 @ 7f78b6eb
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "common-smdk.h" #include "common-smdk.h"
...@@ -105,6 +106,7 @@ static void __init smdk2413_map_io(void) ...@@ -105,6 +106,7 @@ static void __init smdk2413_map_io(void)
s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc)); s3c24xx_init_io(smdk2413_iodesc, ARRAY_SIZE(smdk2413_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs)); s3c24xx_init_uarts(smdk2413_uartcfgs, ARRAY_SIZE(smdk2413_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init smdk2413_machine_init(void) static void __init smdk2413_machine_init(void)
...@@ -131,7 +133,7 @@ MACHINE_START(S3C2413, "S3C2413") ...@@ -131,7 +133,7 @@ MACHINE_START(S3C2413, "S3C2413")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = smdk2413_map_io, .map_io = smdk2413_map_io,
.init_machine = smdk2413_machine_init, .init_machine = smdk2413_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2412_restart, .restart = s3c2412_restart,
MACHINE_END MACHINE_END
...@@ -143,7 +145,7 @@ MACHINE_START(SMDK2412, "SMDK2412") ...@@ -143,7 +145,7 @@ MACHINE_START(SMDK2412, "SMDK2412")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = smdk2413_map_io, .map_io = smdk2413_map_io,
.init_machine = smdk2413_machine_init, .init_machine = smdk2413_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2412_restart, .restart = s3c2412_restart,
MACHINE_END MACHINE_END
...@@ -155,6 +157,6 @@ MACHINE_START(SMDK2413, "SMDK2413") ...@@ -155,6 +157,6 @@ MACHINE_START(SMDK2413, "SMDK2413")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = smdk2413_map_io, .map_io = smdk2413_map_io,
.init_machine = smdk2413_machine_init, .init_machine = smdk2413_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2412_restart, .restart = s3c2412_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-smdk2416.c
浏览文件 @ 7f78b6eb
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <plat/sdhci.h> #include <plat/sdhci.h>
#include <linux/platform_data/usb-s3c2410_udc.h> #include <linux/platform_data/usb-s3c2410_udc.h>
#include <linux/platform_data/s3c-hsudc.h> #include <linux/platform_data/s3c-hsudc.h>
#include <plat/samsung-time.h>
#include <plat/fb.h> #include <plat/fb.h>
...@@ -221,6 +222,7 @@ static void __init smdk2416_map_io(void) ...@@ -221,6 +222,7 @@ static void __init smdk2416_map_io(void)
s3c24xx_init_io(smdk2416_iodesc, ARRAY_SIZE(smdk2416_iodesc)); s3c24xx_init_io(smdk2416_iodesc, ARRAY_SIZE(smdk2416_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(smdk2416_uartcfgs, ARRAY_SIZE(smdk2416_uartcfgs)); s3c24xx_init_uarts(smdk2416_uartcfgs, ARRAY_SIZE(smdk2416_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init smdk2416_machine_init(void) static void __init smdk2416_machine_init(void)
...@@ -253,6 +255,6 @@ MACHINE_START(SMDK2416, "SMDK2416") ...@@ -253,6 +255,6 @@ MACHINE_START(SMDK2416, "SMDK2416")
.init_irq = s3c2416_init_irq, .init_irq = s3c2416_init_irq,
.map_io = smdk2416_map_io, .map_io = smdk2416_map_io,
.init_machine = smdk2416_machine_init, .init_machine = smdk2416_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2416_restart, .restart = s3c2416_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-smdk2440.c
浏览文件 @ 7f78b6eb
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "common-smdk.h" #include "common-smdk.h"
...@@ -160,6 +161,7 @@ static void __init smdk2440_map_io(void) ...@@ -160,6 +161,7 @@ static void __init smdk2440_map_io(void)
s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc)); s3c24xx_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc));
s3c24xx_init_clocks(16934400); s3c24xx_init_clocks(16934400);
s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs)); s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init smdk2440_machine_init(void) static void __init smdk2440_machine_init(void)
...@@ -178,6 +180,6 @@ MACHINE_START(S3C2440, "SMDK2440") ...@@ -178,6 +180,6 @@ MACHINE_START(S3C2440, "SMDK2440")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = smdk2440_map_io, .map_io = smdk2440_map_io,
.init_machine = smdk2440_machine_init, .init_machine = smdk2440_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c244x_restart, .restart = s3c244x_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-smdk2443.c
浏览文件 @ 7f78b6eb
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
#include "common-smdk.h" #include "common-smdk.h"
...@@ -121,6 +122,7 @@ static void __init smdk2443_map_io(void) ...@@ -121,6 +122,7 @@ static void __init smdk2443_map_io(void)
s3c24xx_init_io(smdk2443_iodesc, ARRAY_SIZE(smdk2443_iodesc)); s3c24xx_init_io(smdk2443_iodesc, ARRAY_SIZE(smdk2443_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(smdk2443_uartcfgs, ARRAY_SIZE(smdk2443_uartcfgs)); s3c24xx_init_uarts(smdk2443_uartcfgs, ARRAY_SIZE(smdk2443_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init smdk2443_machine_init(void) static void __init smdk2443_machine_init(void)
...@@ -142,6 +144,6 @@ MACHINE_START(SMDK2443, "SMDK2443") ...@@ -142,6 +144,6 @@ MACHINE_START(SMDK2443, "SMDK2443")
.init_irq = s3c2443_init_irq, .init_irq = s3c2443_init_irq,
.map_io = smdk2443_map_io, .map_io = smdk2443_map_io,
.init_machine = smdk2443_machine_init, .init_machine = smdk2443_machine_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2443_restart, .restart = s3c2443_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-tct_hammer.c
浏览文件 @ 7f78b6eb
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
...@@ -136,6 +137,7 @@ static void __init tct_hammer_map_io(void) ...@@ -136,6 +137,7 @@ static void __init tct_hammer_map_io(void)
s3c24xx_init_io(tct_hammer_iodesc, ARRAY_SIZE(tct_hammer_iodesc)); s3c24xx_init_io(tct_hammer_iodesc, ARRAY_SIZE(tct_hammer_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(tct_hammer_uartcfgs, ARRAY_SIZE(tct_hammer_uartcfgs)); s3c24xx_init_uarts(tct_hammer_uartcfgs, ARRAY_SIZE(tct_hammer_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init tct_hammer_init(void) static void __init tct_hammer_init(void)
...@@ -149,6 +151,6 @@ MACHINE_START(TCT_HAMMER, "TCT_HAMMER") ...@@ -149,6 +151,6 @@ MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
.map_io = tct_hammer_map_io, .map_io = tct_hammer_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = tct_hammer_init, .init_machine = tct_hammer_init,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-vr1000.c
浏览文件 @ 7f78b6eb
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/samsung-time.h>
#include "bast.h" #include "bast.h"
#include "common.h" #include "common.h"
...@@ -332,6 +333,7 @@ static void __init vr1000_map_io(void) ...@@ -332,6 +333,7 @@ static void __init vr1000_map_io(void)
s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc)); s3c24xx_init_io(vr1000_iodesc, ARRAY_SIZE(vr1000_iodesc));
s3c24xx_init_clocks(0); s3c24xx_init_clocks(0);
s3c24xx_init_uarts(vr1000_uartcfgs, ARRAY_SIZE(vr1000_uartcfgs)); s3c24xx_init_uarts(vr1000_uartcfgs, ARRAY_SIZE(vr1000_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init vr1000_init(void) static void __init vr1000_init(void)
...@@ -354,6 +356,6 @@ MACHINE_START(VR1000, "Thorcom-VR1000") ...@@ -354,6 +356,6 @@ MACHINE_START(VR1000, "Thorcom-VR1000")
.map_io = vr1000_map_io, .map_io = vr1000_map_io,
.init_machine = vr1000_init, .init_machine = vr1000_init,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2410_restart, .restart = s3c2410_restart,
MACHINE_END MACHINE_END
arch/arm/mach-s3c24xx/mach-vstms.c
浏览文件 @ 7f78b6eb
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/samsung-time.h>
#include "common.h" #include "common.h"
...@@ -142,6 +143,7 @@ static void __init vstms_map_io(void) ...@@ -142,6 +143,7 @@ static void __init vstms_map_io(void)
s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc)); s3c24xx_init_io(vstms_iodesc, ARRAY_SIZE(vstms_iodesc));
s3c24xx_init_clocks(12000000); s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs)); s3c24xx_init_uarts(vstms_uartcfgs, ARRAY_SIZE(vstms_uartcfgs));
samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
} }
static void __init vstms_init(void) static void __init vstms_init(void)
...@@ -159,6 +161,6 @@ MACHINE_START(VSTMS, "VSTMS") ...@@ -159,6 +161,6 @@ MACHINE_START(VSTMS, "VSTMS")
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.init_machine = vstms_init, .init_machine = vstms_init,
.map_io = vstms_map_io, .map_io = vstms_map_io,
.init_time = s3c24xx_timer_init, .init_time = samsung_timer_init,
.restart = s3c2412_restart, .restart = s3c2412_restart,
MACHINE_END MACHINE_END
arch/arm/plat-samsung/include/plat/cpu.h
浏览文件 @ 7f78b6eb
...@@ -192,7 +192,7 @@ extern void s3c24xx_init_uartdevs(char *name, ...@@ -192,7 +192,7 @@ extern void s3c24xx_init_uartdevs(char *name,
struct s3c24xx_uart_resources *res, struct s3c24xx_uart_resources *res,
struct s3c2410_uartcfg *cfg, int no); struct s3c2410_uartcfg *cfg, int no);
/* timer for 2410/2440 */ /* timer for s5pc100 only */
extern void s3c24xx_timer_init(void); extern void s3c24xx_timer_init(void);
......
arch/arm/plat-samsung/include/plat/samsung-time.h
浏览文件 @ 7f78b6eb
...@@ -30,7 +30,18 @@ struct samsung_timer_source { ...@@ -30,7 +30,18 @@ struct samsung_timer_source {
/* Be able to sleep for atleast 4 seconds (usually more) */ /* Be able to sleep for atleast 4 seconds (usually more) */
#define SAMSUNG_TIMER_MIN_RANGE 4 #define SAMSUNG_TIMER_MIN_RANGE 4
#ifdef CONFIG_ARCH_S3C24XX
#define TCNT_MAX 0xffff
#define TSCALER_DIV 25
#define TDIV 50
#define TSIZE 16
#else
#define TCNT_MAX 0xffffffff #define TCNT_MAX 0xffffffff
#define TSCALER_DIV 2
#define TDIV 2
#define TSIZE 32
#endif
#define NON_PERIODIC 0 #define NON_PERIODIC 0
#define PERIODIC 1 #define PERIODIC 1
......
arch/arm/plat-samsung/samsung-time.c
浏览文件 @ 7f78b6eb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Copyright (c) 2011 Samsung Electronics Co., Ltd. * Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* SAMSUNG - Common hr-timer support * samsung - Common hr-timer support (s3c and s5p)
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
...@@ -267,8 +267,8 @@ static void __init samsung_clockevent_init(void) ...@@ -267,8 +267,8 @@ static void __init samsung_clockevent_init(void)
tscaler = clk_get_parent(tdiv_event); tscaler = clk_get_parent(tdiv_event);
clk_set_rate(tscaler, pclk / 2); clk_set_rate(tscaler, pclk / TSCALER_DIV);
clk_set_rate(tdiv_event, pclk / 2); clk_set_rate(tdiv_event, pclk / TDIV);
clk_set_parent(tin_event, tdiv_event); clk_set_parent(tin_event, tdiv_event);
clock_rate = clk_get_rate(tin_event); clock_rate = clk_get_rate(tin_event);
...@@ -329,7 +329,7 @@ static void __init samsung_clocksource_init(void) ...@@ -329,7 +329,7 @@ static void __init samsung_clocksource_init(void)
pclk = clk_get_rate(timerclk); pclk = clk_get_rate(timerclk);
clk_set_rate(tdiv_source, pclk / 2); clk_set_rate(tdiv_source, pclk / TDIV);
clk_set_parent(tin_source, tdiv_source); clk_set_parent(tin_source, tdiv_source);
clock_rate = clk_get_rate(tin_source); clock_rate = clk_get_rate(tin_source);
...@@ -337,10 +337,10 @@ static void __init samsung_clocksource_init(void) ...@@ -337,10 +337,10 @@ static void __init samsung_clocksource_init(void)
samsung_time_setup(timer_source.source_id, TCNT_MAX); samsung_time_setup(timer_source.source_id, TCNT_MAX);
samsung_time_start(timer_source.source_id, PERIODIC); samsung_time_start(timer_source.source_id, PERIODIC);
setup_sched_clock(samsung_read_sched_clock, 32, clock_rate); setup_sched_clock(samsung_read_sched_clock, TSIZE, clock_rate);
if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer", if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer",
clock_rate, 250, 32, clocksource_mmio_readl_down)) clock_rate, 250, TSIZE, clocksource_mmio_readl_down))
panic("samsung_clocksource_timer: can't register clocksource\n"); panic("samsung_clocksource_timer: can't register clocksource\n");
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或