* Patch by Tom Armistead, 04 Jun 2004:

Add support for MAX6900 RTC * Patches by Ladislav Michl, 03 Jun 2004: - fix cfi_flash.c on LE systems - let 'make mrproper' delete u-boot.img as well - turn printf into debug in cfi_flash.c

* Patch by Tom Armistead, 04 Jun 2004:
Add support for MAX6900 RTC * Patches by Ladislav Michl, 03 Jun 2004: - fix cfi_flash.c on LE systems - let 'make mrproper' delete u-boot.img as well - turn printf into debug in cfi_flash.c
wdenk
1 parent ca0e774894
Showing 6 changed files with 147 additions and 6 deletions Side-by-side Diff
CHANGELOG
Makefile
README
drivers/cfi_flash.c
rtc/Makefile
rtc/max6900.c
@@ -2,6 +2,14 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
  
+* Patch by Tom Armistead, 04 Jun 2004:
+  Add support for MAX6900 RTC
+
+* Patches by Ladislav Michl, 03 Jun 2004:
+  - fix cfi_flash.c on LE systems
+  - let 'make mrproper' delete u-boot.img as well
+  - turn printf into debug in cfi_flash.c
+
 * Patch by Kurt Stremerch, 28 May 2004:
   Add support for Exys XSEngine board
  
@@ -1338,10 +1338,10 @@
 	rm -f board/trab/trab_fkt
  
 clobber:	clean
-	find . -type f \
-		\( -name .depend -o -name '*.srec' -o -name '*.bin' \) \
-		-print \
-		| xargs rm -f
+	find . -type f \( -name .depend \
+		-o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
+		-print0 \
+		| xargs -0 rm -f
 	rm -f $(OBJS) *.bak tags TAGS
 	rm -fr *.*~
 	rm -f u-boot u-boot.map $(ALL)
@@ -652,6 +652,7 @@
 		CONFIG_RTC_DS1337	- use Maxim, Inc. DS1337 RTC
 		CONFIG_RTC_DS1338	- use Maxim, Inc. DS1338 RTC
 		CONFIG_RTC_DS164x	- use Dallas DS164x RTC
+		CONFIG_RTC_MAX6900	- use Maxim, Inc. MAX6900 RTC
  
 		Note that if the RTC uses I2C, then the I2C interface
 		must also be configured. See I2C Support, below.
@@ -46,6 +46,7 @@
  
 #include <common.h>
 #include <asm/processor.h>
+#include <asm/byteorder.h>
 #include <linux/byteorder/swab.h>
 #ifdef	CFG_FLASH_CFI_DRIVER
  
@@ -1038,7 +1039,7 @@
 				(tmp & 0xffff) ? ((tmp & 0xffff) * 256) : 128;
 			tmp >>= 16;
 			erase_region_count = (tmp & 0xffff) + 1;
-			printf ("erase_region_count = %d erase_region_size = %d\n",
+			debug ("erase_region_count = %d erase_region_size = %d\n",
 				erase_region_count, erase_region_size);
 			for (j = 0; j < erase_region_count; j++) {
 				info->start[sect_cnt] = sector;
@@ -30,7 +30,7 @@
 OBJS	= date.o   \
 	  ds12887.o ds1302.o ds1306.o ds1307.o ds1337.o \
 	  ds1556.o ds164x.o ds174x.o \
-	  m41t11.o m48t35ax.o mc146818.o mk48t59.o \
+	  m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \
 	  mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o
  
 all:	$(LIB)
+/*
+ * (C) Copyright 2004
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * 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
+ */
+
+/*
+ * Date & Time support for MAXIM MAX6900 RTC
+ */
+
+/* #define	DEBUG	*/
+
+#include <common.h>
+#include <command.h>
+#include <rtc.h>
+#include <i2c.h>
+
+#if defined(CONFIG_RTC_MAX6900) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+
+#ifndef	CFG_I2C_RTC_ADDR
+#define	CFG_I2C_RTC_ADDR	0x50
+#endif
+
+/* ------------------------------------------------------------------------- */
+
+static uchar rtc_read (uchar reg)
+{
+	return (i2c_reg_read (CFG_I2C_RTC_ADDR, reg));
+}
+
+static void rtc_write (uchar reg, uchar val)
+{
+	i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val);
+	udelay(2500);
+}
+
+static unsigned bcd2bin (uchar n)
+{
+	return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
+}
+
+static unsigned char bin2bcd (unsigned int n)
+{
+	return (((n / 10) << 4) | (n % 10));
+}
+
+/* ------------------------------------------------------------------------- */
+
+void rtc_get (struct rtc_time *tmp)
+{
+	uchar sec, min, hour, mday, wday, mon, cent, year;
+	int retry = 1;
+
+	do {
+		sec	= rtc_read (0x80);
+		min	= rtc_read (0x82);
+		hour	= rtc_read (0x84);
+		mday	= rtc_read (0x86);
+		mon	= rtc_read (0x88);
+		wday	= rtc_read (0x8a);
+		year	= rtc_read (0x8c);
+		cent	= rtc_read (0x92);
+		/*
+		 * Check for seconds rollover
+		 */
+		if ((sec != 59) || (rtc_read(0x80) == sec)){
+			retry = 0;
+		}
+	} while (retry);
+
+	debug ( "Get RTC year: %02x mon: %02x cent: %02x mday: %02x wday: %02x "
+		"hr: %02x min: %02x sec: %02x\n",
+		year, mon, cent, mday, wday,
+		hour, min, sec );
+
+	tmp->tm_sec  = bcd2bin (sec  & 0x7F);
+	tmp->tm_min  = bcd2bin (min  & 0x7F);
+	tmp->tm_hour = bcd2bin (hour & 0x3F);
+	tmp->tm_mday = bcd2bin (mday & 0x3F);
+	tmp->tm_mon  = bcd2bin (mon & 0x1F);
+	tmp->tm_year = bcd2bin (year) + bcd2bin(cent) * 100;
+	tmp->tm_wday = bcd2bin (wday & 0x07);
+	tmp->tm_yday = 0;
+	tmp->tm_isdst= 0;
+
+	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);
+}
+
+void rtc_set (struct rtc_time *tmp)
+{
+
+	debug ( "Set 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);
+
+	rtc_write (0x9E, 0x00);
+	rtc_write (0x80, 0);	/* Clear seconds to ensure no rollover */
+	rtc_write (0x92, bin2bcd(tmp->tm_year / 100));
+	rtc_write (0x8c, bin2bcd(tmp->tm_year % 100));
+	rtc_write (0x8a, bin2bcd(tmp->tm_wday));
+	rtc_write (0x88, bin2bcd(tmp->tm_mon));
+	rtc_write (0x86, bin2bcd(tmp->tm_mday));
+	rtc_write (0x84, bin2bcd(tmp->tm_hour));
+	rtc_write (0x82, bin2bcd(tmp->tm_min ));
+	rtc_write (0x80, bin2bcd(tmp->tm_sec ));
+}
+
+void rtc_reset (void)
+{
+}
+
+#endif	/* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */
...	...	@@ -2,6 +2,14 @@
2	2	Changes since U-Boot 1.1.1:
3	3	======================================================================
4	4
	5	+* Patch by Tom Armistead, 04 Jun 2004:
	6	+ Add support for MAX6900 RTC
	7	+
	8	+* Patches by Ladislav Michl, 03 Jun 2004:
	9	+ - fix cfi_flash.c on LE systems
	10	+ - let 'make mrproper' delete u-boot.img as well
	11	+ - turn printf into debug in cfi_flash.c
	12	+
5	13	* Patch by Kurt Stremerch, 28 May 2004:
6	14	Add support for Exys XSEngine board
7	15
...	...	@@ -1338,10 +1338,10 @@
1338	1338	rm -f board/trab/trab_fkt
1339	1339
1340	1340	clobber: clean
1341		- find . -type f \
1342		- \( -name .depend -o -name '.srec' -o -name '.bin' \) \
1343		- -print \
1344		- \| xargs rm -f
	1341	+ find . -type f \( -name .depend \
	1342	+ -o -name '.srec' -o -name '.bin' -o -name u-boot.img \) \
	1343	+ -print0 \
	1344	+ \| xargs -0 rm -f
1345	1345	rm -f $(OBJS) *.bak tags TAGS
1346	1346	rm -fr .~
1347	1347	rm -f u-boot u-boot.map $(ALL)
...	...	@@ -652,6 +652,7 @@
652	652	CONFIG_RTC_DS1337 - use Maxim, Inc. DS1337 RTC
653	653	CONFIG_RTC_DS1338 - use Maxim, Inc. DS1338 RTC
654	654	CONFIG_RTC_DS164x - use Dallas DS164x RTC
	655	+ CONFIG_RTC_MAX6900 - use Maxim, Inc. MAX6900 RTC
655	656
656	657	Note that if the RTC uses I2C, then the I2C interface
657	658	must also be configured. See I2C Support, below.
...	...	@@ -46,6 +46,7 @@
46	46
47	47	#include <common.h>
48	48	#include <asm/processor.h>
	49	+#include <asm/byteorder.h>
49	50	#include <linux/byteorder/swab.h>
50	51	#ifdef CFG_FLASH_CFI_DRIVER
51	52
...	...	@@ -1038,7 +1039,7 @@
1038	1039	(tmp & 0xffff) ? ((tmp & 0xffff) * 256) : 128;
1039	1040	tmp >>= 16;
1040	1041	erase_region_count = (tmp & 0xffff) + 1;
1041		- printf ("erase_region_count = %d erase_region_size = %d\n",
	1042	+ debug ("erase_region_count = %d erase_region_size = %d\n",
1042	1043	erase_region_count, erase_region_size);
1043	1044	for (j = 0; j < erase_region_count; j++) {
1044	1045	info->start[sect_cnt] = sector;
...	...	@@ -30,7 +30,7 @@
30	30	OBJS = date.o \
31	31	ds12887.o ds1302.o ds1306.o ds1307.o ds1337.o \
32	32	ds1556.o ds164x.o ds174x.o \
33		- m41t11.o m48t35ax.o mc146818.o mk48t59.o \
	33	+ m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \
34	34	mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o
35	35
36	36	all: $(LIB)
	1	+/*
	2	+ * (C) Copyright 2004
	3	+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
	4	+ *
	5	+ * See file CREDITS for list of people who contributed to this
	6	+ * project.
	7	+ *
	8	+ * This program is free software; you can redistribute it and/or
	9	+ * modify it under the terms of the GNU General Public License as
	10	+ * published by the Free Software Foundation; either version 2 of
	11	+ * the License, or (at your option) any later version.
	12	+ *
	13	+ * This program is distributed in the hope that it will be useful,
	14	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	+ * GNU General Public License for more details.
	17	+ *
	18	+ * You should have received a copy of the GNU General Public License
	19	+ * along with this program; if not, write to the Free Software
	20	+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	21	+ * MA 02111-1307 USA
	22	+ */
	23	+
	24	+/*
	25	+ * Date & Time support for MAXIM MAX6900 RTC
	26	+ */
	27	+
	28	+/* #define DEBUG */
	29	+
	30	+#include <common.h>
	31	+#include <command.h>
	32	+#include <rtc.h>
	33	+#include <i2c.h>
	34	+
	35	+#if defined(CONFIG_RTC_MAX6900) && (CONFIG_COMMANDS & CFG_CMD_DATE)
	36	+
	37	+#ifndef CFG_I2C_RTC_ADDR
	38	+#define CFG_I2C_RTC_ADDR 0x50
	39	+#endif
	40	+
	41	+/* ------------------------------------------------------------------------- */
	42	+
	43	+static uchar rtc_read (uchar reg)
	44	+{
	45	+ return (i2c_reg_read (CFG_I2C_RTC_ADDR, reg));
	46	+}
	47	+
	48	+static void rtc_write (uchar reg, uchar val)
	49	+{
	50	+ i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val);
	51	+ udelay(2500);
	52	+}
	53	+
	54	+static unsigned bcd2bin (uchar n)
	55	+{
	56	+ return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
	57	+}
	58	+
	59	+static unsigned char bin2bcd (unsigned int n)
	60	+{
	61	+ return (((n / 10) << 4) \| (n % 10));
	62	+}
	63	+
	64	+/* ------------------------------------------------------------------------- */
	65	+
	66	+void rtc_get (struct rtc_time *tmp)
	67	+{
	68	+ uchar sec, min, hour, mday, wday, mon, cent, year;
	69	+ int retry = 1;
	70	+
	71	+ do {
	72	+ sec = rtc_read (0x80);
	73	+ min = rtc_read (0x82);
	74	+ hour = rtc_read (0x84);
	75	+ mday = rtc_read (0x86);
	76	+ mon = rtc_read (0x88);
	77	+ wday = rtc_read (0x8a);
	78	+ year = rtc_read (0x8c);
	79	+ cent = rtc_read (0x92);
	80	+ /*
	81	+ * Check for seconds rollover
	82	+ */
	83	+ if ((sec != 59) \|\| (rtc_read(0x80) == sec)){
	84	+ retry = 0;
	85	+ }
	86	+ } while (retry);
	87	+
	88	+ debug ( "Get RTC year: %02x mon: %02x cent: %02x mday: %02x wday: %02x "
	89	+ "hr: %02x min: %02x sec: %02x\n",
	90	+ year, mon, cent, mday, wday,
	91	+ hour, min, sec );
	92	+
	93	+ tmp->tm_sec = bcd2bin (sec & 0x7F);
	94	+ tmp->tm_min = bcd2bin (min & 0x7F);
	95	+ tmp->tm_hour = bcd2bin (hour & 0x3F);
	96	+ tmp->tm_mday = bcd2bin (mday & 0x3F);
	97	+ tmp->tm_mon = bcd2bin (mon & 0x1F);
	98	+ tmp->tm_year = bcd2bin (year) + bcd2bin(cent) * 100;
	99	+ tmp->tm_wday = bcd2bin (wday & 0x07);
	100	+ tmp->tm_yday = 0;
	101	+ tmp->tm_isdst= 0;
	102	+
	103	+ debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
	104	+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
	105	+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
	106	+}
	107	+
	108	+void rtc_set (struct rtc_time *tmp)
	109	+{
	110	+
	111	+ debug ( "Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
	112	+ tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
	113	+ tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
	114	+
	115	+ rtc_write (0x9E, 0x00);
	116	+ rtc_write (0x80, 0); /* Clear seconds to ensure no rollover */
	117	+ rtc_write (0x92, bin2bcd(tmp->tm_year / 100));
	118	+ rtc_write (0x8c, bin2bcd(tmp->tm_year % 100));
	119	+ rtc_write (0x8a, bin2bcd(tmp->tm_wday));
	120	+ rtc_write (0x88, bin2bcd(tmp->tm_mon));
	121	+ rtc_write (0x86, bin2bcd(tmp->tm_mday));
	122	+ rtc_write (0x84, bin2bcd(tmp->tm_hour));
	123	+ rtc_write (0x82, bin2bcd(tmp->tm_min ));
	124	+ rtc_write (0x80, bin2bcd(tmp->tm_sec ));
	125	+}
	126	+
	127	+void rtc_reset (void)
	128	+{
	129	+}
	130	+
	131	+#endif /* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */