[U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support

[Hebbar <gururajakr@sanyo.co.in>]

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.