cmd: pinmux: update result of do_status

Update the result of do_status and always returns a CMD_RET_ value
(-ENOSYS was a possible result of show_pinmux).

This patch also adds pincontrol name in error messages (dev->name)
and treats correctly the status sub command when pin-controller device is
not selected.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/pinmux.c b/cmd/pinmux.c
index 9942b154196c241f68bc86b5ff159e60a0d7e05f..0df78c71da7d2f14df9297e9f634e0b8bfb98da0 100644 (file)
--- a/cmd/pinmux.c
+++ b/cmd/pinmux.c
@@ -52,20 +52,21 @@ static int show_pinmux(struct udevice *dev)
        pins_count = pinctrl_get_pins_count(dev);
 
        if (pins_count == -ENOSYS) {
-               printf("Ops get_pins_count not supported\n");
+               printf("Ops get_pins_count not supported by %s\n", dev->name);
                return pins_count;
        }
 
        for (i = 0; i < pins_count; i++) {
                ret = pinctrl_get_pin_name(dev, i, pin_name, PINNAME_SIZE);
-               if (ret == -ENOSYS) {
-                       printf("Ops get_pin_name not supported\n");
+               if (ret) {
+                       printf("Ops get_pin_name error (%d) by %s\n", ret, dev->name);
                        return ret;
                }
 
                ret = pinctrl_get_pin_muxing(dev, i, pin_mux, PINMUX_SIZE);
                if (ret) {
-                       printf("Ops get_pin_muxing error (%d)\n", ret);
+                       printf("Ops get_pin_muxing error (%d) by %s in %s\n",
+                              ret, pin_name, dev->name);
                        return ret;
                }
 
@@ -80,25 +81,27 @@ static int do_status(struct cmd_tbl *cmdtp, int flag, int argc,
                     char *const argv[])
 {
        struct udevice *dev;
-       int ret = CMD_RET_USAGE;
 
-       if (currdev && (argc < 2 || strcmp(argv[1], "-a")))
-               return show_pinmux(currdev);
+       if (argc < 2) {
+               if (!currdev) {
+                       printf("pin-controller device not selected\n");
+                       return CMD_RET_FAILURE;
+               }
+               show_pinmux(currdev);
+               return CMD_RET_SUCCESS;
+       }
 
-       if (argc < 2 || strcmp(argv[1], "-a"))
-               return ret;
+       if (strcmp(argv[1], "-a"))
+               return CMD_RET_USAGE;
 
        uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) {
                /* insert a separator between each pin-controller display */
                printf("--------------------------\n");
                printf("%s:\n", dev->name);
-               ret = show_pinmux(dev);
-               if (ret < 0)
-                       printf("Can't display pin muxing for %s\n",
-                              dev->name);
+               show_pinmux(dev);
        }
 
-       return ret;
+       return CMD_RET_SUCCESS;
 }
 
 static int do_list(struct cmd_tbl *cmdtp, int flag, int argc,

diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h
index 1bdc8d3cbd77455e014b994861dfac132317e0e7..695e78ad0de6e70952fbdd4c263c8d0442374670 100644 (file)
--- a/include/dm/pinctrl.h
+++ b/include/dm/pinctrl.h
@@ -587,7 +587,7 @@ int pinctrl_get_pin_muxing(struct udevice *dev, int selector, char *buf,
  *
  * This allows to know the number of pins owned by a given pin-controller
  *
- * Return: Number of pins if OK, or negative error code on failure
+ * Return: Number of pins if OK, or -ENOSYS when not supported
  */
 int pinctrl_get_pins_count(struct udevice *dev);
 

diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py
index 0cbbae000c8adc0a50793feffa49e693cad6300e..b3ae2ab0240d394607786dcc9d630b2289a16c74 100644 (file)
--- a/test/py/tests/test_pinmux.py
+++ b/test/py/tests/test_pinmux.py
@@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console):
 @pytest.mark.buildconfigspec('cmd_pinmux')
 def test_pinmux_usage_2(u_boot_console):
     """Test that 'pinmux status' executed without previous "pinmux dev"
-    command displays pinmux usage."""
+    command displays error message."""
     output = u_boot_console.run_command('pinmux status')
-    assert 'Usage:' in output
+    assert 'pin-controller device not selected' in output
 
 @pytest.mark.buildconfigspec('cmd_pinmux')
 @pytest.mark.boardspec('sandbox')