public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [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-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