ARM: Merge for-2635/samsung-rtc

Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s3c64xx/include/mach/map.h
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/Makefile

5 files changed, 23 insertions, 15 deletions

diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index da662783493a..d78c3dd43a1a 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -56,6 +56,5 @@ obj-$(CONFIG_MACH_HMT)		+= mach-hmt.o
 # device support
 
 obj-y                           += dev-uart.o
-obj-y                           += dev-rtc.o
 obj-y                           += dev-audio.o
 obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 869c8e025127..9fdd50c8c767 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -103,6 +103,8 @@
 #define S3C_PA_USBHOST          S3C64XX_PA_USBHOST
 #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 SAMSUNG_PA_ADC          S3C64XX_PA_ADC
 
 #endif /* __ASM_ARCH_6400_MAP_H */
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 2f1b3d4a09b3..c91c21ac5fcb 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -190,6 +190,11 @@ config S3C_DEV_NAND
         help
           Compile in platform device definition for NAND controller
 
+config S3C_DEV_RTC
+        bool
+        help
+          Complie in platform device definition for RTC
+
 config SAMSUNG_DEV_ADC
         bool
         help
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 761407fe8135..7068af322e73 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,8 @@ obj-y				+= dev-uart.o
 obj-$(CONFIG_S3C_DEV_USB_HOST)  += dev-usb.o
 obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
 obj-$(CONFIG_S3C_DEV_NAND)      += dev-nand.o
+obj-$(CONFIG_S3C_DEV_RTC)       += dev-rtc.o
+
 obj-$(CONFIG_SAMSUNG_DEV_ADC)   += dev-adc.o
 
 # DMA support
diff --git a/arch/arm/mach-s3c64xx/dev-rtc.c b/arch/arm/plat-samsung/dev-rtc.c
index b9e7a05f0129..bf4e2267333c 100644
--- a/arch/arm/mach-s3c64xx/dev-rtc.c
+++ b/arch/arm/plat-samsung/dev-rtc.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c64xx/dev-rtc.c
+/* linux/arch/arm/plat-samsung/dev-rtc.c
  *
  * Copyright 2009 by Maurus Cuelenaere <mcuelenaere@gmail.com>
  *
@@ -18,26 +18,26 @@
 
 static struct resource s3c_rtc_resource[] = {
         [0] = {
-                .start = S3C64XX_PA_RTC,
-                .end   = S3C64XX_PA_RTC + 0xff,
-                .flags = IORESOURCE_MEM,
+                .start  = S3C_PA_RTC,
+                .end    = S3C_PA_RTC + 0xff,
+                .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start = IRQ_RTC_ALARM,
-                .end   = IRQ_RTC_ALARM,
-                .flags = IORESOURCE_IRQ,
+                .start  = IRQ_RTC_ALARM,
+                .end    = IRQ_RTC_ALARM,
+                .flags  = IORESOURCE_IRQ,
         },
         [2] = {
-                .start = IRQ_RTC_TIC,
-                .end   = IRQ_RTC_TIC,
-                .flags = IORESOURCE_IRQ
+                .start  = IRQ_RTC_TIC,
+                .end    = IRQ_RTC_TIC,
+                .flags  = IORESOURCE_IRQ
         }
 };
 
 struct platform_device s3c_device_rtc = {
-        .name             = "s3c64xx-rtc",
-        .id               = -1,
-        .num_resources    = ARRAY_SIZE(s3c_rtc_resource),
-        .resource         = s3c_rtc_resource,
+        .name           = "s3c64xx-rtc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(s3c_rtc_resource),
+        .resource       = s3c_rtc_resource,
 };
 EXPORT_SYMBOL(s3c_device_rtc);