Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aeaad51 authored by Ben Dooks's avatar Ben Dooks
Browse files

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
parents a2f7bffa 5b7d7b22

arch/arm/mach-s3c2410/include/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
#define S3C_PA_USBHOST	S3C2410_PA_USBHOST

#define S3C_PA_HSMMC0	    S3C2443_PA_HSMMC

#define S3C_PA_HSMMC1	    S3C2416_PA_HSMMC0

#define S3C_PA_WDT	    S3C2410_PA_WATCHDOG

#define S3C_PA_NAND	    S3C24XX_PA_NAND



#endif /* __ASM_ARCH_MAP_H */

arch/arm/mach-s3c64xx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ config MACH_SMDK6410 
	select SAMSUNG_DEV_TS

	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_I2C1

	select S3C64XX_SETUP_FB_24BPP

arch/arm/mach-s3c64xx/include/mach/map.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG

#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY

#define S3C_PA_RTC		S3C64XX_PA_RTC

#define S3C_PA_WDT		S3C64XX_PA_WATCHDOG



#define SAMSUNG_PA_ADC		S3C64XX_PA_ADC

arch/arm/mach-s3c64xx/mach-smdk6410.c

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&smdk6410_smsc911x,

	&s3c_device_adc,

	&s3c_device_ts,

	&s3c_device_wdt,

};



#ifdef CONFIG_REGULATOR

arch/arm/mach-s5p6440/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config MACH_SMDK6440 
	select CPU_S5P6440

	select SAMSUNG_DEV_TS

	select SAMSUNG_DEV_ADC

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	help

	  Machine support for the Samsung SMDK6440