Merge branch 'master' into hpc2

[u-boot] / common / cmd_date.c

diff --git a/common/cmd_date.c b/common/cmd_date.c
index 2139cebf8385246756318be06f8d77ed9532fcba..33d2e5661e4466cb2429188ec84f0e99e744d74d 100644 (file)
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -27,6 +27,9 @@
 #include <common.h>
 #include <command.h>
 #include <rtc.h>
+#include <i2c.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #if (CONFIG_COMMANDS & CFG_CMD_DATE)
 
@@ -40,22 +43,26 @@ int mk_date (char *, struct rtc_time *);
 
 int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       DECLARE_GLOBAL_DATA_PTR;
        struct rtc_time tm;
        int rcode = 0;
+       int old_bus;
+
+       /* switch to correct I2C bus */
+       old_bus = I2C_GET_BUS();
+       I2C_SET_BUS(CFG_RTC_BUS_NUM);
 
        switch (argc) {
        case 2:                 /* set date & time */
                if (strcmp(argv[1],"reset") == 0) {
-                       printf ("Reset RTC...\n");
+                       puts ("Reset RTC...\n");
                        rtc_reset ();
                } else {
                        /* initialize tm with current time */
                        rtc_get (&tm);
                        /* insert new date & time */
                        if (mk_date (argv[1], &tm) != 0) {
-                               printf ("## Bad date format\n");
-                               return 1;
+                               puts ("## Bad date format\n");
+                               break;
                        }
                        /* and write to RTC */
                        rtc_set (&tm);
@@ -70,11 +77,15 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                "unknown " : RELOC(weekdays[tm.tm_wday]),
                        tm.tm_hour, tm.tm_min, tm.tm_sec);
 
-               return 0;
+               break;
        default:
                printf ("Usage:\n%s\n", cmdtp->usage);
                rcode = 1;
        }
+
+       /* switch back to original I2C bus */
+       I2C_SET_BUS(old_bus);
+
        return rcode;
 }
 
@@ -189,4 +200,15 @@ int mk_date (char *datestr, struct rtc_time *tmp)
        return (-1);
 }
 
+/***************************************************/
+
+U_BOOT_CMD(
+       date,   2,      1,      do_date,
+       "date    - get/set/reset date & time\n",
+       "[MMDDhhmm[[CC]YY][.ss]]\ndate reset\n"
+       "  - without arguments: print date & time\n"
+       "  - with numeric argument: set the system date & time\n"
+       "  - with 'reset' argument: reset the RTC\n"
+);
+
 #endif /* CFG_CMD_DATE */