]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
date: Drop the legacy I2C code
authorSimon Glass <sjg@chromium.org>
Sun, 11 Aug 2024 14:50:38 +0000 (08:50 -0600)
committerHeiko Schocher <hs@denx.de>
Tue, 13 Aug 2024 04:12:40 +0000 (06:12 +0200)
Drop two generations of old code in this command. All boards should use
driver model for I2C from 2021.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
cmd/date.c

index bdb3e199b4367ff3794236523ea907e15ed043d3..8614f0227614c2ae602271e2d8235c6403b3b41e 100644 (file)
@@ -31,7 +31,6 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
        int old_bus __maybe_unused;
 
        /* switch to correct I2C bus */
-#ifdef CONFIG_DM_RTC
        struct udevice *dev;
 
        rcode = uclass_get_device_by_seq(UCLASS_RTC, 0, &dev);
@@ -42,29 +41,19 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
                        return CMD_RET_FAILURE;
                }
        }
-#endif
 
        switch (argc) {
        case 2:                 /* set date & time */
                if (strcmp(argv[1],"reset") == 0) {
                        puts ("Reset RTC...\n");
-#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 */
-#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) {
@@ -72,11 +61,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
                                        break;
                                }
                                /* and write to RTC */
-#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);
@@ -87,11 +72,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
                }
                fallthrough;
        case 1:                 /* get date & time */
-#ifdef CONFIG_DM_RTC
                rcode = dm_rtc_get(dev, &tm);
-#else
-               rcode = rtc_get(&tm);
-#endif
                if (rcode) {
                        puts("## Get date failed\n");
                        break;
@@ -108,13 +89,6 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
                rcode = CMD_RET_USAGE;
        }
 
-       /* switch back to original I2C bus */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
-       i2c_set_bus_num(old_bus);
-#elif !defined(CONFIG_DM_RTC)
-       I2C_SET_BUS(old_bus);
-#endif
-
        return rcode ? CMD_RET_FAILURE : 0;
 }