diff options
| -rw-r--r-- | arch/arm/mach-s5p6440/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/map.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6440/mach-smdk6440.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig index f066fae07c57..b2d471653975 100644 --- a/arch/arm/mach-s5p6440/Kconfig +++ b/arch/arm/mach-s5p6440/Kconfig | |||
| @@ -18,7 +18,9 @@ config MACH_SMDK6440 | |||
| 18 | select CPU_S5P6440 | 18 | select CPU_S5P6440 |
| 19 | select SAMSUNG_DEV_TS | 19 | select SAMSUNG_DEV_TS |
| 20 | select SAMSUNG_DEV_ADC | 20 | select SAMSUNG_DEV_ADC |
| 21 | select S3C_DEV_RTC | ||
| 21 | select S3C_DEV_WDT | 22 | select S3C_DEV_WDT |
| 23 | select HAVE_S3C_RTC | ||
| 22 | select HAVE_S3C2410_WATCHDOG | 24 | select HAVE_S3C2410_WATCHDOG |
| 23 | help | 25 | help |
| 24 | Machine support for the Samsung SMDK6440 | 26 | Machine support for the Samsung SMDK6440 |
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h index 44011b91fbd1..255a2e7f0b9a 100644 --- a/arch/arm/mach-s5p6440/include/mach/map.h +++ b/arch/arm/mach-s5p6440/include/mach/map.h | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #define S5P_PA_TIMER S5P6440_PA_TIMER | 38 | #define S5P_PA_TIMER S5P6440_PA_TIMER |
| 39 | 39 | ||
| 40 | #define S5P6440_PA_RTC (0xEA100000) | 40 | #define S5P6440_PA_RTC (0xEA100000) |
| 41 | #define S5P_PA_RTC S5P6440_PA_RTC | ||
| 42 | 41 | ||
| 43 | #define S5P6440_PA_WDT (0xEA200000) | 42 | #define S5P6440_PA_WDT (0xEA200000) |
| 44 | #define S5P_PA_WDT S5P6440_PA_WDT | 43 | #define S5P_PA_WDT S5P6440_PA_WDT |
| @@ -77,6 +76,7 @@ | |||
| 77 | /* compatibiltiy defines. */ | 76 | /* compatibiltiy defines. */ |
| 78 | #define S3C_PA_UART S5P6440_PA_UART | 77 | #define S3C_PA_UART S5P6440_PA_UART |
| 79 | #define S3C_PA_IIC S5P6440_PA_IIC0 | 78 | #define S3C_PA_IIC S5P6440_PA_IIC0 |
| 79 | #define S3C_PA_RTC S5P6440_PA_RTC | ||
| 80 | #define S3C_PA_WDT S5P6440_PA_WDT | 80 | #define S3C_PA_WDT S5P6440_PA_WDT |
| 81 | 81 | ||
| 82 | #define SAMSUNG_PA_ADC S5P6440_PA_ADC | 82 | #define SAMSUNG_PA_ADC S5P6440_PA_ADC |
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c index 8291fecc701a..142edd57a9da 100644 --- a/arch/arm/mach-s5p6440/mach-smdk6440.c +++ b/arch/arm/mach-s5p6440/mach-smdk6440.c | |||
| @@ -88,6 +88,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = { | |||
| 88 | static struct platform_device *smdk6440_devices[] __initdata = { | 88 | static struct platform_device *smdk6440_devices[] __initdata = { |
| 89 | &s5p6440_device_iis, | 89 | &s5p6440_device_iis, |
| 90 | &s3c_device_adc, | 90 | &s3c_device_adc, |
| 91 | &s3c_device_rtc, | ||
| 91 | &s3c_device_ts, | 92 | &s3c_device_ts, |
| 92 | &s3c_device_wdt, | 93 | &s3c_device_wdt, |
| 93 | }; | 94 | }; |
