Implement RTC support for S3C2443/S3C2416/S3C2450
cover Implement RTC support for S3C2443/S3C2416/S3C2450
Similar to the ADC the RTC of S3C2443 and S3C2416/2450 has some slight variances when compared to the existing types.
This series adds support for those SoCs.
As with the ADC patches, these changes where tested on S3C2416 hardware. The S3C2443 quirks are a subset of those and are done according to the datasheet, but not tested on real hardware (as I do not own a S3C2443 device).
I'm also not sure if my changes to the devicetree block in patch 2 are correct, so I would be really happy if someone could take a closer look at them.
Heiko Stuebner (4):
ARM: SAMSUNG: cleanup of rtc register definitions
rtc-s3c: make room for more variants in devicetree block
rtc-s3c: add variants for S3C2443 and S3C2416
ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices
arch/arm/mach-s3c2416/s3c2416.c | 2 + arch/arm/mach-s3c2443/s3c2443.c | 2 + arch/arm/plat-samsung/include/plat/regs-rtc.h | 92 +++++++++++++++--------- arch/arm/plat-samsung/include/plat/rtc-core.h | 27 +++++++ drivers/rtc/rtc-s3c.c | 71 ++++++++++++++++--- 5 files changed, 149 insertions(+), 45 deletions(-) create mode 100644 arch/arm/plat-samsung/include/plat/rtc-core.h
Signature · 1 line
1.7.5.4
PATCH 1/4 ARM: SAMSUNG: cleanup of rtc register definitions
regs-rtc.h uses a mixture of tabs and spaces and also (x<<y) to format bits. So, before adding new stuff clean up the formatting and also add spaces to the bit definitions (i.e. (x << y) )
--- arch/arm/plat-samsung/include/plat/regs-rtc.h | 66 ++++++++++++------------- 1 files changed, 32 insertions(+), 34 deletions(-)
arch/arm/plat-samsung/include/plat/regs-rtc.h +32 -34
@@ -18,51 +18,49 @@#define S3C2410_INTP_ALM (1 << 1)#define S3C2410_INTP_TIC (1 << 0) -#define S3C2410_RTCCON S3C2410_RTCREG(0x40) -#define S3C2410_RTCCON_RTCEN (1<<0) -#define S3C2410_RTCCON_CLKSEL (1<<1) -#define S3C2410_RTCCON_CNTSEL (1<<2) -#define S3C2410_RTCCON_CLKRST (1<<3) -#define S3C64XX_RTCCON_TICEN (1<<8) +#define S3C2410_RTCCON S3C2410_RTCREG(0x40) +#define S3C2410_RTCCON_RTCEN (1 << 0) +#define S3C2410_RTCCON_CLKSEL (1 << 1) +#define S3C2410_RTCCON_CNTSEL (1 << 2) +#define S3C2410_RTCCON_CLKRST (1 << 3) +#define S3C64XX_RTCCON_TICEN (1 << 8) -#define S3C64XX_RTCCON_TICMSK (0xF<<7) -#define S3C64XX_RTCCON_TICSHT (7) +#define S3C64XX_RTCCON_TICMSK (0xF << 7) +#define S3C64XX_RTCCON_TICSHT (7) -#define S3C2410_TICNT S3C2410_RTCREG(0x44) -#define S3C2410_TICNT_ENABLE (1<<7) +#define S3C2410_TICNT S3C2410_RTCREG(0x44) +#define S3C2410_TICNT_ENABLE (1 << 7) -#define S3C2410_RTCALM S3C2410_RTCREG(0x50) -#define S3C2410_RTCALM_ALMEN (1<<6) -#define S3C2410_RTCALM_YEAREN (1<<5) -#define S3C2410_RTCALM_MONEN (1<<4) -#define S3C2410_RTCALM_DAYEN (1<<3) -#define S3C2410_RTCALM_HOUREN (1<<2) -#define S3C2410_RTCALM_MINEN (1<<1) -#define S3C2410_RTCALM_SECEN (1<<0) +#define S3C2410_RTCALM S3C2410_RTCREG(0x50) +#define S3C2410_RTCALM_ALMEN (1 << 6) +#define S3C2410_RTCALM_YEAREN (1 << 5) +#define S3C2410_RTCALM_MONEN (1 << 4) +#define S3C2410_RTCALM_DAYEN (1 << 3) +#define S3C2410_RTCALM_HOUREN (1 << 2) +#define S3C2410_RTCALM_MINEN (1 << 1) +#define S3C2410_RTCALM_SECEN (1 << 0)#define S3C2410_RTCALM_ALL \ S3C2410_RTCALM_ALMEN | S3C2410_RTCALM_YEAREN | S3C2410_RTCALM_MONEN |\ S3C2410_RTCALM_DAYEN | S3C2410_RTCALM_HOUREN | S3C2410_RTCALM_MINEN |\ S3C2410_RTCALM_SECEN +#define S3C2410_ALMSEC S3C2410_RTCREG(0x54) +#define S3C2410_ALMMIN S3C2410_RTCREG(0x58) +#define S3C2410_ALMHOUR S3C2410_RTCREG(0x5c) -#define S3C2410_ALMSEC S3C2410_RTCREG(0x54) -#define S3C2410_ALMMIN S3C2410_RTCREG(0x58) -#define S3C2410_ALMHOUR S3C2410_RTCREG(0x5c) +#define S3C2410_ALMDATE S3C2410_RTCREG(0x60) +#define S3C2410_ALMMON S3C2410_RTCREG(0x64) +#define S3C2410_ALMYEAR S3C2410_RTCREG(0x68) -#define S3C2410_ALMDATE S3C2410_RTCREG(0x60) -#define S3C2410_ALMMON S3C2410_RTCREG(0x64) -#define S3C2410_ALMYEAR S3C2410_RTCREG(0x68) - -#define S3C2410_RTCRST S3C2410_RTCREG(0x6c) - -#define S3C2410_RTCSEC S3C2410_RTCREG(0x70) -#define S3C2410_RTCMIN S3C2410_RTCREG(0x74) -#define S3C2410_RTCHOUR S3C2410_RTCREG(0x78) -#define S3C2410_RTCDATE S3C2410_RTCREG(0x7c) -#define S3C2410_RTCDAY S3C2410_RTCREG(0x80) -#define S3C2410_RTCMON S3C2410_RTCREG(0x84) -#define S3C2410_RTCYEAR S3C2410_RTCREG(0x88) +#define S3C2410_RTCRST S3C2410_RTCREG(0x6c) +#define S3C2410_RTCSEC S3C2410_RTCREG(0x70) +#define S3C2410_RTCMIN S3C2410_RTCREG(0x74) +#define S3C2410_RTCHOUR S3C2410_RTCREG(0x78) +#define S3C2410_RTCDATE S3C2410_RTCREG(0x7c) +#define S3C2410_RTCDAY S3C2410_RTCREG(0x80) +#define S3C2410_RTCMON S3C2410_RTCREG(0x84) +#define S3C2410_RTCYEAR S3C2410_RTCREG(0x88)#endif /* __ASM_ARCH_REGS_RTC_H */
Signature · 1 line
1.7.5.4
PATCH 2/4 rtc-s3c: make room for more variants in devicetree block
In reply to Heiko StübnerUse the data field of of_device_id to hold the type for s3c_cpu_type.
--- drivers/rtc/rtc-s3c.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-)
drivers/rtc/rtc-s3c.c +21 -6
@@ -428,11 +428,18 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)return 0 ; } +#ifdef CONFIG_OF +static const struct of_device_id s3c_rtc_dt_match[]; +#endif +static int __devinit s3c_rtc_probe (struct platform_device *pdev) {struct rtc_device *rtc;struct rtc_time rtc_tm;struct resource *res; +#ifdef CONFIG_OF +const struct of_device_id *match; +#endif int ret;pr_debug ("%s: probe=%p\n" , __func__, pdev);
@@ -509,12 +516,15 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) }#ifdef CONFIG_OF -if (pdev->dev.of_node) - s3c_rtc_cpu_type =of_device_is_compatible (pdev->dev.of_node, -"samsung,s3c6410-rtc" ) ?TYPE_S3C64XX :TYPE_S3C2410 ; - else +if (pdev->dev.of_node) { + match =of_match_node (s3c_rtc_dt_match, pdev->dev.of_node); + s3c_rtc_cpu_type = match->data; + }else {#endif s3c_rtc_cpu_type =platform_get_device_id (pdev)->driver_data; +#ifdef CONFIG_OF + } +#endif /* Check RTC Time */
@@ -638,8 +648,13 @@ static int s3c_rtc_resume(struct platform_device *pdev)#ifdef CONFIG_OF static const struct of_device_id s3c_rtc_dt_match[] = { - { .compatible ="samsung,s3c2410-rtc" }, - { .compatible ="samsung,s3c6410-rtc" }, + { + .compatible ="samsung,s3c2410-rtc" + .data =TYPE_S3C2410 , + }, { + .compatible ="samsung,s3c6410-rtc" + .data =TYPE_S3C64XX , + }, {}, };MODULE_DEVICE_TABLE (of, s3c_rtc_dt_match);
Signature · 1 line
1.7.5.4
PATCH 3/4 rtc-s3c: add variants for S3C2443 and S3C2416
In reply to Heiko StübnerEspecially the TICNT registers are different from the two rtc types that currently exists.
--- arch/arm/plat-samsung/include/plat/regs-rtc.h | 24 +++++++++++++ drivers/rtc/rtc-s3c.c | 44 ++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 4 deletions(-)
arch/arm/plat-samsung/include/plat/regs-rtc.h +24 -0
@@ -23,14 +23,33 @@#define S3C2410_RTCCON_CLKSEL (1 << 1)#define S3C2410_RTCCON_CNTSEL (1 << 2)#define S3C2410_RTCCON_CLKRST (1 << 3) +#define S3C2443_RTCCON_TICSEL (1 << 4)#define S3C64XX_RTCCON_TICEN (1 << 8)#define S3C64XX_RTCCON_TICMSK (0xF << 7)#define S3C64XX_RTCCON_TICSHT (7) +#define S3C2416_RTCCON_TICMSK (0x1F << 7) +#define S3C2410_TICNT S3C2410_RTCREG(0x44)#define S3C2410_TICNT_ENABLE (1 << 7) +/* S3C2443: tick count is 15 bit wide +* TICNT[6:0] contains upper 7 bits +* TICNT1[7:0] contains lower 8 bits +*/ +#define S3C2443_TICNT_PART (x) ((x & 0x7f00) >> 8) +#define S3C2443_TICNT1 S3C2410_RTCREG(0x4C) +#define S3C2443_TICNT1_PART (x) (x & 0xff) + +/* S3C2416: tick count is 32 bit wide +* TICNT[6:0] contains bits [14:8] +* TICNT1[7:0] contains lower 8 bits +* TICNT2[16:0] contains upper 17 bits +*/ +#define S3C2416_TICNT2 S3C2410_RTCREG(0x48) +#define S3C2416_TICNT2_PART (x) ((x & 0xffff8000) >> 15) +#define S3C2410_RTCALM S3C2410_RTCREG(0x50)#define S3C2410_RTCALM_ALMEN (1 << 6)#define S3C2410_RTCALM_YEAREN (1 << 5)
@@ -63,4 +82,9 @@#define S3C2410_RTCMON S3C2410_RTCREG(0x84)#define S3C2410_RTCYEAR S3C2410_RTCREG(0x88) +#define S3C2443_TICKCNT S3C2410_RTCREG(0x90) + +#define S3C2443_RTCLBAT S3C2410_RTCREG(0x94) +#define S3C2443_RTCLBAT_CLEAR (1 << 0) +#endif /* __ASM_ARCH_REGS_RTC_H */
drivers/rtc/rtc-s3c.c +40 -4
100 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH 4/4 ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices
In reply to Heiko StübnerAs the S3C24xx SoCs use the same rtc device a renaming capability like in the adc driver is necessary.
This patch adds a s3c_rtc_setname function and names the rtc devices for S3C2443 and S3C2416 accordingly.
--- arch/arm/mach-s3c2416/s3c2416.c | 2 + arch/arm/mach-s3c2443/s3c2443.c | 2 + arch/arm/plat-samsung/include/plat/rtc-core.h | 27 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-samsung/include/plat/rtc-core.h
arch/arm/mach-s3c2416/s3c2416.c +2 -0
@@ -61,6 +61,7 @@#include <plat/fb-core.h> #include <plat/nand-core.h> #include <plat/adc-core.h> +#include <plat/rtc-core.h> static struct map_desc s3c2416_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -99,6 +100,7 @@ int __init s3c2416_init(void)s3c_fb_setname ("s3c2443-fb" );s3c_adc_setname ("s3c2416-adc" ); +s3c_rtc_setname ("s3c2416-rtc" );#ifdef CONFIG_PM register_syscore_ops (&s3c2416_pm_syscore_ops);
arch/arm/mach-s3c2443/s3c2443.c +2 -0
@@ -42,6 +42,7 @@#include <plat/fb-core.h> #include <plat/nand-core.h> #include <plat/adc-core.h> +#include <plat/rtc-core.h> static struct map_desc s3c2443_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -72,6 +73,7 @@ int __init s3c2443_init(void)s3c_fb_setname ("s3c2443-fb" );s3c_adc_setname ("s3c2443-adc" ); +s3c_rtc_setname ("s3c2443-rtc" );/* change WDT IRQ number */ s3c_device_wdt.resource[1 ].start =IRQ_S3C2443_WDT ;
arch/arm/plat-samsung/include/plat/rtc-core.h new file +27 -0
@@ -0,0 +1,27 @@ +/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h +* +* Copyright (c) 2011 Heiko Stuebner <[email protected]> +* +* Samsung RTC Controller core functions +* +* 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. +*/ + +#ifndef __ASM_PLAT_RTC_CORE_H +#define __ASM_PLAT_RTC_CORE_H __FILE__ + +/* These functions are only for use with the core support code, such as +* the cpu specific initialisation code +*/ + +/* re-define device name depending on support. */ +static inline void s3c_rtc_setname (char *name) +{ +#if defined(CONFIG_SAMSUNG_DEV_RTC ) || defined(CONFIG_PLAT_S3C24XX ) + s3c_device_rtc.name = name; +#endif +} + +#endif /* __ASM_PLAT_RTC_CORE_H */
Signature · 1 line
1.7.5.4
PATCH 2/4 rtc-s3c: make room for more variants in devicetree block
In reply to Heiko StübnerHi Heiko,
Quoted 13 lines · Heiko St?bner
Use the data field of
of_device_idto hold the type fors3c_cpu_type.Signed-off-by Heiko Stuebner <[email protected]>---
?drivers/rtc/rtc-s3c.c | ? 27 +++++++++++++++++++++------ ?1 files changed, 21 insertions(+), 6 deletions(-)drivers/rtc/rtc-s3c.c +0
-0
drivers/rtc/rtc-s3c.c static int __devexit s3c_rtc_remove(struct platform_device *dev) · line 430
Quoted 3 lines
drivers/rtc/rtc-s3c.c +0
-0@@ -428,11 +428,18 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev) ? ? ? ?return 0; ?}
This patch looks fine but the number of #ifdef's can be reduced in this patch as below.
static const struct of_device_id s3c_rtc_dt_match[];
static inline int s3c_rtc_get_driver_data(struct platfrom_device *pdev) {
#ifdef CONFIG_OF
if (pdev->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
return match->data;
}
#endif
return platform_get_device_id(pdev)->driver_data;
}drivers/rtc/rtc-s3c.c static int __devexit s3c_rtc_remove(struct platform_device *dev) · line 442
Quoted 12 lines
drivers/rtc/rtc-s3c.c +7
-0+#ifdef CONFIG_OF +static const struct of_device_id s3c_rtc_dt_match[]; +#endif + ?static int __devinit s3c_rtc_probe(struct platform_device *pdev) ?{ ? ? ? ?struct rtc_device *rtc; ? ? ? ?struct rtc_time rtc_tm; ? ? ? ?struct resource *res; +#ifdef CONFIG_OF + ? ? ? const struct of_device_id *match; +#endif
*match not required here.
Quoted 17 lines
drivers/rtc/rtc-s3c.c +0
-0? ? ? ?int ret; ? ? ? ?pr_debug("%s: probe=%p\n", __func__, pdev);@@ -509,12 +516,15 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) ? ? ? ?}?#ifdef
CONFIG_OF
- ? ? ? if (pdev->dev.of_node)
- ? ? ? ? ? ? ?s3c_rtc_cpu_type= of_device_is_compatible(pdev->dev.of_node,
- ? ? ? ? ? ? ? ? ? ? ? "samsung,s3c6410-rtc") ?TYPE_S3C64XX:TYPE_S3C2410;
- ? ? ? else
+ ? ? ? if (pdev->dev.of_node) {
+ ? ? ? ? ? ? ? match =of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
+ ? ? ? ? ? ? ?s3c_rtc_cpu_type=match->data;
+ ? ? ? } else {
?#endif
? ? ? ? ? ? ? ?s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
drivers/rtc/rtc-s3c.c static int __devexit s3c_rtc_remove(struct platform_device *dev) · line 433
Quoted 3 lines
drivers/rtc/rtc-s3c.c +3
-0+#ifdef CONFIG_OF + ? ? ? } +#endif
This gets replaced with
s3c_rtc_cpu_type = s3c_rtc_get_driver_data(pdev);
Quoted 13 lines
? ? ? ?/* Check RTC Time */
drivers/rtc/rtc-s3c.c +0
-0@@ -638,8 +648,13 @@ static int s3c_rtc_resume(struct platform_device *pdev)?#ifdef
CONFIG_OF
?static const structof_device_ids3c_rtc_dt_match[] = {
- ? ? ? { .compatible = "samsung,s3c2410-rtc" },
- ? ? ? { .compatible = "samsung,s3c6410-rtc" },
+ ? ? ? {
+ ? ? ? ? ? ? ? .compatible = "samsung,s3c2410-rtc"
+ ? ? ? ? ? ? ? .data =TYPE_S3C2410,
+ ? ? ? }, {
Quoted 9 lines
+ ? ? ? ? ? ? ? .compatible = "samsung,s3c6410-rtc"
+ ? ? ? ? ? ? ? .data =TYPE_S3C64XX,
+ ? ? ? },
? ? ? ?{},
?};
?MODULE_DEVICE_TABLE(of,s3c_rtc_dt_match); --
1.7.5.4
Patch looks fine except the #ifdef's which can be reduced.
Regards,
Thomas.
PATCH 3/4 rtc-s3c: add variants for S3C2443 and S3C2416
In reply to Heiko StübnerQuoted 91 lines · Heiko St?bner
Especially the TICNT registers are different from the two rtc types that currently exists.
Signed-off-by Heiko Stuebner <[email protected]>---
?arch/arm/plat-samsung/include/plat/regs-rtc.h | ? 24 +++++++++++++ ?drivers/rtc/rtc-s3c.c ? ? ? ? ? ? ? ? ? ? ? ? | ? 44 ++++++++++++++++++++++-- ?2 files changed, 64 insertions(+), 4 deletions(-)arch/arm/plat-samsung/include/plat/regs-rtc.h +24
-0@@ -23,14 +23,33 @@ ?#define S3C2410_RTCCON_CLKSEL ?(1 << 1) ?#define S3C2410_RTCCON_CNTSEL ?(1 << 2) ?#define S3C2410_RTCCON_CLKRST ?(1 << 3) +#define S3C2443_RTCCON_TICSEL ?(1 << 4) ?#define S3C64XX_RTCCON_TICEN ? (1 << 8) ?#define S3C64XX_RTCCON_TICMSK ?(0xF << 7) ?#define S3C64XX_RTCCON_TICSHT ?(7) +#define S3C2416_RTCCON_TICMSK ?(0x1F << 7) + ?#define S3C2410_TICNT ? ? ? ? ?S3C2410_RTCREG(0x44) ?#define S3C2410_TICNT_ENABLE ? (1 << 7) +/* S3C2443: tick count is 15 bit wide +* TICNT[6:0] contains upper 7 bits +* TICNT1[7:0] contains lower 8 bits +*/ +#define S3C2443_TICNT_PART (x) ?((x & 0x7f00) >> 8) +#define S3C2443_TICNT1 ? ? ? ? S3C2410_RTCREG(0x4C) +#define S3C2443_TICNT1_PART (x) (x & 0xff) + +/* S3C2416: tick count is 32 bit wide +* TICNT[6:0] contains bits [14:8] +* TICNT1[7:0] contains lower 8 bits +* TICNT2[16:0] contains upper 17 bits +*/ +#define S3C2416_TICNT2 ? ? ? ? S3C2410_RTCREG(0x48) +#define S3C2416_TICNT2_PART (x) ((x & 0xffff8000) >> 15) + ?#define S3C2410_RTCALM ? ? ? ? S3C2410_RTCREG(0x50) ?#define S3C2410_RTCALM_ALMEN ? (1 << 6) ?#define S3C2410_RTCALM_YEAREN ?(1 << 5)@@ -63,4 +82,9 @@ ?#define S3C2410_RTCMON ? ? ? ? S3C2410_RTCREG(0x84) ?#define S3C2410_RTCYEAR ? ? ? ? ? ? ? ?S3C2410_RTCREG(0x88) +#define S3C2443_TICKCNT ? ? ? ? ? ? ? ?S3C2410_RTCREG(0x90) + +#define S3C2443_RTCLBAT ? ? ? ? ? ? ? ?S3C2410_RTCREG(0x94) +#define S3C2443_RTCLBAT_CLEAR ?(1 << 0) +?#endif /*
__ASM_ARCH_REGS_RTC_H*/drivers/rtc/rtc-s3c.c +6
-2@@ -35,6 +35,8 @@ ?enum s3c_cpu_type { ? ? ? ?TYPE_S3C2410, + ? ? ? TYPE_S3C2443, + ? ? ? TYPE_S3C2416, ? ? ? ?TYPE_S3C64XX, ?};@@ -132,6 +134,7 @@ static int s3c_rtc_setfreq(struct device *dev, int freq) ? ? ? ?struct platform_device *pdev = to_platform_device(dev); ? ? ? ?struct rtc_device *rtc_dev = platform_get_drvdata(pdev); ? ? ? ?unsigned int tmp = 0; + ? ? ? int val; ? ? ? ?if (!is_power_of_2(freq)) ? ? ? ? ? ? ? ?return -EINVAL;@@ -139,12 +142,23 @@ static int s3c_rtc_setfreq(struct device *dev, int freq) ? ? ? ?clk_enable(rtc_clk); ? ? ? ?spin_lock_irq(&s3c_rtc_pie_lock); - ? ? ? if (s3c_rtc_cpu_type == TYPE_S3C2410) { + ? ? ? if (s3c_rtc_cpu_type != TYPE_S3C64XX) { ? ? ? ? ? ? ? ?tmp = readb(s3c_rtc_base + S3C2410_TICNT); ? ? ? ? ? ? ? ?tmp &= S3C2410_TICNT_ENABLE; ? ? ? ?} - ? ? ? tmp |= (rtc_dev->max_user_freq / freq)-1; + ? ? ? val = (rtc_dev->max_user_freq / freq) - 1; +
drivers/rtc/rtc-s3c.c static int s3c_rtc_setfreq(struct device *dev, int freq) · line 161
Quoted 10 lines
drivers/rtc/rtc-s3c.c +10
-0+ ? ? ? if (s3c_rtc_cpu_type == TYPE_S3C2443) { + ? ? ? ? ? ? ? tmp |= S3C2443_TICNT_PART(val); + ? ? ? ? ? ? ? writel(S3C2443_TICNT1_PART(val), s3c_rtc_base + S3C2443_TICNT1); + ? ? ? } else if (s3c_rtc_cpu_type == TYPE_S3C2416) { + ? ? ? ? ? ? ? tmp |= S3C2443_TICNT_PART(val); + ? ? ? ? ? ? ? writel(S3C2443_TICNT1_PART(val), s3c_rtc_base + S3C2443_TICNT1); + ? ? ? ? ? ? ? writel(S3C2416_TICNT2_PART(val), s3c_rtc_base + S3C2416_TICNT2); + ? ? ? } else { + ? ? ? ? ? ? ? tmp |= val; + ? ? ? }
Can this be changed to:
if (s3c_rtc_cpu_type == TYPE_S3C2443 || (s3c_rtc_cpu_type == TYPE_S3C2416) {
tmp |= S3C2443_TICNT_PART(val);
writel(S3C2443_TICNT1_PART(val), s3c_rtc_base + S3C2443_TICNT1);
if (s3c_rtc_cpu_type == TYPE_S3C2416)
writel(S3C2416_TICNT2_PART(val), s3c_rtc_base + S3C2416_TICNT2);
} else {
tmp |= val;
}Quoted 69 lines
drivers/rtc/rtc-s3c.c +3
-1? ? ? ?writel(tmp, s3c_rtc_base + S3C2410_TICNT); ? ? ? ?spin_unlock_irq(&s3c_rtc_pie_lock);@@ -371,7 +385,9 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en) ? ? ? ? ? ? ? ?tmp &= ~S3C2410_RTCCON_RTCEN; ? ? ? ? ? ? ? ?writew(tmp, base + S3C2410_RTCCON); - ? ? ? ? ? ? ? if (s3c_rtc_cpu_type == TYPE_S3C2410) { + ? ? ? ? ? ? ? if (s3c_rtc_cpu_type == TYPE_S3C2410 || + ? ? ? ? ? ? ? ? ? s3c_rtc_cpu_type == TYPE_S3C2443 || + ? ? ? ? ? ? ? ? ? s3c_rtc_cpu_type == TYPE_S3C2416) { ? ? ? ? ? ? ? ? ? ? ? ?tmp = readb(base + S3C2410_TICNT); ? ? ? ? ? ? ? ? ? ? ? ?tmp &= ~S3C2410_TICNT_ENABLE; ? ? ? ? ? ? ? ? ? ? ? ?writeb(tmp, base + S3C2410_TICNT);@@ -441,6 +457,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) ? ? ? ?const struct of_device_id *match;?#endif
? ? ? ?int ret;
+ ? ? ? int tmp;? ? ? ?pr_debug("%s: probe=%p\n",
__func__, pdev);drivers/rtc/rtc-s3c.c +1
-1@@ -543,11 +560,18 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) ? ? ? ? ? ? ? ?dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n"); ? ? ? ?} - ? ? ? if (s3c_rtc_cpu_type == TYPE_S3C64XX) + ? ? ? if (s3c_rtc_cpu_type != TYPE_S3C2410) ? ? ? ? ? ? ? ?rtc->max_user_freq = 32768;? ? ? ?else
? ? ? ? ? ? ? ?rtc->max_user_freq = 128;+ ? ? ? if (
s3c_rtc_cpu_type==TYPE_S3C2443||
+ ? ? ? ? ? ?s3c_rtc_cpu_type ==TYPE_S3C2416) {
+ ? ? ? ? ? ? ? tmp =readw(s3c_rtc_base + S3C2410_RTCCON);
+ ? ? ? ? ? ? ? tmp |=S3C2443_RTCCON_TICSEL;
+ ? ? ? ? ? ? ?writew(tmp, s3c_rtc_base + S3C2410_RTCCON);
+ ? ? ? }
+
? ? ? ?platform_set_drvdata(pdev, rtc);? ? ? ?s3c_rtc_setfreq(&pdev->dev, 1);
drivers/rtc/rtc-s3c.c +0
-0@@ -652,6 +676,12 @@ static const struct of_device_id s3c_rtc_dt_match[] = {? ? ? ? ? ? ? ?.compatible = "samsung,s3c2410-rtc" ? ? ? ? ? ? ? ?.data =
TYPE_S3C2410,
? ? ? ?}, {
+ ? ? ? ? ? ? ? .compatible = "samsung,s3c2443-rtc"
+ ? ? ? ? ? ? ? .data =TYPE_S3C2443,
+ ? ? ? }, {
+ ? ? ? ? ? ? ? .compatible = "samsung,s3c2416-rtc"
+ ? ? ? ? ? ? ? .data =TYPE_S3C2416,
+ ? ? ? }, {
? ? ? ? ? ? ? ?.compatible = "samsung,s3c6410-rtc" ? ? ? ? ? ? ? ?.data =TYPE_S3C64XX,
? ? ? ?},drivers/rtc/rtc-s3c.c +6
-1@@ -667,6 +697,12 @@ static struct platform_device_id s3c_rtc_driver_ids[] = { ? ? ? ? ? ? ? ?.name ? ? ? ? ? = "s3c2410-rtc", ? ? ? ? ? ? ? ?.driver_data ? ?= TYPE_S3C2410, ? ? ? ?}, { + ? ? ? ? ? ? ? .name ? ? ? ? ? = "s3c2443-rtc", + ? ? ? ? ? ? ? .driver_data ? ?= TYPE_S3C2443, + ? ? ? }, { + ? ? ? ? ? ? ? .name ? ? ? ? ? = "s3c2416-rtc", + ? ? ? ? ? ? ? .driver_data ? ?= TYPE_S3C2416, + ? ? ? }, { ? ? ? ? ? ? ? ?.name ? ? ? ? ? = "s3c64xx-rtc", ? ? ? ? ? ? ? ?.driver_data ? ?= TYPE_S3C64XX, ? ? ? ?}, --
Quoted 1 line
1.7.5.4
Reviewed device tree related changes in this patch.
Regards,
Thomas.
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
PATCH 2/4 rtc-s3c: make room for more variants in devicetree block
In reply to Thomas AbrahamHi Thomas,
thanks for your review and you are of course right with both your suggestions. I will submit a v2 series shortly, implementing these suggestions.
Heiko
Am Sonntag, 11. Dezember 2011, 06:47:43 schrieb Thomas Abraham:
Quoted 103 lines
Hi Heiko,
Quoted 13 lines · Heiko St?bner
Use the data field of
of_device_idto hold the type fors3c_cpu_type.Signed-off-by Heiko Stuebner <[email protected]>--- drivers/rtc/rtc-s3c.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-)drivers/rtc/rtc-s3c.c +0
-0drivers/rtc/rtc-s3c.c static int __devexit s3c_rtc_remove(struct · line 429
Quoted 2 lines
drivers/rtc/rtc-s3c.c +0
-0@@ -428,11 +428,18 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev) return 0; }This patch looks fine but the number of #ifdef's can be reduced in this patch as below.
static const struct
of_device_ids3c_rtc_dt_match[];static inline int
s3c_rtc_get_driver_data(struct platfrom_device *pdev){#ifdef CONFIG_OF if (pdev->dev.of_node) { const struct of_device_id *match; match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node); return match->data; } #endif return platform_get_device_id(pdev)->driver_data; }drivers/rtc/rtc-s3c.c static int __devexit s3c_rtc_remove(struct platform_device *dev) · line 442
Quoted 12 lines
drivers/rtc/rtc-s3c.c +7
-0+#ifdef CONFIG_OF +static const struct of_device_id s3c_rtc_dt_match[]; +#endif +static int __devinit s3c_rtc_probe (struct platform_device *pdev) {struct rtc_device *rtc;struct rtc_time rtc_tm;struct resource *res; +#ifdef CONFIG_OF +const struct of_device_id *match; +#endif *match not required here.
Quoted 18 lines
drivers/rtc/rtc-s3c.c +0
-2int ret;pr_debug ("%s: probe=%p\n" , __func__, pdev);@@ -509,12 +516,15 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) }#ifdef CONFIG_OF -if (pdev->dev.of_node) - s3c_rtc_cpu_type =of_device_is_compatible(pdev->dev.of_node, -
"samsung,s3c6410-rtc") ?TYPE_S3C64XX:TYPE_S3C2410; - elsedrivers/rtc/rtc-s3c.c +2
-0+if (pdev->dev.of_node) { + match = of_match_node(s3c_rtc_dt_match,
pdev->dev.of_node); +s3c_rtc_cpu_type=match->data;
+ } else {#endif s3c_rtc_cpu_type =platform_get_device_id(pdev)->driver_data; +#ifdef
CONFIG_OFdrivers/rtc/rtc-s3c.c static int __devinit s3c_rtc_probe(struct platform_device *pdev) · line 527
Quoted 2 lines
drivers/rtc/rtc-s3c.c +2
-0+ } +#endif This gets replaced with
s3c_rtc_cpu_type = s3c_rtc_get_driver_data(pdev);Quoted 18 lines
/* Check RTC Time */drivers/rtc/rtc-s3c.c +7
-2@@ -638,8 +648,13 @@ static int s3c_rtc_resume(struct platform_device *pdev)#ifdef CONFIG_OF static const struct of_device_id s3c_rtc_dt_match[] = { - { .compatible ="samsung,s3c2410-rtc" }, - { .compatible ="samsung,s3c6410-rtc" }, + { + .compatible ="samsung,s3c2410-rtc" + .data =TYPE_S3C2410 , + }, { + .compatible ="samsung,s3c6410-rtc" + .data =TYPE_S3C64XX , + }, {}, };Quoted 3 lines
MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
--
1.7.5.4Patch looks fine except the #ifdef's which can be reduced.
Reviewed-by Thomas Abraham <[email protected]>Regards,
Thomas.