diff options
author | Banajit Goswami <banajit.g@samsung.com> | 2010-05-19 02:42:29 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:44:18 -0400 |
commit | e1d5c93e82eadd814949c023d0b16aa8fa8ad7ae (patch) | |
tree | 7b30f381e48ed22ca55f9e423343e3f879ff83d7 /arch/arm/plat-samsung | |
parent | 504d36e91ac12ccdb0e1193cee7bef9831a1c99e (diff) |
ARM: SAMSUNG: Move WDT device definitions in plat-samsung
This patch moves the definitions of watchdog timer device from
plat-s3c24xx to plat-samsung. This will enable all Samsung S3C
and S5P series SoC's to use common WDT device definition.
Signed-off-by: Banajit Goswami <banajit.g@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/dev-wdt.c | 40 |
3 files changed, 47 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 229919e9744c..48ac9b1f0e09 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -185,6 +185,12 @@ config S3C_DEV_USB_HSOTG | |||
185 | help | 185 | help |
186 | Compile in platform device definition for USB high-speed OtG | 186 | Compile in platform device definition for USB high-speed OtG |
187 | 187 | ||
188 | config S3C_DEV_WDT | ||
189 | bool | ||
190 | default y if ARCH_S3C2410 | ||
191 | help | ||
192 | Complie in platform device definition for Watchdog Timer | ||
193 | |||
188 | config S3C_DEV_NAND | 194 | config S3C_DEV_NAND |
189 | bool | 195 | bool |
190 | help | 196 | help |
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 48288499a3b9..ee0199b03f1c 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -40,6 +40,7 @@ obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o | |||
40 | obj-y += dev-uart.o | 40 | obj-y += dev-uart.o |
41 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o | 41 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o |
42 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o | 42 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o |
43 | obj-$(CONFIG_S3C_DEV_WDT) += dev-wdt.o | ||
43 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o | 44 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o |
44 | obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o | 45 | obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o |
45 | 46 | ||
diff --git a/arch/arm/plat-samsung/dev-wdt.c b/arch/arm/plat-samsung/dev-wdt.c new file mode 100644 index 000000000000..5efca87cddbd --- /dev/null +++ b/arch/arm/plat-samsung/dev-wdt.c | |||
@@ -0,0 +1,40 @@ | |||
1 | /* linux/arch/arm/plat-samsung/dev-wdt.c | ||
2 | * | ||
3 | * Copyright (c) 2004 Simtec Electronics | ||
4 | * Ben Dooks <ben@simtec.co.uk> | ||
5 | * | ||
6 | * S3C series device definition for the watchdog timer | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/platform_device.h> | ||
15 | |||
16 | #include <mach/irqs.h> | ||
17 | #include <mach/map.h> | ||
18 | |||
19 | #include <plat/devs.h> | ||
20 | |||
21 | static struct resource s3c_wdt_resource[] = { | ||
22 | [0] = { | ||
23 | .start = S3C_PA_WDT, | ||
24 | .end = S3C_PA_WDT + SZ_1M - 1, | ||
25 | .flags = IORESOURCE_MEM, | ||
26 | }, | ||
27 | [1] = { | ||
28 | .start = IRQ_WDT, | ||
29 | .end = IRQ_WDT, | ||
30 | .flags = IORESOURCE_IRQ, | ||
31 | } | ||
32 | }; | ||
33 | |||
34 | struct platform_device s3c_device_wdt = { | ||
35 | .name = "s3c2410-wdt", | ||
36 | .id = -1, | ||
37 | .num_resources = ARRAY_SIZE(s3c_wdt_resource), | ||
38 | .resource = s3c_wdt_resource, | ||
39 | }; | ||
40 | EXPORT_SYMBOL(s3c_device_wdt); | ||