diff mbox

[U-Boot,RESPIN,v2,02/15] cmd: date: Change to use CONFIG_DM_RTC instead of CONFIG_DM_I2C

Message ID BLU437-SMTP73E8298E8CE9F38F9F516DBFA00@phx.gbl
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng June 23, 2015, 4:18 a.m. UTC 
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>

---

Changes in v2:
- New patch to change to use CONFIG_DM_RTC instead of CONFIG_DM_I2C

 common/cmd_date.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Simon Glass June 24, 2015, 1:45 a.m. UTC | #1 
On 22 June 2015 at 22:18, Bin Meng <bmeng.cn@gmail.com> wrote:
> 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>
>
> ---
>
> Changes in v2:
> - New patch to change to use CONFIG_DM_RTC instead of CONFIG_DM_I2C
>
>  common/cmd_date.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass June 24, 2015, 2:45 a.m. UTC | #2 
On 23 June 2015 at 19:45, Simon Glass <sjg@chromium.org> wrote:
> On 22 June 2015 at 22:18, Bin Meng <bmeng.cn@gmail.com> wrote:
>> 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>
>>
>> ---
>>
>> Changes in v2:
>> - New patch to change to use CONFIG_DM_RTC instead of CONFIG_DM_I2C
>>
>>  common/cmd_date.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/common/cmd_date.c b/common/cmd_date.c
index 61727e3..8714699 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -37,7 +37,7 @@  static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	int old_bus __maybe_unused;
 
 	/* switch to correct I2C bus */
-#ifdef CONFIG_DM_I2C
+#ifdef CONFIG_DM_RTC
 	struct udevice *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 */
 		if (strcmp(argv[1],"reset") == 0) {
 			puts ("Reset RTC...\n");
-#ifdef CONFIG_DM_I2C
+#ifdef CONFIG_DM_RTC
 			rcode = dm_rtc_reset(dev);
 			if (!rcode)
 				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");
 		} else {
 			/* initialize tm with current time */
-#ifdef CONFIG_DM_I2C
+#ifdef CONFIG_DM_RTC
 			rcode = dm_rtc_get(dev, &tm);
 #else
 			rcode = rtc_get(&tm);
@@ -81,7 +81,7 @@  static int do_date(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 					break;
 				}
 				/* and write to RTC */
-#ifdef CONFIG_DM_I2C
+#ifdef CONFIG_DM_RTC
 				rcode = dm_rtc_set(dev, &tm);
 #else
 				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 */
 	case 1:			/* get date & time */
-#ifdef CONFIG_DM_I2C
+#ifdef CONFIG_DM_RTC
 		rcode = dm_rtc_get(dev, &tm);
 #else
 		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 */
 #ifdef CONFIG_SYS_I2C
 	i2c_set_bus_num(old_bus);
-#elif !defined(CONFIG_DM_I2C)
+#elif !defined(CONFIG_DM_RTC)
 	I2C_SET_BUS(old_bus);
 #endif