pinctrl: sh-pfc: Confine legacy function GPIOs to SH

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / sh-pfc / gpio.c

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index ba353735ecf2be9a1ca39c29e516c850beaa1ce1..685b3c24627daf03e6f049dc0a9e38ffa74419ff 100644 (file)
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -261,6 +261,7 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
  * Function GPIOs
  */
 
+#ifdef CONFIG_SUPERH
 static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
 {
        static bool __print_once;
@@ -286,17 +287,12 @@ static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
        return ret;
 }
 
-static void gpio_function_free(struct gpio_chip *gc, unsigned offset)
-{
-}
-
 static int gpio_function_setup(struct sh_pfc_chip *chip)
 {
        struct sh_pfc *pfc = chip->pfc;
        struct gpio_chip *gc = &chip->gpio_chip;
 
        gc->request = gpio_function_request;
-       gc->free = gpio_function_free;
 
        gc->label = pfc->info->name;
        gc->owner = THIS_MODULE;
@@ -305,6 +301,7 @@ static int gpio_function_setup(struct sh_pfc_chip *chip)
 
        return 0;
 }
+#endif
 
 /* -----------------------------------------------------------------------------
  * Register/unregister
@@ -379,24 +376,32 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 
        pfc->gpio = chip;
 
-       /* Register the GPIO to pin mappings. As pins with GPIO ports must come
-        * first in the ranges, skip the pins without GPIO ports by stopping at
-        * the first range that contains such a pin.
-        */
-       for (i = 0; i < pfc->nr_ranges; ++i) {
-               const struct sh_pfc_pin_range *range = &pfc->ranges[i];
-
-               if (range->start >= pfc->nr_gpio_pins)
-                       break;
+       if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
+               return 0;
 
-               ret = gpiochip_add_pin_range(&chip->gpio_chip,
-                                            dev_name(pfc->dev),
-                                            range->start, range->start,
-                                            range->end - range->start + 1);
-               if (ret < 0)
-                       return ret;
+       if (IS_ENABLED(CONFIG_SUPERH) ||
+           IS_ENABLED(CONFIG_ARCH_SHMOBILE_LEGACY)) {
+               /*
+                * Register the GPIO to pin mappings. As pins with GPIO ports
+                * must come first in the ranges, skip the pins without GPIO
+                * ports by stopping at the first range that contains such a
+                * pin.
+                */
+               for (i = 0; i < pfc->nr_ranges; ++i) {
+                       const struct sh_pfc_pin_range *range = &pfc->ranges[i];
+
+                       if (range->start >= pfc->nr_gpio_pins)
+                               break;
+
+                       ret = gpiochip_add_pin_range(&chip->gpio_chip,
+                               dev_name(pfc->dev), range->start, range->start,
+                               range->end - range->start + 1);
+                       if (ret < 0)
+                               return ret;
+               }
        }
 
+#ifdef CONFIG_SUPERH
        /* Register the function GPIOs chip. */
        if (pfc->info->nr_func_gpios == 0)
                return 0;
@@ -406,6 +411,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
                return PTR_ERR(chip);
 
        pfc->func = chip;
+#endif /* CONFIG_SUPERH */
 
        return 0;
 }
@@ -413,7 +419,8 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
 int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc)
 {
        gpiochip_remove(&pfc->gpio->gpio_chip);
+#ifdef CONFIG_SUPERH
        gpiochip_remove(&pfc->func->gpio_chip);
-
+#endif
        return 0;
 }