* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
@ 2008-07-17 1:53 Gururaja Hebbar K R
2008-07-17 21:39 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-07-17 1:53 UTC (permalink / raw)
To: u-boot
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 <gururajakr@sanyo.co.in>
- 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
diff --git a/u-boot-1.3.3/drivers/rtc/Makefile
b/uboot/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
--- a/u-boot-1.3.3/drivers/rtc/Makefile
+++ b/uboot/drivers/rtc/Makefile
@@ -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)
diff --git a/dev/null b/uboot/drivers/rtc/rtc_pl031.c
new file mode 100644
index 0000000..77b550b
--- /dev/null
+++ b/uboot/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,121 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar Sanyo LSI (www.sanyo.co.in) gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set
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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-17 1:53 [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
@ 2008-07-17 21:39 ` Jean-Christophe PLAGNIOL-VILLARD
2008-07-18 0:23 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
2008-07-21 6:31 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
0 siblings, 2 replies; 16+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-07-17 21:39 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
2008-07-17 21:39 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2008-07-18 0:23 ` Gururaja Hebbar K R
[not found] ` <000001c8e8dc$e0a8b0e0$3a4d010a@Emea.Arm.com>
2008-07-21 6:31 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
1 sibling, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-07-18 0:23 UTC (permalink / raw)
To: u-boot
>>From: Jean-Christophe PLAGNIOL-VILLARD
>>Subject: Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031
RTCSupport
>>Hi,
Hello
>> 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.
>> 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.
>> 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
2008-07-17 21:39 ` Jean-Christophe PLAGNIOL-VILLARD
2008-07-18 0:23 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
@ 2008-07-21 6:31 ` Gururaja Hebbar K R
2008-07-21 20:26 ` [U-Boot-Users] *** PROBABLY SPAM *** " Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-07-21 6:31 UTC (permalink / raw)
To: u-boot
Hi j,
Could you please reply so that i can submit a reformatted patch if
required.
>> 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.
>> 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.
>> 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 <gururajakr@sanyo.co.in>
- 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
diff --git a/u-boot-1.3.3/drivers/rtc/Makefile
b/uboot/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
--- a/u-boot-1.3.3/drivers/rtc/Makefile
+++ b/uboot/drivers/rtc/Makefile
@@ -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)
diff --git a/dev/null b/uboot/drivers/rtc/rtc_pl031.c
new file mode 100644
index 0000000..77b550b
--- /dev/null
+++ b/uboot/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,121 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set
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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
[not found] ` <000001c8e8dc$e0a8b0e0$3a4d010a@Emea.Arm.com>
@ 2008-07-21 8:04 ` Gururaja Hebbar K R
2008-07-21 20:19 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-07-21 8:04 UTC (permalink / raw)
To: u-boot
Hi,
> >> 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
> >>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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
2008-07-21 8:04 ` Gururaja Hebbar K R
@ 2008-07-21 20:19 ` Jean-Christophe PLAGNIOL-VILLARD
2008-07-22 1:54 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
0 siblings, 1 reply; 16+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-07-21 20:19 UTC (permalink / raw)
To: u-boot
On 13:34 Mon 21 Jul , Gururaja Hebbar K R wrote:
> Hi,
>
> > >> 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
>
> > >>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.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] *** PROBABLY SPAM *** RE: [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
2008-07-21 6:31 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
@ 2008-07-21 20:26 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 16+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2008-07-21 20:26 UTC (permalink / raw)
To: u-boot
> +/* 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);
> +
^^^^^
please remove this whitescpace
> + 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);
> + if(!pl031_initted)
> + rtc_init();
> +}
> +
> +/*
> + * Set the RTC
> +*/
> +void rtc_set(struct rtc_time *tmp)
> +{
> + unsigned long tim;
> +
^^^^^
please remove this whitescpace
> + if(!pl031_initted)
> + rtc_init();
> +
> + if (tmp == NULL) {
> + puts("Error setting the date/time\n");
> + return;
> + }
> +
^^^^^
please remove this whitescpace
> + /* 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;
> +
^^^^^
please remove this whitescpace
> + 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
> + 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-21 20:19 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2008-07-22 1:54 ` Gururaja Hebbar K R
2008-07-22 5:21 ` Hebbar
0 siblings, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-07-22 1:54 UTC (permalink / raw)
To: u-boot
Hi j,
>> 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/
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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-22 1:54 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
@ 2008-07-22 5:21 ` Hebbar
2008-07-22 6:21 ` Wolfgang Denk
0 siblings, 1 reply; 16+ messages in thread
From: Hebbar @ 2008-07-22 5:21 UTC (permalink / raw)
To: u-boot
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
Signed-off-by: Gururaja <gururajakr@sanyo.co.in>
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
old mode 100644
new mode 100755
index 2e0c118..f888a31
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -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)
diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c
new file mode 100755
index 0000000..7136fed
--- /dev/null
+++ b/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,121 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set 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_START (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_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
--
1.5.5.1
diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c
index 9d1a25e..5bf7e85 100644
--- a/board/versatile/versatile.c
+++ b/board/versatile/versatile.c
@@ -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;
}
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index d250150..b93321d 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -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
--
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.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-22 5:21 ` Hebbar
@ 2008-07-22 6:21 ` Wolfgang Denk
2008-07-22 6:53 ` Hebbar
0 siblings, 1 reply; 16+ messages in thread
From: Wolfgang Denk @ 2008-07-22 6:21 UTC (permalink / raw)
To: u-boot
In message <18582594.post@talk.nabble.com> 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.
...
> +#define RTC_WRITE_REG(addr, val) (*(volatile unsigned int
> *)(CFG_RTC_PL031_BASE + (addr)) = (val))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Line wrapped. Unusable.
Best regards,
Wolfgang Denk
--
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. Roosevelt
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-22 6:21 ` Wolfgang Denk
@ 2008-07-22 6:53 ` Hebbar
2008-07-29 20:54 ` Wolfgang Denk
0 siblings, 1 reply; 16+ messages in thread
From: Hebbar @ 2008-07-22 6:53 UTC (permalink / raw)
To: u-boot
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
Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
---
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc_pl031.c | 123
+++++++++++++++++++++++++++++++++++++++++++++++
board/versatile/versatile.c | 9 +++++++++
include/configs/versatile.h | 7 +++++++
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2e0c118..f888a31 100755
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -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)
diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c
new file mode 100755
index 0000000..ff8926d
--- /dev/null
+++ b/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,123 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set 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_START (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_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
--
1.5.5.1
diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c
index 9d1a25e..5bf7e85 100644
--- a/board/versatile/versatile.c
+++ b/board/versatile/versatile.c
@@ -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;
}
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index d250150..b93321d 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -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
--
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.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-22 6:53 ` Hebbar
@ 2008-07-29 20:54 ` Wolfgang Denk
2008-08-01 0:42 ` Gururaja Hebbar K R
0 siblings, 1 reply; 16+ messages in thread
From: Wolfgang Denk @ 2008-07-29 20:54 UTC (permalink / raw)
To: u-boot
In message <18583543.post@talk.nabble.com> 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.
> - 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
>
> Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
> ---
> 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.
...
> diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c
> index 9d1a25e..5bf7e85 100644
> --- a/board/versatile/versatile.c
> +++ b/board/versatile/versatile.c
...
> +#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
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
--
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.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-07-29 20:54 ` Wolfgang Denk
@ 2008-08-01 0:42 ` Gururaja Hebbar K R
2008-08-01 3:15 ` Hebbar
0 siblings, 1 reply; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-08-01 0:42 UTC (permalink / raw)
To: u-boot
Hi,
>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
>> 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:
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.
>So please split your patch and submit as two separate patches.
Ok will do that
>> +#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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
2008-08-01 0:42 ` Gururaja Hebbar K R
@ 2008-08-01 3:15 ` Hebbar
0 siblings, 0 replies; 16+ messages in thread
From: Hebbar @ 2008-08-01 3:15 UTC (permalink / raw)
To: u-boot
Hi,
>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
--
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.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
@ 2008-08-01 4:52 Gururaja Hebbar K R
0 siblings, 0 replies; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-08-01 4:52 UTC (permalink / raw)
To: u-boot
Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
---
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc_pl031.c | 123
+++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 0 deletions(-)
create mode 100755 drivers/rtc/rtc_pl031.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -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)
diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c
new file mode 100755
index 0000000..0ad5e9c
--- /dev/null
+++ b/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,123 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set
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_START (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_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
--
1.5.6.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
@ 2008-08-04 1:06 Gururaja Hebbar K R
0 siblings, 0 replies; 16+ messages in thread
From: Gururaja Hebbar K R @ 2008-08-04 1:06 UTC (permalink / raw)
To: u-boot
- Add ARM AMBA PL031 RTC Support
Signed-off-by: Gururaja Hebbar <gururajakr@sanyo.co.in>
---
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc_pl031.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 0 deletions(-)
create mode 100755 drivers/rtc/rtc_pl031.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2e0c118..f888a31 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -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)
diff --git a/drivers/rtc/rtc_pl031.c b/drivers/rtc/rtc_pl031.c
new file mode 100755
index 0000000..0ad5e9c
--- /dev/null
+++ b/drivers/rtc/rtc_pl031.c
@@ -0,0 +1,123 @@
+/*
+ * (C) Copyright 2008
+ * Gururaja Hebbar gururajakr at sanyo.co.in
+ *
+ * reference linux-2.6.20.6/drivers/rtc/rtc-pl031.c
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+
+#if defined(CONFIG_RTC_PL031) && defined(CONFIG_CMD_DATE)
+
+#ifndef CFG_RTC_PL031_BASE
+#error CFG_RTC_PL031_BASE is not defined!
+#endif
+
+/*
+ * Register definitions
+ */
+#define RTC_DR 0x00 /* Data read register */
+#define RTC_MR 0x04 /* Match register */
+#define RTC_LR 0x08 /* Data load register */
+#define RTC_CR 0x0c /* Control register */
+#define RTC_IMSC 0x10 /* Interrupt mask and set 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_START (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_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
--
1.5.6.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2008-08-04 1:06 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-17 1:53 [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
2008-07-17 21:39 ` Jean-Christophe PLAGNIOL-VILLARD
2008-07-18 0:23 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
[not found] ` <000001c8e8dc$e0a8b0e0$3a4d010a@Emea.Arm.com>
2008-07-21 8:04 ` Gururaja Hebbar K R
2008-07-21 20:19 ` Jean-Christophe PLAGNIOL-VILLARD
2008-07-22 1:54 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
2008-07-22 5:21 ` Hebbar
2008-07-22 6:21 ` Wolfgang Denk
2008-07-22 6:53 ` Hebbar
2008-07-29 20:54 ` Wolfgang Denk
2008-08-01 0:42 ` Gururaja Hebbar K R
2008-08-01 3:15 ` Hebbar
2008-07-21 6:31 ` [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Gururaja Hebbar K R
2008-07-21 20:26 ` [U-Boot-Users] *** PROBABLY SPAM *** " Jean-Christophe PLAGNIOL-VILLARD
-- strict thread matches above, loose matches on Subject: below --
2008-08-01 4:52 [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support Gururaja Hebbar K R
2008-08-04 1:06 Gururaja Hebbar K R
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox