Merge branch '2019-10-28-azure-ci-support'

[oweals/u-boot.git] / cmd / adc.c

diff --git a/cmd/adc.c b/cmd/adc.c
index c8857ed147e79c2be63920678f1b355955a37d2b..381961cf51a41f2959c8148a1fb21bb169b50f04 100644 (file)
--- a/cmd/adc.c
+++ b/cmd/adc.c
@@ -35,7 +35,7 @@ static int do_adc_info(cmd_tbl_t *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        struct udevice *dev;
-       unsigned int data_mask;
+       unsigned int data_mask, ch_mask;
        int ret, vss, vdd;
 
        if (argc < 2)
@@ -49,6 +49,10 @@ static int do_adc_info(cmd_tbl_t *cmdtp, int flag, int argc,
 
        printf("ADC Device '%s' :\n", argv[1]);
 
+       ret = adc_channel_mask(dev, &ch_mask);
+       if (!ret)
+               printf("channel mask: %x\n", ch_mask);
+
        ret = adc_data_mask(dev, &data_mask);
        if (!ret)
                printf("data mask: %x\n", data_mask);
@@ -67,8 +71,9 @@ static int do_adc_info(cmd_tbl_t *cmdtp, int flag, int argc,
 static int do_adc_single(cmd_tbl_t *cmdtp, int flag, int argc,
                         char *const argv[])
 {
+       struct udevice *dev;
        unsigned int data;
-       int ret;
+       int ret, uV;
 
        if (argc < 3)
                return CMD_RET_USAGE;
@@ -81,40 +86,74 @@ static int do_adc_single(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       printf("%u\n", data);
+       ret = uclass_get_device_by_name(UCLASS_ADC, argv[1], &dev);
+       if (!ret && !adc_raw_to_uV(dev, data, &uV))
+               printf("%u, %d uV\n", data, uV);
+       else
+               printf("%u\n", data);
 
        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, "", ""),
-};
-
-static int do_adc(cmd_tbl_t *cmdtp, int flag, int argc,
-                 char *const argv[])
+static int do_adc_scan(cmd_tbl_t *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct adc_channel ch[ADC_MAX_CHANNEL];
+       struct udevice *dev;
+       unsigned int ch_mask;
+       int i, chan, ret, uV;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       /* Strip off leading 'adc' command argument */
-       argc--;
-       argv++;
+       ret = uclass_get_device_by_name(UCLASS_ADC, argv[1], &dev);
+       if (ret) {
+               pr_err("Can't get the ADC %s: %d\n", argv[1], ret);
+               return CMD_RET_FAILURE;
+       }
 
-       c = find_cmd_tbl(argv[0], &cmd_adc_sub[0], ARRAY_SIZE(cmd_adc_sub));
+       switch (argc) {
+       case 3:
+               ch_mask = simple_strtoul(argv[2], NULL, 0);
+               if (ch_mask)
+                       break;
+       case 2:
+               ret = adc_channel_mask(dev, &ch_mask);
+               if (ret) {
+                       pr_err("Can't get mask for %s: %d\n", dev->name, ret);
+                       return CMD_RET_FAILURE;
+               }
+               break;
+       }
 
-       if (c)
-               return c->cmd(cmdtp, flag, argc, argv);
-       else
-               return CMD_RET_USAGE;
+       ret = adc_channels_single_shot(dev->name, ch_mask, ch);
+       if (ret) {
+               pr_err("Can't get single shot for %s (chans mask: 0x%x): %d\n",
+                      dev->name, ch_mask, ret);
+               return CMD_RET_FAILURE;
+       }
+
+       for (chan = 0, i = 0; chan < ADC_MAX_CHANNEL; chan++) {
+               if (!(ch_mask & ADC_CHANNEL(chan)))
+                       continue;
+               if (!adc_raw_to_uV(dev, ch[i].data, &uV))
+                       printf("[%02d]: %u, %d uV\n", ch[i].id, ch[i].data, uV);
+               else
+                       printf("[%02d]: %u\n", ch[i].id, ch[i].data);
+               i++;
+       }
+
+       return CMD_RET_SUCCESS;
 }
 
 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";
-
-U_BOOT_CMD(adc, 4, 1, do_adc, "ADC sub-system", adc_help_text);
+       "adc single <name> <channel> - Get Single data of ADC device channel\n"
+       "adc scan <name> [channel mask] - Scan all [or masked] ADC channels";
+
+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));