hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: Merge for-2635-4/watchdog 

Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/mach-smdkv210.c
This commit is contained in:
Ben Dooks 2010-05-20 19:51:40 +09:00
parent a2f7bffa29 5b7d7b22dc
commit 6aeaad51aa
15 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-s3c2410/include/mach/map.h
View File

@ -114,6 +114,7 @@
#define S3C_PA_USBHOST S3C2410_PA_USBHOST #define S3C_PA_USBHOST S3C2410_PA_USBHOST
#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
#define S3C_PA_HSMMC1 S3C2416_PA_HSMMC0 #define S3C_PA_HSMMC1 S3C2416_PA_HSMMC0
#define S3C_PA_WDT S3C2410_PA_WATCHDOG
#define S3C_PA_NAND S3C24XX_PA_NAND #define S3C_PA_NAND S3C24XX_PA_NAND
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */

2
arch/arm/mach-s3c64xx/Kconfig
View File

@ -93,6 +93,8 @@ config MACH_SMDK6410
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S3C_DEV_USB_HOST select S3C_DEV_USB_HOST
select S3C_DEV_USB_HSOTG select S3C_DEV_USB_HSOTG
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
select S3C64XX_SETUP_SDHCI select S3C64XX_SETUP_SDHCI
select S3C64XX_SETUP_I2C1 select S3C64XX_SETUP_I2C1
select S3C64XX_SETUP_FB_24BPP select S3C64XX_SETUP_FB_24BPP

1
arch/arm/mach-s3c64xx/include/mach/map.h
View File

@ -104,6 +104,7 @@
#define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG
#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY
#define S3C_PA_RTC S3C64XX_PA_RTC #define S3C_PA_RTC S3C64XX_PA_RTC
#define S3C_PA_WDT S3C64XX_PA_WATCHDOG
#define SAMSUNG_PA_ADC S3C64XX_PA_ADC #define SAMSUNG_PA_ADC S3C64XX_PA_ADC

1
arch/arm/mach-s3c64xx/mach-smdk6410.c
View File

@ -266,6 +266,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
&smdk6410_smsc911x, &smdk6410_smsc911x,
&s3c_device_adc, &s3c_device_adc,
&s3c_device_ts, &s3c_device_ts,
&s3c_device_wdt,
}; };
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR

2
arch/arm/mach-s5p6440/Kconfig
View File

@ -18,6 +18,8 @@ config MACH_SMDK6440
select CPU_S5P6440 select CPU_S5P6440
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
help help
Machine support for the Samsung SMDK6440 Machine support for the Samsung SMDK6440

2
arch/arm/mach-s5p6440/include/mach/map.h
View File

@ -77,6 +77,8 @@
/* compatibiltiy defines. */ /* compatibiltiy defines. */
#define S3C_PA_UART S5P6440_PA_UART #define S3C_PA_UART S5P6440_PA_UART
#define S3C_PA_IIC S5P6440_PA_IIC0 #define S3C_PA_IIC S5P6440_PA_IIC0
#define S3C_PA_WDT S5P6440_PA_WDT
#define SAMSUNG_PA_ADC S5P6440_PA_ADC #define SAMSUNG_PA_ADC S5P6440_PA_ADC
#endif /* __ASM_ARCH_MAP_H */ #endif /* __ASM_ARCH_MAP_H */

1
arch/arm/mach-s5p6440/mach-smdk6440.c
View File

@ -89,6 +89,7 @@ static struct platform_device *smdk6440_devices[] __initdata = {
&s5p6440_device_iis, &s5p6440_device_iis,
&s3c_device_adc, &s3c_device_adc,
&s3c_device_ts, &s3c_device_ts,
&s3c_device_wdt,
}; };
static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

4
arch/arm/mach-s5pv210/Kconfig
View File

@ -68,6 +68,8 @@ config MACH_SMDKV210
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select SAMSUNG_DEV_ADC select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
help help
Machine support for Samsung SMDKV210 Machine support for Samsung SMDKV210
@ -75,6 +77,8 @@ config MACH_SMDKC110
bool "SMDKC110" bool "SMDKC110"
select CPU_S5PV210 select CPU_S5PV210
select ARCH_SPARSEMEM_ENABLE select ARCH_SPARSEMEM_ENABLE
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
help help
Machine support for Samsung SMDKC110 Machine support for Samsung SMDKC110
S5PC110(MCP) is one of package option of S5PV210 S5PC110(MCP) is one of package option of S5PV210

3
arch/arm/mach-s5pv210/include/mach/map.h
View File

@ -38,6 +38,8 @@
#define S5PV210_PA_SYSTIMER (0xE2600000) #define S5PV210_PA_SYSTIMER (0xE2600000)
#define S5PV210_PA_WATCHDOG (0xE2700000)
#define S5PV210_PA_UART (0xE2900000) #define S5PV210_PA_UART (0xE2900000)
#define S5P_PA_UART0 (S5PV210_PA_UART + 0x0) #define S5P_PA_UART0 (S5PV210_PA_UART + 0x0)
@ -96,6 +98,7 @@
#define S3C_PA_IIC1 S5PV210_PA_IIC1 #define S3C_PA_IIC1 S5PV210_PA_IIC1
#define S3C_PA_IIC2 S5PV210_PA_IIC2 #define S3C_PA_IIC2 S5PV210_PA_IIC2
#define S3C_PA_FB S5PV210_PA_FB #define S3C_PA_FB S5PV210_PA_FB
#define S3C_PA_WDT S5PV210_PA_WATCHDOG
#define SAMSUNG_PA_ADC S5PV210_PA_ADC #define SAMSUNG_PA_ADC S5PV210_PA_ADC

1
arch/arm/mach-s5pv210/mach-smdkc110.c
View File

@ -74,6 +74,7 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
static struct platform_device *smdkc110_devices[] __initdata = { static struct platform_device *smdkc110_devices[] __initdata = {
&s5pv210_device_iis0, &s5pv210_device_iis0,
&s5pv210_device_ac97, &s5pv210_device_ac97,
&s3c_device_wdt,
}; };
static void __init smdkc110_map_io(void) static void __init smdkc110_map_io(void)

1
arch/arm/mach-s5pv210/mach-smdkv210.c
View File

@ -78,6 +78,7 @@ static struct platform_device *smdkv210_devices[] __initdata = {
&s5pv210_device_ac97, &s5pv210_device_ac97,
&s3c_device_adc, &s3c_device_adc,
&s3c_device_ts, &s3c_device_ts,
&s3c_device_wdt,
}; };
static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {

26
arch/arm/plat-s3c24xx/devs.c
View File

@ -234,32 +234,6 @@ void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *pd)
} }
} }
/* Watchdog */
static struct resource s3c_wdt_resource[] = {
[0] = {
.start = S3C24XX_PA_WATCHDOG,
.end = S3C24XX_PA_WATCHDOG + S3C24XX_SZ_WATCHDOG - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_WDT,
.end = IRQ_WDT,
.flags = IORESOURCE_IRQ,
}
};
struct platform_device s3c_device_wdt = {
.name = "s3c2410-wdt",
.id = -1,
.num_resources = ARRAY_SIZE(s3c_wdt_resource),
.resource = s3c_wdt_resource,
};
EXPORT_SYMBOL(s3c_device_wdt);
/* IIS */ /* IIS */
static struct resource s3c_iis_resource[] = { static struct resource s3c_iis_resource[] = {

6
arch/arm/plat-samsung/Kconfig
View File

@ -190,6 +190,12 @@ config S3C_DEV_USB_HSOTG
help help
Compile in platform device definition for USB high-speed OtG Compile in platform device definition for USB high-speed OtG
config S3C_DEV_WDT
bool
default y if ARCH_S3C2410
help
Complie in platform device definition for Watchdog Timer
config S3C_DEV_NAND config S3C_DEV_NAND
bool bool
help help

1
arch/arm/plat-samsung/Makefile
View File

@ -41,6 +41,7 @@ obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
obj-y += dev-uart.o obj-y += dev-uart.o
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
obj-$(CONFIG_S3C_DEV_WDT) += dev-wdt.o
obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o

40
arch/arm/plat-samsung/dev-wdt.c Normal file
View File

@ -0,0 +1,40 @@
/* linux/arch/arm/plat-samsung/dev-wdt.c
*
* Copyright (c) 2004 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* S3C series device definition for the watchdog timer
*
* 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
* published by the Free Software Foundation.
*/
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <mach/irqs.h>
#include <mach/map.h>
#include <plat/devs.h>
static struct resource s3c_wdt_resource[] = {
[0] = {
.start = S3C_PA_WDT,
.end = S3C_PA_WDT + SZ_1M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_WDT,
.end = IRQ_WDT,
.flags = IORESOURCE_IRQ,
}
};
struct platform_device s3c_device_wdt = {
.name = "s3c2410-wdt",
.id = -1,
.num_resources = ARRAY_SIZE(s3c_wdt_resource),
.resource = s3c_wdt_resource,
};
EXPORT_SYMBOL(s3c_device_wdt);