configs: x530: move MTDPART/MTDIDS_DEFAULT in defconfig

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

diff --git a/cmd/regulator.c b/cmd/regulator.c
index aa06c9a..ed4996d 100644 (file)
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -25,7 +25,7 @@ static int failure(int ret)
 
 static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        const char *name;
        int ret = -ENXIO;
 
@@ -43,7 +43,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
                        return CMD_RET_USAGE;
                }
 
-               uc_pdata = dev_get_uclass_platdata(currdev);
+               uc_pdata = dev_get_uclass_plat(currdev);
                if (!uc_pdata) {
                        printf("%s: no regulator platform data!\n", currdev->name);
                        return failure(ret);
@@ -55,9 +55,9 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        return CMD_RET_SUCCESS;
 }
 
-static int curr_dev_and_platdata(struct udevice **devp,
-                                struct dm_regulator_uclass_platdata **uc_pdata,
-                                bool allow_type_fixed)
+static int curr_dev_and_plat(struct udevice **devp,
+                            struct dm_regulator_uclass_plat **uc_pdata,
+                            bool allow_type_fixed)
 {
        *devp = NULL;
        *uc_pdata = NULL;
@@ -69,7 +69,7 @@ static int curr_dev_and_platdata(struct udevice **devp,
 
        *devp = currdev;
 
-       *uc_pdata = dev_get_uclass_platdata(*devp);
+       *uc_pdata = dev_get_uclass_plat(*devp);
        if (!*uc_pdata) {
                pr_err("Regulator: %s - missing platform data!\n", currdev->name);
                return CMD_RET_FAILURE;
@@ -86,7 +86,7 @@ static int curr_dev_and_platdata(struct udevice **devp,
 static int do_list(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[])
 {
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        struct udevice *dev;
        int ret;
 
@@ -100,7 +100,7 @@ static int do_list(struct cmd_tbl *cmdtp, int flag, int argc,
                if (ret)
                        continue;
 
-               uc_pdata = dev_get_uclass_platdata(dev);
+               uc_pdata = dev_get_uclass_plat(dev);
                printf("| %-*.*s| %-*.*s| %s\n",
                       LIMIT_DEVNAME, LIMIT_DEVNAME, dev->name,
                       LIMIT_OFNAME, LIMIT_OFNAME, uc_pdata->name,
@@ -143,14 +143,14 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        struct dm_regulator_mode *modes;
        const char *parent_uc;
        int mode_count;
        int ret;
        int i;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, true);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, true);
        if (ret)
                return ret;
 
@@ -183,7 +183,7 @@ static int do_info(struct cmd_tbl *cmdtp, int flag, int argc,
 }
 
 static void do_status_detail(struct udevice *dev,
-                            struct dm_regulator_uclass_platdata *uc_pdata)
+                            struct dm_regulator_uclass_plat *uc_pdata)
 {
        int current, value, mode;
        const char *mode_name;
@@ -205,14 +205,14 @@ static void do_status_detail(struct udevice *dev,
        constraint(" * mode id:", mode, mode_name);
 }
 
-static void do_status_line(struct udevice *dev)
+static void do_status_line(struct udevice *dev, int status)
 {
-       struct dm_regulator_uclass_platdata *pdata;
+       struct dm_regulator_uclass_plat *pdata;
        int current, value, mode;
        const char *mode_name;
        bool enabled;
 
-       pdata = dev_get_uclass_platdata(dev);
+       pdata = dev_get_uclass_plat(dev);
        enabled = regulator_get_enable(dev);
        value = regulator_get_value(dev);
        current = regulator_get_current(dev);
@@ -231,18 +231,19 @@ static void do_status_line(struct udevice *dev)
                printf("%-10s", mode_name);
        else
                printf("%-10s", "-");
+       printf(" %i", status);
        printf("\n");
 }
 
 static int do_status(struct cmd_tbl *cmdtp, int flag, int argc,
                     char *const argv[])
 {
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        struct udevice *dev;
        int ret;
 
        if (currdev && (argc < 2 || strcmp(argv[1], "-a"))) {
-               ret = curr_dev_and_platdata(&dev, &uc_pdata, true);
+               ret = curr_dev_and_plat(&dev, &uc_pdata, true);
                if (ret)
                        return CMD_RET_FAILURE;
                do_status_detail(dev, uc_pdata);
@@ -250,11 +251,11 @@ static int do_status(struct cmd_tbl *cmdtp, int flag, int argc,
        }
 
        /* Show all of them in a list, probing them as needed */
-       printf("%-20s %-10s %10s %10s %-10s\n", "Name", "Enabled", "uV", "mA",
-              "Mode");
-       for (ret = uclass_first_device(UCLASS_REGULATOR, &dev); dev;
-            ret = uclass_next_device(&dev))
-               do_status_line(dev);
+       printf("%-20s %-10s %10s %10s %-10s %s\n", "Name", "Enabled", "uV", "mA",
+              "Mode", "Status");
+       for (ret = uclass_first_device_check(UCLASS_REGULATOR, &dev); dev;
+            ret = uclass_next_device_check(&dev))
+               do_status_line(dev, ret);
 
        return CMD_RET_SUCCESS;
 }
@@ -263,12 +264,12 @@ static int do_value(struct cmd_tbl *cmdtp, int flag, int argc,
                    char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        int value;
        int force;
        int ret;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1);
        if (ret)
                return ret;
 
@@ -313,11 +314,11 @@ static int do_current(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        int current;
        int ret;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, argc == 1);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, argc == 1);
        if (ret)
                return ret;
 
@@ -353,11 +354,11 @@ static int do_mode(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        int mode;
        int ret;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, false);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, false);
        if (ret)
                return ret;
 
@@ -389,10 +390,10 @@ static int do_enable(struct cmd_tbl *cmdtp, int flag, int argc,
                     char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        int ret;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, true);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, true);
        if (ret)
                return ret;
 
@@ -409,10 +410,10 @@ static int do_disable(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {
        struct udevice *dev;
-       struct dm_regulator_uclass_platdata *uc_pdata;
+       struct dm_regulator_uclass_plat *uc_pdata;
        int ret;
 
-       ret = curr_dev_and_platdata(&dev, &uc_pdata, true);
+       ret = curr_dev_and_plat(&dev, &uc_pdata, true);
        if (ret)
                return ret;