Add RTC support SMDK6410, SMDKC100, SMDKC110 and SMDKV210

PATCH Superseded Kukjin Kim 2 participants 8 messages Jul 21, 2010 – Jul 29, 2010

Subsystems (4)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos Real time clock (RTC)

lore

Share & tools

lore

Kukjin Kim

author

2010-07-21 09:00 UTC #0 lore raw

cover Add RTC support SMDK6410, SMDKC100, SMDKC110 and SMDKV210

This patch adds RTC support for Samsung SoCs such as S5P6440, S5PC100, S5PV210, and S5PC110.

NOTE: depends on previous Samsung RTC patches.

[PATCH 1/5] ARM: S3C64XX: Add RTC support for S3C64XX
[PATCH 2/5] rtc: rtc-s3c: Add extra option to include RTC for Samsung SoCs [PATCH 3/5] ARM: S5P6440: Add RTC support for S5P6440
[PATCH 4/5] ARM: S5PC100: Add RTC support for S5PC100
[PATCH 5/5] ARM: S5PV210: Add RTC support for S5PV210 and S5PC110

Kukjin Kim

author

2010-07-21 09:00 UTC #1 lore raw

PATCH 1/5 ARM: S3C64XX: Add RTC support for S3C64XX

From: Atul Dahiya <[email protected]>

This patch adds support for RTC for SMDK6410.

Signed-off-by Atul Dahiya <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/mach-s3c64xx/Kconfig         |    1 +
 arch/arm/mach-s3c64xx/mach-smdk6410.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

arch/arm/mach-s3c64xx/Kconfig +1 -0

index f5a5972..e206504 100644
@@ -96,6 +96,7 @@ config MACH_SMDK6410
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_I2C1
 	select S3C_DEV_FB
+	select S3C_DEV_RTC
 	select SAMSUNG_DEV_TS
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HSOTG

arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -0

index d9a0355..b3bfb68 100644
@@ -265,6 +265,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 
 	&smdk6410_smsc911x,
 	&s3c_device_adc,
+	&s3c_device_rtc,
 	&s3c_device_ts,
 	&s3c_device_wdt,
 };

Signature · 1 line

1.6.2.5

Kukjin Kim

author

2010-07-21 09:00 UTC #2 lore raw

PATCH 2/5 rtc: rtc-s3c: Add extra option to include RTC for Samsung SoCs

In reply to Kukjin Kim

From: Atul Dahiya <[email protected]>

This patch adds HAVE_S3C_RTC to control inclusion of RTC driver for Samsung SoCs. This option will help to include the driver only for the necessary machines and not for any given arch.

Signed-off-by Atul Dahiya <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 drivers/rtc/Kconfig |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

drivers/rtc/Kconfig +8 -1

index 10ba12c..c43732f 100644
@@ -645,9 +645,16 @@ config RTC_DRV_OMAP
 	  DA8xx/OMAP-L13x chips.  This driver can also be built as a
 	  module called rtc-omap.
 
+config HAVE_S3C_RTC
+	bool
+	help
+	  This will include RTC support for Samsung SoCs. If
+	  you want to include RTC support for any machine, kindly
+	  select this in the respective mach-XXXX/Kconfig file.
+
 config RTC_DRV_S3C
 	tristate "Samsung S3C series SoC RTC"
-	depends on ARCH_S3C2410 || ARCH_S3C64XX
+	depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC
 	help
 	  RTC (Realtime Clock) driver for the clock inbuilt into the
 	  Samsung S3C24XX series of SoCs. This can provide periodic

Signature · 1 line

1.6.2.5

Kukjin Kim

author

2010-07-21 09:00 UTC #3 lore raw

PATCH 3/5 ARM: S5P6440: Add RTC support for S5P6440

In reply to Kukjin Kim

From: Atul Dahiya <[email protected]>

This patch adds support RTC driver for Samsung S5P6440.

Signed-off-by Atul Dahiya <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/mach-s5p6440/Kconfig            |    2 ++
 arch/arm/mach-s5p6440/include/mach/map.h |    2 +-
 arch/arm/mach-s5p6440/mach-smdk6440.c    |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

arch/arm/mach-s5p6440/Kconfig +2 -0

index f066fae..b2d4716 100644
@@ -18,7 +18,9 @@ config MACH_SMDK6440
 	select CPU_S5P6440
 	select SAMSUNG_DEV_TS
 	select SAMSUNG_DEV_ADC
+	select S3C_DEV_RTC
 	select S3C_DEV_WDT
+	select HAVE_S3C_RTC
 	select HAVE_S3C2410_WATCHDOG
 	help
 	  Machine support for the Samsung SMDK6440

arch/arm/mach-s5p6440/include/mach/map.h +1 -1

index 44011b9..255a2e7 100644
@@ -38,7 +38,6 @@
 #define S5P_PA_TIMER		S5P6440_PA_TIMER
 
 #define S5P6440_PA_RTC		(0xEA100000)
-#define S5P_PA_RTC		S5P6440_PA_RTC
 
 #define S5P6440_PA_WDT		(0xEA200000)
 #define S5P_PA_WDT		S5P6440_PA_WDT

@@ -77,6 +76,7 @@
 /* compatibiltiy defines. */
 #define S3C_PA_UART		S5P6440_PA_UART
 #define S3C_PA_IIC		S5P6440_PA_IIC0
+#define S3C_PA_RTC		S5P6440_PA_RTC
 #define S3C_PA_WDT		S5P6440_PA_WDT
 
 #define SAMSUNG_PA_ADC		S5P6440_PA_ADC

arch/arm/mach-s5p6440/mach-smdk6440.c +1 -0

index 8291fec..142edd5 100644
@@ -88,6 +88,7 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
 static struct platform_device *smdk6440_devices[] __initdata = {
 	&s5p6440_device_iis,
 	&s3c_device_adc,
+	&s3c_device_rtc,
 	&s3c_device_ts,
 	&s3c_device_wdt,
 };

Signature · 1 line

1.6.2.5

Ben Dooks

2010-07-28 18:13 UTC #4 lore raw

PATCH 3/5 ARM: S5P6440: Add RTC support for S5P6440

Quoted 17 lines · Kukjin Kim

From: Atul Dahiya <[email protected]>
This patch adds support RTC driver for Samsung S5P6440.
Signed-off-by Atul Dahiya <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
---
 arch/arm/mach-s5p6440/Kconfig            |    2 ++
 arch/arm/mach-s5p6440/include/mach/map.h |    2 +-
 arch/arm/mach-s5p6440/mach-smdk6440.c    |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)
arch/arm/mach-s5p6440/Kconfig +0 -0
index f066fae..b2d4716 100644

arch/arm/mach-s5p6440/Kconfig config MACH_SMDK6440 · line 26

Quoted 9 lines

arch/arm/mach-s5p6440/Kconfig +2 -0

@@ -18,7 +18,9 @@ config MACH_SMDK6440
 	select CPU_S5P6440
 	select SAMSUNG_DEV_TS
 	select SAMSUNG_DEV_ADC
+	select S3C_DEV_RTC
 	select S3C_DEV_WDT
+	select HAVE_S3C_RTC
 	select HAVE_S3C2410_WATCHDOG
 	help
 	  Machine support for the Samsung SMDK6440

I'm considering we shoudl just set HAVE_S3C_RTC for each SOC, as allowing it to compile isn't going to end up causing a problem. Adding it to each machine will end up with large Kconfig entries for each.

Signature · 1 line

Ben

Kukjin Kim

author

2010-07-29 01:37 UTC #5 lore raw

PATCH 3/5 ARM: S5P6440: Add RTC support for S5P6440

Quoted 14 lines · Ben Dooks

Quoted 12 lines · Kukjin Kim
From: Atul Dahiya <[email protected]>
This patch adds support RTC driver for Samsung S5P6440.
Signed-off-by Atul Dahiya <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
---
 arch/arm/mach-s5p6440/Kconfig            |    2 ++
 arch/arm/mach-s5p6440/include/mach/map.h |    2 +-
 arch/arm/mach-s5p6440/mach-smdk6440.c    |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

Quoted 1 line

Review
Quoted 1 line
(quoted diff) +0 -0

b/arch/arm/mach-s5p6440/Kconfig

Quoted 10 lines

index f066fae..b2d4716 100644

arch/arm/mach-s5p6440/Kconfig +2 -0

@@ -18,7 +18,9 @@ config MACH_SMDK6440
 	select CPU_S5P6440
 	select SAMSUNG_DEV_TS
 	select SAMSUNG_DEV_ADC
+	select S3C_DEV_RTC
 	select S3C_DEV_WDT
+	select HAVE_S3C_RTC

Quoted 9 lines

arch/arm/mach-s5p6440/Kconfig config MACH_SMDK6440 · line 26
Quoted 3 lines
arch/arm/mach-s5p6440/Kconfig +0 -0
 	select HAVE_S3C2410_WATCHDOG
 	help
 	  Machine support for the Samsung SMDK6440
I'm considering we shoudl just set HAVE_S3C_RTC for each SOC, as allowing it to compile isn't going to end up causing a problem. Adding it to each machine will end up with large Kconfig entries for each.

Yes..I agree with you...So submitted '[PATCH] ARM: SAMSUNG: Make RTC driver dependency SoC specific instead of machine specific' together. And to separate moving dependency from machine to SoC patch can help to avoid conflict during merging because as you know adding it to each SoC needs to change arch/arm/Kconfig.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Kukjin Kim

author

2010-07-21 09:00 UTC #6 lore raw

PATCH 4/5 ARM: S5PC100: Add RTC support for S5PC100

In reply to Kukjin Kim

From: Atul Dahiya <[email protected]>

This patch adds support RTC driver for Samsung S5PC100.

Signed-off-by Atul Dahiya <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/mach-s5pc100/Kconfig            |    2 ++
 arch/arm/mach-s5pc100/include/mach/map.h |    3 +++
 arch/arm/mach-s5pc100/mach-smdkc100.c    |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)

arch/arm/mach-s5pc100/Kconfig +2 -0

index b2a11df..2602895 100644
@@ -44,9 +44,11 @@ config MACH_SMDKC100
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_HSMMC2
+	select S3C_DEV_RTC
 	select S5PC100_SETUP_FB_24BPP
 	select S5PC100_SETUP_I2C1
 	select S5PC100_SETUP_SDHCI
+	select HAVE_S3C_RTC
 	help
 	  Machine support for the Samsung SMDKC100

arch/arm/mach-s5pc100/include/mach/map.h +3 -0

index cadae43..1834b2c 100644
@@ -72,6 +72,8 @@
 
 #define S5PC100_PA_SYSTIMER	(0xEA100000)
 
+#define S5PC100_PA_RTC		(0xEA300000)
+
 #define S5PC100_PA_UART		(0xEC000000)
 
 #define S5P_PA_UART0		(S5PC100_PA_UART + 0x0)

@@ -134,5 +136,6 @@
 #define S3C_PA_ONENAND		S5PC100_PA_ONENAND
 #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
+#define S3C_PA_RTC		S5PC100_PA_RTC
 
 #endif /* __ASM_ARCH_C100_MAP_H */

arch/arm/mach-s5pc100/mach-smdkc100.c +1 -0

index af22f82..09785e3 100644
@@ -159,6 +159,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
 	&smdkc100_lcd_powerdev,
 	&s5pc100_device_iis0,
 	&s5pc100_device_ac97,
+	&s3c_device_rtc,
 };
 
 static void __init smdkc100_map_io(void)

Signature · 1 line

1.6.2.5

Kukjin Kim

author

2010-07-21 09:00 UTC #7 lore raw

PATCH 5/5 ARM: S5PV210: Add RTC support for S5PV210 and S5PC110

In reply to Kukjin Kim

From: Atul Dahiya <[email protected]>

This patch adds support RTC driver for Samsung S5PV210/S5PC110.

Signed-off-by Atul Dahiya <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 arch/arm/mach-s5pv210/Kconfig            |    4 ++++
 arch/arm/mach-s5pv210/include/mach/map.h |    2 ++
 arch/arm/mach-s5pv210/mach-smdkc110.c    |    1 +
 arch/arm/mach-s5pv210/mach-smdkv210.c    |    1 +
 4 files changed, 8 insertions(+), 0 deletions(-)

arch/arm/mach-s5pv210/Kconfig +4 -0

index 0761eac..04597cc 100644
@@ -73,7 +73,9 @@ config MACH_SMDKV210
 	select ARCH_SPARSEMEM_ENABLE
 	select SAMSUNG_DEV_ADC
 	select SAMSUNG_DEV_TS
+	select S3C_DEV_RTC
 	select S3C_DEV_WDT
+	select HAVE_S3C_RTC
 	select HAVE_S3C2410_WATCHDOG
 	help
 	  Machine support for Samsung SMDKV210

@@ -82,7 +84,9 @@ config MACH_SMDKC110
 	bool "SMDKC110"
 	select CPU_S5PV210
 	select ARCH_SPARSEMEM_ENABLE
+	select S3C_DEV_RTC
 	select S3C_DEV_WDT
+	select HAVE_S3C_RTC
 	select HAVE_S3C2410_WATCHDOG
 	help
 	  Machine support for Samsung SMDKC110

arch/arm/mach-s5pv210/include/mach/map.h +2 -0

index 34eb168..743ae4a 100644
@@ -43,6 +43,7 @@
 
 #define S5PV210_PA_WATCHDOG	(0xE2700000)
 
+#define S5PV210_PA_RTC		(0xE2800000)
 #define S5PV210_PA_UART		(0xE2900000)
 
 #define S5P_PA_UART0		(S5PV210_PA_UART + 0x0)

@@ -101,6 +102,7 @@
 #define S3C_PA_IIC1		S5PV210_PA_IIC1
 #define S3C_PA_IIC2		S5PV210_PA_IIC2
 #define S3C_PA_FB		S5PV210_PA_FB
+#define S3C_PA_RTC		S5PV210_PA_RTC
 #define S3C_PA_WDT		S5PV210_PA_WATCHDOG
 
 #define SAMSUNG_PA_ADC		S5PV210_PA_ADC

arch/arm/mach-s5pv210/mach-smdkc110.c +1 -0

index 4c8903c..2b48d5a 100644
@@ -74,6 +74,7 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
 static struct platform_device *smdkc110_devices[] __initdata = {
 	&s5pv210_device_iis0,
 	&s5pv210_device_ac97,
+	&s3c_device_rtc,
 	&s3c_device_wdt,
 };

arch/arm/mach-s5pv210/mach-smdkv210.c +1 -0

index 0d46279..15e2b9b 100644
@@ -77,6 +77,7 @@ static struct platform_device *smdkv210_devices[] __initdata = {
 	&s5pv210_device_iis0,
 	&s5pv210_device_ac97,
 	&s3c_device_adc,
+	&s3c_device_rtc,
 	&s3c_device_ts,
 	&s3c_device_wdt,
 };

Signature · 1 line

1.6.2.5