sh-pfc: Use pinmux identifiers in the pin muxing API

The PFC core exposes a sh_pfc_config_gpio() function that configures
pinmuxing for a given GPIO (either a real GPIO or a function GPIO).
Handling of real and function GPIOs belong to the GPIO layer, move the
GPIO number to mark translation to the caller and rename the function to
sh_pfc_config_mux().

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 22f2999..3387f82 100644 (file)
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -95,13 +95,6 @@ static bool sh_pfc_gpio_is_pin(struct sh_pfc *pfc, unsigned int gpio)
               (pfc->info->pins[gpio].enum_id != 0);
 }
 
-static bool sh_pfc_gpio_is_function(struct sh_pfc *pfc, unsigned int gpio)
-{
-       return (gpio >= pfc->info->nr_pins) &&
-              (gpio < pfc->info->nr_pins + pfc->info->nr_func_gpios) &&
-              (pfc->info->func_gpios[gpio - pfc->info->nr_pins].enum_id != 0);
-}
-
 static unsigned long sh_pfc_read_raw_reg(void __iomem *mapped_reg,
                                         unsigned long reg_width)
 {
@@ -350,41 +343,30 @@ static int sh_pfc_get_config_reg(struct sh_pfc *pfc, pinmux_enum_t enum_id,
        return -1;
 }
 
-static int sh_pfc_gpio_to_enum(struct sh_pfc *pfc, unsigned gpio, int pos,
-                              pinmux_enum_t *enum_idp)
+static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos,
+                             pinmux_enum_t *enum_idp)
 {
        pinmux_enum_t *data = pfc->info->gpio_data;
-       pinmux_enum_t enum_id;
        int k;
 
-       if (sh_pfc_gpio_is_pin(pfc, gpio)) {
-               enum_id = pfc->info->pins[gpio].enum_id;
-       } else if (sh_pfc_gpio_is_function(pfc, gpio)) {
-               unsigned int offset = gpio - pfc->info->nr_pins;
-               enum_id = pfc->info->func_gpios[offset].enum_id;
-       } else {
-               pr_err("non data/mark enum_id for gpio %d\n", gpio);
-               return -1;
-       }
-
        if (pos) {
                *enum_idp = data[pos + 1];
                return pos + 1;
        }
 
        for (k = 0; k < pfc->info->gpio_data_size; k++) {
-               if (data[k] == enum_id) {
+               if (data[k] == mark) {
                        *enum_idp = data[k + 1];
                        return k + 1;
                }
        }
 
-       pr_err("cannot locate data/mark enum_id for gpio %d\n", gpio);
+       pr_err("cannot locate data/mark enum_id for mark %d\n", mark);
        return -1;
 }
 
-int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,
-                      int cfg_mode)
+int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type,
+                     int cfg_mode)
 {
        struct pinmux_cfg_reg *cr = NULL;
        pinmux_enum_t enum_id;
@@ -423,7 +405,7 @@ int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,
        field = 0;
        value = 0;
        while (1) {
-               pos = sh_pfc_gpio_to_enum(pfc, gpio, pos, &enum_id);
+               pos = sh_pfc_mark_to_enum(pfc, mark, pos, &enum_id);
                if (pos <= 0)
                        goto out_err;
 

diff --cc drivers/pinctrl/sh-pfc/core.h
Simple merge

diff --cc drivers/pinctrl/sh-pfc/gpio.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pinctrl.c
Simple merge