V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cmd: date: Change to use CONFIG_DM_RTC instead of CONFIG_DM_I2C 

Currently CONFIG_DM_I2C is used in cmd_date.c for driver model,
but it should be actually CONFIG_DM_RTC.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2015-06-23 12:18:42 +08:00 committed by Simon Glass
parent ed2ac0d564
commit ffe387988d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/cmd_date.c
View File

@ -37,7 +37,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int old_bus __maybe_unused; int old_bus __maybe_unused;
/* switch to correct I2C bus */ /* switch to correct I2C bus */
#ifdef CONFIG_DM_I2C #ifdef CONFIG_DM_RTC
struct udevice *dev; struct udevice *dev;
rcode = uclass_get_device(UCLASS_RTC, 0, &dev); rcode = uclass_get_device(UCLASS_RTC, 0, &dev);
@ -57,7 +57,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
case 2: /* set date & time */ case 2: /* set date & time */
if (strcmp(argv[1],"reset") == 0) { if (strcmp(argv[1],"reset") == 0) {
puts ("Reset RTC...\n"); puts ("Reset RTC...\n");
#ifdef CONFIG_DM_I2C #ifdef CONFIG_DM_RTC
rcode = dm_rtc_reset(dev); rcode = dm_rtc_reset(dev);
if (!rcode) if (!rcode)
rcode = dm_rtc_set(dev, &default_tm); rcode = dm_rtc_set(dev, &default_tm);
@ -69,7 +69,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
puts("## Failed to set date after RTC reset\n"); puts("## Failed to set date after RTC reset\n");
} else { } else {
/* initialize tm with current time */ /* initialize tm with current time */
#ifdef CONFIG_DM_I2C #ifdef CONFIG_DM_RTC
rcode = dm_rtc_get(dev, &tm); rcode = dm_rtc_get(dev, &tm);
#else #else
rcode = rtc_get(&tm); rcode = rtc_get(&tm);
@ -81,7 +81,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
break; break;
} }
/* and write to RTC */ /* and write to RTC */
#ifdef CONFIG_DM_I2C #ifdef CONFIG_DM_RTC
rcode = dm_rtc_set(dev, &tm); rcode = dm_rtc_set(dev, &tm);
#else #else
rcode = rtc_set(&tm); rcode = rtc_set(&tm);
@ -96,7 +96,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
/* FALL TROUGH */ /* FALL TROUGH */
case 1: /* get date & time */ case 1: /* get date & time */
#ifdef CONFIG_DM_I2C #ifdef CONFIG_DM_RTC
rcode = dm_rtc_get(dev, &tm); rcode = dm_rtc_get(dev, &tm);
#else #else
rcode = rtc_get(&tm); rcode = rtc_get(&tm);
@ -120,7 +120,7 @@ static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* switch back to original I2C bus */ /* switch back to original I2C bus */
#ifdef CONFIG_SYS_I2C #ifdef CONFIG_SYS_I2C
i2c_set_bus_num(old_bus); i2c_set_bus_num(old_bus);
#elif !defined(CONFIG_DM_I2C) #elif !defined(CONFIG_DM_RTC)
I2C_SET_BUS(old_bus); I2C_SET_BUS(old_bus);
#endif #endif