X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fcmd_date.c;h=87146996216a6561c8927d5cfed19cfb724a7c1e;hb=001bd08c07559603eade16459d72c17d5e4d5034;hp=f0e66862ff887bf74d675d3f0756f5e96ea10fca;hpb=1a4596601fd395f3afb8f82f3f840c5e00bdd57a;p=karo-tx-uboot.git

diff --git a/common/cmd_date.c b/common/cmd_date.c
index f0e66862ff..8714699621 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -10,6 +10,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <rtc.h>
 #include <i2c.h>
 
@@ -27,43 +28,79 @@ static const char * const weekdays[] = {
 
 int mk_date (const char *, struct rtc_time *);
 
+static struct rtc_time default_tm = { 0, 0, 0, 1, 1, 2000, 6, 0, 0 };
+
 static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	struct rtc_time tm;
 	int rcode = 0;
-	int old_bus;
+	int old_bus __maybe_unused;
 
 	/* switch to correct I2C bus */
+#ifdef CONFIG_DM_RTC
+	struct udevice *dev;
+
+	rcode = uclass_get_device(UCLASS_RTC, 0, &dev);
+	if (rcode) {
+		printf("Cannot find RTC: err=%d\n", rcode);
+		return CMD_RET_FAILURE;
+	}
+#elif defined(CONFIG_SYS_I2C)
+	old_bus = i2c_get_bus_num();
+	i2c_set_bus_num(CONFIG_SYS_RTC_BUS_NUM);
+#else
 	old_bus = I2C_GET_BUS();
 	I2C_SET_BUS(CONFIG_SYS_RTC_BUS_NUM);
+#endif
 
 	switch (argc) {
 	case 2:			/* set date & time */
 		if (strcmp(argv[1],"reset") == 0) {
 			puts ("Reset RTC...\n");
-			rtc_reset ();
+#ifdef CONFIG_DM_RTC
+			rcode = dm_rtc_reset(dev);
+			if (!rcode)
+				rcode = dm_rtc_set(dev, &default_tm);
+#else
+			rtc_reset();
+			rcode = rtc_set(&default_tm);
+#endif
+			if (rcode)
+				puts("## Failed to set date after RTC reset\n");
 		} else {
 			/* initialize tm with current time */
-			rcode = rtc_get (&tm);
-
-			if(!rcode) {
+#ifdef CONFIG_DM_RTC
+			rcode = dm_rtc_get(dev, &tm);
+#else
+			rcode = rtc_get(&tm);
+#endif
+			if (!rcode) {
 				/* insert new date & time */
-				if (mk_date (argv[1], &tm) != 0) {
+				if (mk_date(argv[1], &tm) != 0) {
 					puts ("## Bad date format\n");
 					break;
 				}
 				/* and write to RTC */
-				rcode = rtc_set (&tm);
-				if(rcode)
-					puts("## Set date failed\n");
+#ifdef CONFIG_DM_RTC
+				rcode = dm_rtc_set(dev, &tm);
+#else
+				rcode = rtc_set(&tm);
+#endif
+				if (rcode) {
+					printf("## Set date failed: err=%d\n",
+					       rcode);
+				}
 			} else {
 				puts("## Get date failed\n");
 			}
 		}
 		/* FALL TROUGH */
 	case 1:			/* get date & time */
-		rcode = rtc_get (&tm);
-
+#ifdef CONFIG_DM_RTC
+		rcode = dm_rtc_get(dev, &tm);
+#else
+		rcode = rtc_get(&tm);
+#endif
 		if (rcode) {
 			puts("## Get date failed\n");
 			break;
@@ -81,9 +118,13 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 
 	/* switch back to original I2C bus */
+#ifdef CONFIG_SYS_I2C
+	i2c_set_bus_num(old_bus);
+#elif !defined(CONFIG_DM_RTC)
 	I2C_SET_BUS(old_bus);
+#endif
 
-	return rcode;
+	return rcode ? CMD_RET_FAILURE : 0;
 }
 
 /*
@@ -187,7 +228,7 @@ int mk_date (const char *datestr, struct rtc_time *tmp)
 		tmp->tm_min  = val;
 
 		/* calculate day of week */
-		GregorianDay (tmp);
+		rtc_calc_weekday(tmp);
 
 		return (0);
 	default: