pinctrl: qcom: Add pinctrl driver for QCS404 SoC

[platform/kernel/u-boot.git] / cmd / adc.c

diff --git a/cmd/adc.c b/cmd/adc.c
index 2d635ac..195efa8 100644 (file)
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -8,7 +8,7 @@
 #include <dm.h>
 #include <adc.h>
 
-static int do_adc_list(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_adc_list(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        struct udevice *dev;
@@ -31,7 +31,7 @@ static int do_adc_list(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_adc_info(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_adc_info(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        struct udevice *dev;
@@ -68,12 +68,12 @@ static int do_adc_info(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static int do_adc_single(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc,
                         char *const argv[])
 {
        struct udevice *dev;
        unsigned int data;
-       int ret, uV;
+       int ret, uV, val;
 
        if (argc < 3)
                return CMD_RET_USAGE;
@@ -81,21 +81,26 @@ static int do_adc_single(cmd_tbl_t *cmdtp, int flag, int argc,
        ret = adc_channel_single_shot(argv[1], simple_strtol(argv[2], NULL, 0),
                                      &data);
        if (ret) {
-               printf("Error getting single shot for device %s channel %s\n",
-                      argv[1], argv[2]);
+               printf("Error getting single shot for device %s channel %s (ret=%d)\n",
+                      argv[1], argv[2], ret);
                return CMD_RET_FAILURE;
        }
 
        ret = uclass_get_device_by_name(UCLASS_ADC, argv[1], &dev);
-       if (!ret && !adc_raw_to_uV(dev, data, &uV))
+       if (!ret && !adc_raw_to_uV(dev, data, &uV)) {
+               val = uV;
                printf("%u, %d uV\n", data, uV);
-       else
+       } else {
+               val = data;
                printf("%u\n", data);
+       }
+
+       env_set_ulong(argv[2], val);
 
        return CMD_RET_SUCCESS;
 }
 
-static int do_adc_scan(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_adc_scan(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        struct adc_channel ch[ADC_MAX_CHANNEL];
@@ -146,37 +151,14 @@ static int do_adc_scan(cmd_tbl_t *cmdtp, int flag, int argc,
        return CMD_RET_SUCCESS;
 }
 
-static cmd_tbl_t cmd_adc_sub[] = {
-       U_BOOT_CMD_MKENT(list, 1, 1, do_adc_list, "", ""),
-       U_BOOT_CMD_MKENT(info, 2, 1, do_adc_info, "", ""),
-       U_BOOT_CMD_MKENT(single, 3, 1, do_adc_single, "", ""),
-       U_BOOT_CMD_MKENT(scan, 3, 1, do_adc_scan, "", ""),
-};
-
-static int do_adc(cmd_tbl_t *cmdtp, int flag, int argc,
-                 char *const argv[])
-{
-       cmd_tbl_t *c;
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-
-       /* Strip off leading 'adc' command argument */
-       argc--;
-       argv++;
-
-       c = find_cmd_tbl(argv[0], &cmd_adc_sub[0], ARRAY_SIZE(cmd_adc_sub));
-
-       if (c)
-               return c->cmd(cmdtp, flag, argc, argv);
-       else
-               return CMD_RET_USAGE;
-}
-
 static char adc_help_text[] =
        "list - list ADC devices\n"
        "adc info <name> - Get ADC device info\n"
-       "adc single <name> <channel> - Get Single data of ADC device channel\n"
+       "adc single <name> <channel> [varname] - Get Single data of ADC device channel\n"
        "adc scan <name> [channel mask] - Scan all [or masked] ADC channels";
 
-U_BOOT_CMD(adc, 4, 1, do_adc, "ADC sub-system", adc_help_text);
+U_BOOT_CMD_WITH_SUBCMDS(adc, "ADC sub-system", adc_help_text,
+       U_BOOT_SUBCMD_MKENT(list, 1, 1, do_adc_list),
+       U_BOOT_SUBCMD_MKENT(info, 2, 1, do_adc_info),
+       U_BOOT_SUBCMD_MKENT(single, 3, 1, do_adc_single),
+       U_BOOT_SUBCMD_MKENT(scan, 3, 1, do_adc_scan));