mtd: spinand: toshiba: Support for new Kioxia Serial NAND

[oweals/u-boot.git] / drivers / pinctrl / pinctrl_stm32.c

diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c
index aa92c90b89976c74b20fa7a205e52076efc47196..fc241fdcdef9d89cc4bbb37b3f867eb7f8a2e868 100644 (file)
--- a/drivers/pinctrl/pinctrl_stm32.c
+++ b/drivers/pinctrl/pinctrl_stm32.c
@@ -1,10 +1,17 @@
 #include <common.h>
 #include <dm.h>
-#include <dm/pinctrl.h>
 #include <hwspinlock.h>
+#include <log.h>
+#include <malloc.h>
 #include <asm/arch/gpio.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <dm/device_compat.h>
+#include <dm/lists.h>
+#include <dm/pinctrl.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -28,8 +35,6 @@ struct stm32_gpio_bank {
 
 #ifndef CONFIG_SPL_BUILD
 
-#define MAX_PIN_PER_BANK               16
-
 static char pin_name[PINNAME_SIZE];
 #define PINMUX_MODE_COUNT              5
 static const char * const pinmux_mode[PINMUX_MODE_COUNT] = {
@@ -116,12 +121,13 @@ static int stm32_pinctrl_get_pins_count(struct udevice *dev)
 }
 
 static struct udevice *stm32_pinctrl_get_gpio_dev(struct udevice *dev,
-                                                 unsigned int selector)
+                                                 unsigned int selector,
+                                                 unsigned int *idx)
 {
        struct stm32_pinctrl_priv *priv = dev_get_priv(dev);
        struct stm32_gpio_bank *gpio_bank;
        struct gpio_dev_priv *uc_priv;
-       int first_pin = 0;
+       int pin_count = 0;
 
        if (list_empty(&priv->gpio_dev))
                stm32_populate_gpio_dev_list(dev);
@@ -130,11 +136,19 @@ static struct udevice *stm32_pinctrl_get_gpio_dev(struct udevice *dev,
        list_for_each_entry(gpio_bank, &priv->gpio_dev, list) {
                uc_priv = dev_get_uclass_priv(gpio_bank->gpio_dev);
 
-               if (selector < (first_pin + uc_priv->gpio_count))
-                       /* we found the bank */
-                       return gpio_bank->gpio_dev;
+               if (selector < (pin_count + uc_priv->gpio_count)) {
+                       /*
+                        * we found the bank, convert pin selector to
+                        * gpio bank index
+                        */
+                       *idx = stm32_offset_to_index(gpio_bank->gpio_dev,
+                                                    selector - pin_count);
+                       if (IS_ERR_VALUE(*idx))
+                               return NULL;
 
-               first_pin += uc_priv->gpio_count;
+                       return gpio_bank->gpio_dev;
+               }
+               pin_count += uc_priv->gpio_count;
        }
 
        return NULL;
@@ -145,9 +159,10 @@ static const char *stm32_pinctrl_get_pin_name(struct udevice *dev,
 {
        struct gpio_dev_priv *uc_priv;
        struct udevice *gpio_dev;
+       unsigned int gpio_idx;
 
        /* look up for the bank which owns the requested pin */
-       gpio_dev = stm32_pinctrl_get_gpio_dev(dev, selector);
+       gpio_dev = stm32_pinctrl_get_gpio_dev(dev, selector, &gpio_idx);
        if (!gpio_dev) {
                snprintf(pin_name, PINNAME_SIZE, "Error");
        } else {
@@ -155,7 +170,7 @@ static const char *stm32_pinctrl_get_pin_name(struct udevice *dev,
 
                snprintf(pin_name, PINNAME_SIZE, "%s%d",
                         uc_priv->bank_name,
-                        selector % MAX_PIN_PER_BANK);
+                        gpio_idx);
        }
 
        return pin_name;
@@ -168,23 +183,21 @@ static int stm32_pinctrl_get_pin_muxing(struct udevice *dev,
 {
        struct udevice *gpio_dev;
        const char *label;
-       int gpio_pin;
        int mode;
        int af_num;
+       unsigned int gpio_idx;
 
        /* look up for the bank which owns the requested pin */
-       gpio_dev = stm32_pinctrl_get_gpio_dev(dev, selector);
+       gpio_dev = stm32_pinctrl_get_gpio_dev(dev, selector, &gpio_idx);
 
        if (!gpio_dev)
                return -ENODEV;
 
-       /* translate pin-controller pin number to gpio pin number */
-       gpio_pin = selector % MAX_PIN_PER_BANK;
+       mode = gpio_get_raw_function(gpio_dev, gpio_idx, &label);
 
-       mode = gpio_get_raw_function(gpio_dev, gpio_pin, &label);
+       dev_dbg(dev, "selector = %d gpio_idx = %d mode = %d\n",
+               selector, gpio_idx, mode);
 
-       dev_dbg(dev, "selector = %d gpio_pin = %d mode = %d\n",
-               selector, gpio_pin, mode);
 
        switch (mode) {
        case GPIOF_UNKNOWN:
@@ -194,7 +207,7 @@ static int stm32_pinctrl_get_pin_muxing(struct udevice *dev,
                snprintf(buf, size, "%s", pinmux_mode[mode]);
                break;
        case GPIOF_FUNC:
-               af_num = stm32_pinctrl_get_af(gpio_dev, gpio_pin);
+               af_num = stm32_pinctrl_get_af(gpio_dev, gpio_idx);
                snprintf(buf, size, "%s %d", pinmux_mode[mode], af_num);
                break;
        case GPIOF_OUTPUT:
@@ -209,7 +222,7 @@ static int stm32_pinctrl_get_pin_muxing(struct udevice *dev,
 
 #endif
 
-int stm32_pinctrl_probe(struct udevice *dev)
+static int stm32_pinctrl_probe(struct udevice *dev)
 {
        struct stm32_pinctrl_priv *priv = dev_get_priv(dev);
        int ret;
@@ -358,6 +371,35 @@ static int stm32_pinctrl_config(int offset)
        return 0;
 }
 
+static int stm32_pinctrl_bind(struct udevice *dev)
+{
+       ofnode node;
+       const char *name;
+       int ret;
+
+       dev_for_each_subnode(node, dev) {
+               debug("%s: bind %s\n", __func__, ofnode_get_name(node));
+
+               ofnode_get_property(node, "gpio-controller", &ret);
+               if (ret < 0)
+                       continue;
+               /* Get the name of each gpio node */
+               name = ofnode_get_name(node);
+               if (!name)
+                       return -EINVAL;
+
+               /* Bind each gpio node */
+               ret = device_bind_driver_to_node(dev, "gpio_stm32",
+                                                name, node, NULL);
+               if (ret)
+                       return ret;
+
+               debug("%s: bind %s\n", __func__, name);
+       }
+
+       return 0;
+}
+
 #if CONFIG_IS_ENABLED(PINCTRL_FULL)
 static int stm32_pinctrl_set_state(struct udevice *dev, struct udevice *config)
 {
@@ -415,6 +457,7 @@ static const struct udevice_id stm32_pinctrl_ids[] = {
        { .compatible = "st,stm32f429-pinctrl" },
        { .compatible = "st,stm32f469-pinctrl" },
        { .compatible = "st,stm32f746-pinctrl" },
+       { .compatible = "st,stm32f769-pinctrl" },
        { .compatible = "st,stm32h743-pinctrl" },
        { .compatible = "st,stm32mp157-pinctrl" },
        { .compatible = "st,stm32mp157-z-pinctrl" },
@@ -426,7 +469,7 @@ U_BOOT_DRIVER(pinctrl_stm32) = {
        .id                     = UCLASS_PINCTRL,
        .of_match               = stm32_pinctrl_ids,
        .ops                    = &stm32_pinctrl_ops,
-       .bind                   = dm_scan_fdt_dev,
+       .bind                   = stm32_pinctrl_bind,
        .probe                  = stm32_pinctrl_probe,
        .priv_auto_alloc_size   = sizeof(struct stm32_pinctrl_priv),
 };