test: pinmux: add pincontrol-gpio for pin configuration

Add a simple pincontrol associated to the sandbox gpio driver,
that allows to check pin configuration with the command pinmux.

The pinmux test is also updated to test behavior with 2 pincontrols.

Example to check LED pin configuration:

=> pinmux list
| Device                        | Driver                        | Parent
| pinctrl-gpio                  | sandbox_pinctrl_gpio          | root_driver
| pinctrl                       | sandbox_pinctrl               | root_driver

=> pinmux dev pinctrl-gpio

=> pinmux status

a0        : gpio input .
a1        : gpio input .
a2        : gpio input .
a3        : gpio input .
a4        : gpio input .
a5        : gpio output .
a6        : gpio output .
...

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

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 0b1c29f8943d96bc5c783ca1675c8d4ed98d2ecc..df9f1835c9e9ff387772e2ea58adedc37215dd01 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -299,28 +299,32 @@
                };
        };
 
-       gpio_a: base-gpios {
-               compatible = "sandbox,gpio";
-               gpio-controller;
-               #gpio-cells = <1>;
-               gpio-bank-name = "a";
-               sandbox,gpio-count = <20>;
-       };
-
-       gpio_b: extra-gpios {
-               compatible = "sandbox,gpio";
-               gpio-controller;
-               #gpio-cells = <5>;
-               gpio-bank-name = "b";
-               sandbox,gpio-count = <10>;
-       };
-
-       gpio_c: extra2-gpios {
-               compatible = "sandbox,gpio";
-               gpio-controller;
-               #gpio-cells = <2>;
-               gpio-bank-name = "c";
-               sandbox,gpio-count = <10>;
+       pinctrl-gpio {
+               compatible = "sandbox,pinctrl-gpio";
+
+               gpio_a: base-gpios {
+                       compatible = "sandbox,gpio";
+                       gpio-controller;
+                       #gpio-cells = <1>;
+                       gpio-bank-name = "a";
+                       sandbox,gpio-count = <20>;
+               };
+
+               gpio_b: extra-gpios {
+                       compatible = "sandbox,gpio";
+                       gpio-controller;
+                       #gpio-cells = <5>;
+                       gpio-bank-name = "b";
+                       sandbox,gpio-count = <10>;
+               };
+
+               gpio_c: pinmux-gpios {
+                       compatible = "sandbox,gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-bank-name = "c";
+                       sandbox,gpio-count = <10>;
+               };
        };
 
        i2c@0 {

diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index a9c470ee5e6cd1643906dda95a328b25226464c1..9549c74c2bee62db86d23b3964f4f6ebaf51c692 100644 (file)
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -8,6 +8,7 @@
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/gpio.h>
+#include <dm/device_compat.h>
 #include <dm/lists.h>
 #include <dm/of.h>
 #include <dm/pinctrl.h>
@@ -251,3 +252,198 @@ U_BOOT_DRIVER(gpio_sandbox) = {
        .remove = gpio_sandbox_remove,
        .ops    = &gpio_sandbox_ops,
 };
+
+/* pincontrol: used only to check GPIO pin configuration (pinmux command) */
+
+struct sb_pinctrl_priv {
+       int pinctrl_ngpios;
+       struct list_head gpio_dev;
+};
+
+struct sb_gpio_bank {
+       struct udevice *gpio_dev;
+       struct list_head list;
+};
+
+static int sb_populate_gpio_dev_list(struct udevice *dev)
+{
+       struct sb_pinctrl_priv *priv = dev_get_priv(dev);
+       struct udevice *gpio_dev;
+       struct udevice *child;
+       struct sb_gpio_bank *gpio_bank;
+       int ret;
+
+       /*
+        * parse pin-controller sub-nodes (ie gpio bank nodes) and fill
+        * a list with all gpio device reference which belongs to the
+        * current pin-controller. This list is used to find pin_name and
+        * pin muxing
+        */
+       list_for_each_entry(child, &dev->child_head, sibling_node) {
+               ret = uclass_get_device_by_name(UCLASS_GPIO, child->name,
+                                               &gpio_dev);
+               if (ret < 0)
+                       continue;
+
+               gpio_bank = malloc(sizeof(*gpio_bank));
+               if (!gpio_bank) {
+                       dev_err(dev, "Not enough memory\n");
+                       return -ENOMEM;
+               }
+
+               gpio_bank->gpio_dev = gpio_dev;
+               list_add_tail(&gpio_bank->list, &priv->gpio_dev);
+       }
+
+       return 0;
+}
+
+static int sb_pinctrl_get_pins_count(struct udevice *dev)
+{
+       struct sb_pinctrl_priv *priv = dev_get_priv(dev);
+       struct gpio_dev_priv *uc_priv;
+       struct sb_gpio_bank *gpio_bank;
+
+       /*
+        * if get_pins_count has already been executed once on this
+        * pin-controller, no need to run it again
+        */
+       if (priv->pinctrl_ngpios)
+               return priv->pinctrl_ngpios;
+
+       if (list_empty(&priv->gpio_dev))
+               sb_populate_gpio_dev_list(dev);
+       /*
+        * walk through all banks to retrieve the pin-controller
+        * pins number
+        */
+       list_for_each_entry(gpio_bank, &priv->gpio_dev, list) {
+               uc_priv = dev_get_uclass_priv(gpio_bank->gpio_dev);
+
+               priv->pinctrl_ngpios += uc_priv->gpio_count;
+       }
+
+       return priv->pinctrl_ngpios;
+}
+
+static struct udevice *sb_pinctrl_get_gpio_dev(struct udevice *dev,
+                                              unsigned int selector,
+                                              unsigned int *idx)
+{
+       struct sb_pinctrl_priv *priv = dev_get_priv(dev);
+       struct sb_gpio_bank *gpio_bank;
+       struct gpio_dev_priv *uc_priv;
+       int pin_count = 0;
+
+       if (list_empty(&priv->gpio_dev))
+               sb_populate_gpio_dev_list(dev);
+
+       /* look up for the bank which owns the requested pin */
+       list_for_each_entry(gpio_bank, &priv->gpio_dev, list) {
+               uc_priv = dev_get_uclass_priv(gpio_bank->gpio_dev);
+
+               if (selector < (pin_count + uc_priv->gpio_count)) {
+                       /*
+                        * we found the bank, convert pin selector to
+                        * gpio bank index
+                        */
+                       *idx = selector - pin_count;
+
+                       return gpio_bank->gpio_dev;
+               }
+               pin_count += uc_priv->gpio_count;
+       }
+
+       return NULL;
+}
+
+static const char *sb_pinctrl_get_pin_name(struct udevice *dev,
+                                          unsigned int selector)
+{
+       struct gpio_dev_priv *uc_priv;
+       struct udevice *gpio_dev;
+       unsigned int gpio_idx;
+       static char pin_name[PINNAME_SIZE];
+
+       /* look up for the bank which owns the requested pin */
+       gpio_dev = sb_pinctrl_get_gpio_dev(dev, selector, &gpio_idx);
+       if (!gpio_dev) {
+               snprintf(pin_name, PINNAME_SIZE, "Error");
+       } else {
+               uc_priv = dev_get_uclass_priv(gpio_dev);
+
+               snprintf(pin_name, PINNAME_SIZE, "%s%d",
+                        uc_priv->bank_name,
+                        gpio_idx);
+       }
+
+       return pin_name;
+}
+
+static char *get_dir_flags_string(ulong flags)
+{
+       if (flags & GPIOD_OPEN_DRAIN)
+               return "drive-open-drain";
+       if (flags & GPIOD_OPEN_SOURCE)
+               return "drive-open-source";
+       if (flags & GPIOD_PULL_UP)
+               return "bias-pull-up";
+       if (flags & GPIOD_PULL_DOWN)
+               return "bias-pull-down";
+       return ".";
+}
+
+static int sb_pinctrl_get_pin_muxing(struct udevice *dev,
+                                    unsigned int selector,
+                                    char *buf, int size)
+{
+       struct udevice *gpio_dev;
+       unsigned int gpio_idx;
+       ulong dir_flags;
+       int function;
+
+       /* look up for the bank which owns the requested pin */
+       gpio_dev = sb_pinctrl_get_gpio_dev(dev, selector, &gpio_idx);
+       if (!gpio_dev) {
+               snprintf(buf, size, "Error");
+       } else {
+               function = sb_gpio_get_function(gpio_dev, gpio_idx);
+               dir_flags = *get_gpio_dir_flags(gpio_dev, gpio_idx);
+
+               snprintf(buf, size, "gpio %s %s",
+                        function == GPIOF_OUTPUT ? "output" : "input",
+                        get_dir_flags_string(dir_flags));
+       }
+
+       return 0;
+}
+
+static int sandbox_pinctrl_probe(struct udevice *dev)
+{
+       struct sb_pinctrl_priv *priv = dev_get_priv(dev);
+
+       INIT_LIST_HEAD(&priv->gpio_dev);
+
+       return 0;
+}
+
+static struct pinctrl_ops sandbox_pinctrl_gpio_ops = {
+       .get_pin_name           = sb_pinctrl_get_pin_name,
+       .get_pins_count         = sb_pinctrl_get_pins_count,
+       .get_pin_muxing         = sb_pinctrl_get_pin_muxing,
+};
+
+static const struct udevice_id sandbox_pinctrl_gpio_match[] = {
+       { .compatible = "sandbox,pinctrl-gpio" },
+       { /* sentinel */ }
+};
+
+U_BOOT_DRIVER(sandbox_pinctrl_gpio) = {
+       .name = "sandbox_pinctrl_gpio",
+       .id = UCLASS_PINCTRL,
+       .of_match = sandbox_pinctrl_gpio_match,
+       .ops = &sandbox_pinctrl_gpio_ops,
+       .bind = dm_scan_fdt_dev,
+       .probe = sandbox_pinctrl_probe,
+       .priv_auto_alloc_size   = sizeof(struct sb_pinctrl_priv),
+};

diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py
index 5ca0b4b6307c84e3a5592696570a6b1f0af66c29..4e6df992a4eb6aef05c72dca5ea81128ef3340eb 100644 (file)
--- a/test/py/tests/test_pinmux.py
+++ b/test/py/tests/test_pinmux.py
@@ -22,6 +22,12 @@ def test_pinmux_usage_2(u_boot_console):
 def test_pinmux_status_all(u_boot_console):
     """Test that 'pinmux status -a' displays pin's muxing."""
     output = u_boot_console.run_command('pinmux status -a')
+
+    assert ('pinctrl-gpio:' in output)
+    assert ('a5        : gpio output .' in output)
+    assert ('a6        : gpio output .' in output)
+
+    assert ('pinctrl:' in output)
     assert ('SCL       : I2C SCL.' in output)
     assert ('SDA       : I2C SDA.' in output)
     assert ('TX        : Uart TX.' in output)
@@ -63,6 +69,10 @@ def test_pinmux_status(u_boot_console):
     """Test that 'pinmux status' displays selected pincontroller's pin
     muxing descriptions."""
     output = u_boot_console.run_command('pinmux status')
+
+    assert (not 'pinctrl-gpio:' in output)
+    assert (not 'pinctrl:' in output)
+
     assert ('SCL       : I2C SCL.' in output)
     assert ('SDA       : I2C SDA.' in output)
     assert ('TX        : Uart TX.' in output)