Merge patch series "clk: mediatek: add OPs to support OF_UPSTREAM"

[J-u-boot.git] / cmd / cedit.c

diff --git a/cmd/cedit.c b/cmd/cedit.c
index 95d5c22c2f75907695bb8ef919d00fabff84e804..fec67a8e334980b3aa7b8e6253cbab5f8a994faa 100644 (file)
--- a/cmd/cedit.c
+++ b/cmd/cedit.c
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <cedit.h>
 #include <command.h>
@@ -210,6 +209,40 @@ static int do_cedit_write_cmos(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
+static int do_cedit_read_cmos(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char *const argv[])
+{
+       struct udevice *dev;
+       bool verbose = false;
+       int ret;
+
+       if (check_cur_expo())
+               return CMD_RET_FAILURE;
+
+       if (argc > 1 && !strcmp(argv[1], "-v")) {
+               verbose = true;
+               argc--;
+               argv++;
+       }
+
+       if (argc > 1)
+               ret = uclass_get_device_by_name(UCLASS_RTC, argv[1], &dev);
+       else
+               ret = uclass_first_device_err(UCLASS_RTC, &dev);
+       if (ret) {
+               printf("Failed to get RTC device: %dE\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       ret = cedit_read_settings_cmos(cur_exp, dev, verbose);
+       if (ret) {
+               printf("Failed to read settings from CMOS: %dE\n", ret);
+               return CMD_RET_FAILURE;
+       }
+
+       return 0;
+}
+
 static int do_cedit_run(struct cmd_tbl *cmdtp, int flag, int argc,
                        char *const argv[])
 {
@@ -236,16 +269,15 @@ static int do_cedit_run(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
-#ifdef CONFIG_SYS_LONGHELP
-static char cedit_help_text[] =
+U_BOOT_LONGHELP(cedit,
        "load <interface> <dev[:part]> <filename>   - load config editor\n"
        "cedit read_fdt <i/f> <dev[:part]> <filename>     - read settings\n"
        "cedit write_fdt <i/f> <dev[:part]> <filename>    - write settings\n"
        "cedit read_env [-v]                              - read settings from env vars\n"
        "cedit write_env [-v]                             - write settings to env vars\n"
+       "cedit read_cmos [-v] [dev]                       - read settings from CMOS RAM\n"
        "cedit write_cmos [-v] [dev]                      - write settings to CMOS RAM\n"
-       "cedit run                                        - run config editor";
-#endif /* CONFIG_SYS_LONGHELP */
+       "cedit run                                        - run config editor");
 
 U_BOOT_CMD_WITH_SUBCMDS(cedit, "Configuration editor", cedit_help_text,
        U_BOOT_SUBCMD_MKENT(load, 5, 1, do_cedit_load),
@@ -253,6 +285,7 @@ U_BOOT_CMD_WITH_SUBCMDS(cedit, "Configuration editor", cedit_help_text,
        U_BOOT_SUBCMD_MKENT(write_fdt, 5, 1, do_cedit_write_fdt),
        U_BOOT_SUBCMD_MKENT(read_env, 2, 1, do_cedit_read_env),
        U_BOOT_SUBCMD_MKENT(write_env, 2, 1, do_cedit_write_env),
+       U_BOOT_SUBCMD_MKENT(read_cmos, 2, 1, do_cedit_read_cmos),
        U_BOOT_SUBCMD_MKENT(write_cmos, 2, 1, do_cedit_write_cmos),
        U_BOOT_SUBCMD_MKENT(run, 1, 1, do_cedit_run),
 );