(Resubmit) ADD ARM AMBA PL031 RTC Support
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
This patch adds support to arm amba pl031 rtc chip.
User needs to define 3 variables in board config to make use of this driver & needs to call rtc_init in order to start rtc.
#define CONFIG_RTC_PL031 1 /* use ARM AMBA PL031 RTC */ #define CFG_RTC_PL031_BASE 0x101e8000 /* RTC Registers Base Address */
and
#define CONFIG_CMD_DATE
Call rtc_init from <board>.c to start the rtc as below
#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE) rtc_init();
#endif
Comments are welcome.
Also,
I used below command to generate the diff.
It says that 31 files have changed in this directory whereas only 1 files is changed and 1 file is added.
Kindly help me to correct the same. Right now i have manually changed it in the patch file.
$ git-diff -p --summary --stat u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc/
Regards
Gururaja
Signed off by: Gururaja Hebbar <[email protected]>
- Add support to the ARM AMBA PL031 RTC Chip.
- remove the call to rtc_init from lib_arm/board.c boot sequence as per wd advice.
- check for pl031 rtc initialization. Initialize if it hasnt yet.
{u-boot-1.3.3 => uboot}/drivers/rtc/Makefile | 1 +
/dev/null => uboot/drivers/rtc/rtc_pl031.c | 121
+++++++++++++++++++++
2 files changed, 122 insertions(+), 0 deletions(-)
create mode 100644 uboot/drivers/rtc/rtc_pl031.c(quoted diff) +0 -0
b/uboot/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
uboot/drivers/rtc/Makefile renamed from u-boot-1.3.3/drivers/rtc/Makefile +1 -0
@@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
uboot/drivers/rtc/rtc_pl031.c new file +43 -0
43 lines not on this page · raw message
register */
+#define RTC_RIS 0x14 /* Raw interrupt status register
*/
+#define RTC_MIS 0x18 /* Masked interrupt status
register */
+#define RTC_ICR 0x1c /* Interrupt clear register */
+
+#define RTC_CR_MIE (1 << 0)
+
+#define RTC_WRITE_REG(addr, val) (*(volatile unsigned int
*)(CFG_RTC_PL031_BASE + (addr)) = (val))
+#define RTC_READ_REG(addr) (*(volatile unsigned int
*)(CFG_RTC_PL031_BASE + (addr)))
+
+static int pl031_initted = 0;
+
+/* Enable RTC Start in Control register*/ +void rtc_init(void)
+{
+ RTC_WRITE_REG(RTC_CR,RTC_CR_MIE);
+
+ pl031_initted = 1;
+}
+
+/*
+ * Reset the RTC. We set the date back to 1970-01-01.
+ */
+void rtc_reset(void)
+{
+ RTC_WRITE_REG(RTC_LR,0x00);
+ if(!pl031_initted)
+ rtc_init();
+}
+
+/*
+ * Set the RTC
+*/
+void rtc_set(struct rtc_time *tmp)
+{
+ unsigned long tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error setting the date/time\n");
+ return;
+ }
+
+ /* Calculate number of seconds this incoming time represents */
+ tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ RTC_WRITE_REG(RTC_LR,tim);
+}
+
+/*
+ * Get the current time from the RTC
+ */
+int rtc_get(struct rtc_time *tmp)
+{
+ ulong tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error getting the date/time\n");
+ return -1;
+ }
+
+ tim = RTC_READ_REG(RTC_DR);
+
+ to_tm (tim, tmp);
+
+ debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME:
%2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ return 0;
+}
+
+#endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add_arm_amba_pl031_rtc_v2.patch
Type: application/octet-stream
Size: 3816 bytes
Desc: add_arm_amba_pl031_rtc_v2.patch
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080717/6f2abf79/attachment.obj
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
First your patch is line wrapped by your mailler. Secondly please be care ful of the 80 chars limits and the whitespace.
Are you going to add a board which will use it?
Best Regards,
J.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTCSupport
Quoted 2 lines
Quoted 2 lines
From: Jean-Christophe PLAGNIOL-VILLARD
Subject: Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031
RTCSupport
Quoted 1 line
Quoted 1 line
Hi,
Hello
Quoted 1 line
Quoted 1 line
First your patch is line wrapped by your mailler.
That's why i had also attached the respective patch file. that i generated using git-diff command.
Quoted 2 lines
Quoted 2 lines
Secondly please be care ful of the 80 chars limits and the whitespace.
Regarding the white space, i am little confused abt this as i couldn't find it in my patch.
can u please let me know where it exists.
Quoted 1 line
Quoted 1 line
Are you going to add a board which will use it?
Right now i am using it on arm Versatile board. Should i send a patch to that also
Regards
Gururaja
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTCSupport
Hi,
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Are you going to add a board which will use it?
Right now i am using it on arm Versatile board. Should i send a
patch
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
to that also
If you do I can test it
Regards
Peter
Please find attached my changes to arm versatile config & board file to enable rtc module
This is for test only. If you find it acceptable then i will send a final patch.
Comments are welcome.
TIA
Regards
Gururaja
-------------- next part --------------
A non-text attachment was scrubbed...
Name: update_versatile_config_to_include_pl031_rtc_module.patch
Type: application/octet-stream
Size: 703 bytes
Desc: update_versatile_config_to_include_pl031_rtc_module.patch
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080721/23bcbef0/attachment.obj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add_pl031_rtc_init_func.patch
Type: application/octet-stream
Size: 886 bytes
Desc: add_pl031_rtc_init_func.patch
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080721/23bcbef0/attachment-0001.obj
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTCSupport
Quoted 12 lines · Gururaja Hebbar K R
Hi,
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Are you going to add a board which will use it?
Right now i am using it on arm Versatile board. Should i send apatch
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
to that also
If you do I can test it
Regards
Peter
Could you please send your patch as inline, otherwise it's really difficult to comment
use git-send-email as example
and also please read this http://www.denx.de/wiki/UBoot/Patches
and http://lwn.net/Articles/139918/
Best Regads,
J.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi j,
Quoted 1 line
Quoted 1 line
Could you please send your patch as inline, otherwise it's really
difficult to comment use git-send-email as example
Quoted 2 lines
Quoted 2 lines
and also please read this http://www.denx.de/wiki/UBoot/Patches
and http://lwn.net/Articles/139918/
Sorry for the whitespace mistakes. i have now corrected it.
But regarding sending patch inline i am finding it very difficult. I am using MS Off Outlook to send patches to uboot and other mailing lists. I also pasted the same code that i copied from patch files to the mail. Since i think it wraps and creates other issues, i am attaching the patch that i generated using " diff -purN ".
Since our proxy server has some issue, i am not to clone from uboot git server. So here is the thing.
I have downloaded uboot-1.3.3.tar.bz2 and extracted to local system. I have copied to the same to a diff directory on which i work.
so,
u-boot-1.3.3/ ---> original unmodified source
uboot/ ---> modified source
I take a diff of these two folders and send it as patch. Now from past few days i am trying to use git to create and send patch to mailing list.
Here is what i do,
1. 1st i tried diff -purN u-boot-1.3.3/drivers/rtc uboot/drivers/rtc/ > new_pl031_rtc_drvr.patch to create a well known patch creation command
2. then i tried git-diff -p --summary --stat
u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc > new_pl031_rtc_drvr_v2.patch to create another patch.
Both didnt have match difference except the 2nd give me few more info. I sent 2 mail to uboot mailing list, each time picking patch from each step and also pasting from the patch file
3. Now i tried git-format-patch
$ git-format-patch.exe u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc/ fatal: Not a git repository
So kindly know how to solve this.
Regards
Gururaja
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
I think nabble wont truncate or line wrap my mail. So i am giving it a try.
I have added changes required for versatile board to call rtc_init &
defines in include/configs/versatile.h to include pl031 rtc definitions
Kindly comment
TIA
Regards
Gururaja
- Add ARM AMBA PL031 RTC Support
- Call rtc_init function to start pl031 rtc if enabled from versatile.c
- Define rtc base address and date command support in versatile.h
drivers/rtc/Makefile +1 -0
@@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/rtc/rtc_pl031.c new file +50 -0
50 lines not on this page · raw message
*)(CFG_RTC_PL031_BASE + (addr)) = (val))
+#define RTC_READ_REG(addr) (*(volatile unsigned int *)(CFG_RTC_PL031_BASE
+ (addr)))
+
+static int pl031_initted = 0;
+
+/* Enable RTC Start in Control register*/ +void rtc_init(void)
+{
+ RTC_WRITE_REG(RTC_CR,RTC_CR_START);
+
+ pl031_initted = 1;
+}
+
+/*
+ * Reset the RTC. We set the date back to 1970-01-01.
+ */
+void rtc_reset(void)
+{
+ RTC_WRITE_REG(RTC_LR,0x00);
+ if(!pl031_initted)
+ rtc_init();
+}
+
+/*
+ * Set the RTC
+*/
+void rtc_set(struct rtc_time *tmp)
+{
+ unsigned long tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error setting the date/time\n");
+ return;
+ }
+
+ /* Calculate number of seconds this incoming time represents */
+ tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ RTC_WRITE_REG(RTC_LR,tim);
+}
+
+/*
+ * Get the current time from the RTC
+ */
+int rtc_get(struct rtc_time *tmp)
+{
+ ulong tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error getting the date/time\n");
+ return -1;
+ }
+
+ tim = RTC_READ_REG(RTC_DR);
+
+ to_tm (tim, tmp);
+
+ debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ return 0;
+}
+
+#endif
Signature · 1 line
1.5.5.1
board/versatile/versatile.c +9 -0
@@ -41,6 +41,10 @@ void flash__init (void);void ether__init (void );void peripheral_power_enable (void ); +#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +extern int rtc_init (void ); +#endif +#if defined(CONFIG_SHOW_BOOT_PROGRESS )void show_boot_progress (int progress) {
@@ -84,6 +88,11 @@ int board_init (void)flash__init ();ether__init (); + +#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +rtc_init (); +#endif +return 0 ; }
include/configs/versatile.h +7 -0
@@ -96,6 +96,12 @@#define CFG_SERIAL0 0x101F1000#define CFG_SERIAL1 0x101F2000 +/* +* RTC configuration +*/ +#define CONFIG_RTC_PL031 1/* use ARM AMBA PL031 RTC */ +#define CFG_RTC_PL031_BASE 0x101e8000 +/* * Command line configuration.
@@ -110,6 +116,7 @@#define CONFIG_CMD_FLASH #define CONFIG_CMD_ENV +#define CONFIG_CMD_DATE /* * BOOTP options
Signature · 10 lines
1.5.5.1 Regards Gururaja -- View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-tp18499969p18582594.html Sent from the Uboot - Users mailing list archive at Nabble.com.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Quoted 2 lines · In message <[email protected]> you wrote:
I think nabble wont truncate or line wrap my mail. So i am giving it a try.
Don't think - test before sending to public mailing lists.
...
Quoted 2 lines
+#define
RTC_WRITE_REG(addr, val)(*(volatile unsigned int
*)(CFG_RTC_PL031_BASE + (addr)) = (val))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Line wrapped. Unusable.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is common sense to take a method and try it. If it fails, admit it
frankly and try another. But above all, try something.
- Franklin D. RooseveltPATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
Sorry for that.
Now i have generated the patch using below command. Update me if this is not correct
$ git format-patch -p -o ../ -C -M -N --summary --stat=80 --no-color --signoff master workingbranch
TIA
Regards
Gururaja
- Add ARM AMBA PL031 RTC Support
- Call rtc_init function to start pl031 rtc if enabled from versatile.c
- Define rtc base address and date command support in versatile.h
- Coding Style Changes/Updates
--- drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++
drivers/rtc/Makefile +1 -0
@@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/rtc/rtc_pl031.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
1.5.5.1
board/versatile/versatile.c +9 -0
@@ -41,6 +41,10 @@ void flash__init (void);void ether__init (void );void peripheral_power_enable (void ); +#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +extern int rtc_init (void ); +#endif +#if defined(CONFIG_SHOW_BOOT_PROGRESS )void show_boot_progress (int progress) {
@@ -84,6 +88,11 @@ int board_init (void)flash__init ();ether__init (); + +#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +rtc_init (); +#endif +return 0 ; }
include/configs/versatile.h +7 -0
@@ -96,6 +96,12 @@#define CFG_SERIAL0 0x101F1000#define CFG_SERIAL1 0x101F2000 +/* +* RTC configuration +*/ +#define CONFIG_RTC_PL031 1/* use ARM AMBA PL031 RTC */ +#define CFG_RTC_PL031_BASE 0x101e8000 +/* * Command line configuration.
@@ -110,6 +116,7 @@#define CONFIG_CMD_FLASH #define CONFIG_CMD_ENV +#define CONFIG_CMD_DATE /* * BOOTP options
Signature · 6 lines
1.5.5.1 -- View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-tp18499969p18583543.html Sent from the Uboot - Users mailing list archive at Nabble.com.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Quoted 5 lines · In message <[email protected]> you wrote:
Now i have generated the patch using below command. Update me if this is not correct
$ git format-patch -p -o ../ -C -M -N --summary --stat=80 --no-color --signoff master workingbranch
Please move such comments *below* the '---' line. Anything ABOVE '---' will become the commit message that goes into the repository, only stuff below the '---' gets ignores as comment.
Quoted 11 lines
- Add ARM AMBA PL031 RTC Support
- Callrtc_initfunction to start pl031 rtc if enabled fromversatile.c
- Define rtc base address and date command support inversatile.h
- Coding Style Changes/UpdatesSigned-off-by Gururaja Hebbar <[email protected]>--- drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++
So this is actually not a single patch, but TWO:
- the first one adds support for the PL031 RTC (files drivers/rtc/Makefile and drivers/rtc/rtc_pl031.c)
- the second one uses it for the "versatile" board (files board/versatile/versatile.c and include/configs/versatile.h).
So please split your patch and submit as two separate patches.
...
Quoted 4 lines
board/versatile/versatile.c +0
-0
...
Quoted 8 lines
board/versatile/versatile.c +4
-0+#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +extern int rtc_init (void ); +#endif +#if defined(CONFIG_SHOW_BOOT_PROGRESS )void show_boot_progress (int progress) {
board/versatile/versatile.c int board_init (void) · line 94
Quoted 7 lines
board/versatile/versatile.c +4
-0@@ -84,6 +88,11 @@ int board_init (void)flash__init ();ether__init (); + +#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +rtc_init (); +#endif
Why do we need the #ifdef's here? It seems this is a board specific configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de 1 1 was a race-horse, 2 2 was 1 2. When 1 1 1 1 race, 2 2 1 1 2.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
Quoted 2 lines
Please move such comments *below* the '---' line. Anything ABOVE '---' will become the commit message that goes into the repository, only
stuff below the '---' gets ignores as comment.
Yes i will do & re-submit
Quoted 2 lines
Quoted 2 lines
drivers/rtc/Makefile | 1 + drivers/rtc/rtc_pl031.c | 123
+++++++++++++++++++++++++++++++++++++++++++++++
Quoted 4 lines
Quoted 2 lines
board/versatile/versatile.c | 9 +++++++++ include/configs/versatile.h | 7 +++++++So this is actually not a single patch, but TWO:
Peter Pearse & Jean-Christophe PLAGNIOL-VILLARD had asked me to the board details which will be using it.
So i added it here. I already sent a separate Versatile Board Update Only Code to Peter Pearse but not received any update from him.
Quoted 1 line
So please split your patch and submit as two separate patches.
Ok will do that
Quoted 5 lines
drivers/rtc/rtc_pl031.c line 123
Quoted 3 lines
drivers/rtc/rtc_pl031.c new file +3
-0+#if defined(CONFIG_RTC_PL031 ) && defined(CONFIG_CMD_DATE ) +rtc_init (); +#endif Why do we need the #ifdef's here? It seems this is a board specific
configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?
If the user doesn't Need to Use RTC, He can Just disable it from Versatile Board Config file versatile.h. This was my Idea. Isn't it required
Regards
Gururaja
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi,
Quoted 3 lines
Why do we need the #ifdef's here? It seems this is a board specific configuration anyway, i. e. we don't expect for example other RTC chips to be used on this board, or do we?
Also I Just Checked u-boot-1.3.3/board/bc3450/bc3450.c. Even here it has a declaration for RTC @ line 47
#ifdef CONFIG_RTC_MPC5200
#include <rtc.h>
#endif
@ line 371
#ifdef CONFIG_RTC_MPC5200 struct rtc_time t; /* set to Wed Dec 31 19:00:00 1969 */ t.tm_sec = t.tm_min = 0; t.tm_hour = 19; t.tm_mday = 31; t.tm_mon = 12; t.tm_year = 1969; t.tm_wday = 3; rtc_set(&t);
#endif /* CONFIG_RTC_MPC5200 */
So i think its correct. Please Update me if i am wrong
Regards
Gururaja
Signature · 2 lines
View this message in context: http://www.nabble.com/-PATCH--%28Resubmit%29-ADD-ARM-AMBA-PL031-RTC-Support-tp18499969p18767539.html Sent from the Uboot - Users mailing list archive at Nabble.com.
PATCH 1/1 (Resubmit) ADD ARM AMBA PL031 RTCSupport
In reply to Jean-Christophe PLAGNIOL-VILLARDHi j,
Could you please reply so that i can submit a reformatted patch if required.
Quoted 1 line
Quoted 1 line
First your patch is line wrapped by your mailler.
That's why i had also attached the respective patch file. that i generated using git-diff command.
Quoted 2 lines
Quoted 2 lines
Secondly please be care ful of the 80 chars limits and the whitespace.
Regarding the white space, i am little confused abt this as i couldn't find it in my patch.
can u please let me know where it exists.
Quoted 1 line
Quoted 1 line
Are you going to add a board which will use it?
Right now i am using it on arm Versatile board. Should i send a patch to that also
Also,
I used below command to generate the diff.
It says that 31 files have changed in this directory whereas only 1 files is changed and 1 file is added.
Kindly help me to correct the same. Right now i have manually changed it in the patch file.
$ git-diff -p --summary --stat u-boot-1.3.3/drivers/rtc/ uboot/drivers/rtc/
Regards
Gururaja
Signed off by: Gururaja Hebbar <[email protected]>
- Add support to the ARM AMBA PL031 RTC Chip.
- remove the call to rtc_init from lib_arm/board.c boot sequence as per wd advice.
- check for pl031 rtc initialization. Initialize if it hasnt yet.
{u-boot-1.3.3 => uboot}/drivers/rtc/Makefile | 1 +
/dev/null => uboot/drivers/rtc/rtc_pl031.c | 121
+++++++++++++++++++++
2 files changed, 122 insertions(+), 0 deletions(-)
create mode 100644 uboot/drivers/rtc/rtc_pl031.c(quoted diff) +0 -0
b/uboot/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
uboot/drivers/rtc/Makefile renamed from u-boot-1.3.3/drivers/rtc/Makefile +1 -0
@@ -56,6 +56,7 @@ COBJS-y += rs5c372.o COBJS-y += rx8025.o COBJS-y += s3c24x0_rtc.o COBJS-y += x1205.o +COBJS-y += rtc_pl031.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
uboot/drivers/rtc/rtc_pl031.c new file +43 -0
43 lines not on this page · raw message
register */
+#define RTC_RIS 0x14 /* Raw interrupt status register
*/
+#define RTC_MIS 0x18 /* Masked interrupt status
register */
+#define RTC_ICR 0x1c /* Interrupt clear register */
+
+#define RTC_CR_MIE (1 << 0)
+
+#define RTC_WRITE_REG(addr, val) (*(volatile unsigned int
*)(CFG_RTC_PL031_BASE + (addr)) = (val))
+#define RTC_READ_REG(addr) (*(volatile unsigned int
*)(CFG_RTC_PL031_BASE + (addr)))
+
+static int pl031_initted = 0;
+
+/* Enable RTC Start in Control register*/
+void rtc_init(void)
+{
+ RTC_WRITE_REG(RTC_CR,RTC_CR_MIE);
+
+ pl031_initted = 1;
+}
+
+/*
+ * Reset the RTC. We set the date back to 1970-01-01.
+ */
+void rtc_reset(void)
+{
+ RTC_WRITE_REG(RTC_LR,0x00);
+ if(!pl031_initted)
+ rtc_init();
+}
+
+/*
+ * Set the RTC
+*/
+void rtc_set(struct rtc_time *tmp)
+{
+ unsigned long tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error setting the date/time\n");
+ return;
+ }
+
+ /* Calculate number of seconds this incoming time represents */
+ tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ RTC_WRITE_REG(RTC_LR,tim);
+}
+
+/*
+ * Get the current time from the RTC
+ */
+int rtc_get(struct rtc_time *tmp)
+{
+ ulong tim;
+
+ if(!pl031_initted)
+ rtc_init();
+
+ if (tmp == NULL) {
+ puts("Error getting the date/time\n");
+ return -1;
+ }
+
+ tim = RTC_READ_REG(RTC_DR);
+
+ to_tm (tim, tmp);
+
+ debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME:
%2d:%02d:%02d\n",
+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
+
+ return 0;
+}
+
+#endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add_arm_amba_pl031_rtc_v2.patch
Type: application/octet-stream
Size: 3816 bytes
Desc: add_arm_amba_pl031_rtc_v2.patch
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080721/87a5840f/attachment.obj
[U-Boot-Users] *** PROBABLY SPAM *** RE: [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
Review
Quoted 4 lines
(quoted diff) +4
-0+/* Enable RTC Start in Control register*/ +void rtc_init(void) +{ + RTC_WRITE_REG(RTC_CR,RTC_CR_MIE);
please replace by
RTC_WRITE_REG(RTC_CR, RTC_CR_MIE);
Review
Quoted 1 line
(quoted diff) +1
-0+
^^^^^
please remove this whitescpace
Review
Quoted 9 lines
(quoted diff) +9
-0+ pl031_initted = 1; +} + +/* + * Reset the RTC. We set the date back to 1970-01-01. + */ +void rtc_reset(void) +{ + RTC_WRITE_REG(RTC_LR,0x00);
please replace by
RTC_WRITE_REG(RTC_LR, 0x00);
Review
Quoted 11 lines
(quoted diff) +11
-0+ if(!pl031_initted) + rtc_init(); +} + +/* + * Set the RTC +*/ +void rtc_set(struct rtc_time *tmp) +{ + unsigned long tim; +
^^^^^
please remove this whitescpace
Review
Quoted 8 lines
(quoted diff) +8
-0+ if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error setting the date/time\n"); + return; + } +
^^^^^
please remove this whitescpace
Quoted 4 lines
(quoted diff) +4
-0+ /* Calculate number of seconds this incoming time represents */ + tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); +
Review
Quoted 10 lines
(quoted diff) +10
-0+ RTC_WRITE_REG(RTC_LR,tim); +} + +/* + * Get the current time from the RTC + */ +int rtc_get(struct rtc_time *tmp) +{ + ulong tim; +
^^^^^
please remove this whitescpace
Review
Quoted 10 lines
(quoted diff) +10
-0+ if(!pl031_initted) + rtc_init(); + + if (tmp == NULL) { + puts("Error getting the date/time\n"); + return -1; + } + + tim = RTC_READ_REG(RTC_DR); +
^^^^^
please remove this whitescpace
Quoted 11 lines
(quoted diff) +3
-0+ to_tm (tim, tmp); + + debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME:%2d:%02d:%02d\n",
(quoted diff) +7
-0+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday, + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + + return 0; +} + +#endif