|
@@ -341,7 +341,6 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
|
|
|
struct sh_pfc_chip *chip;
|
|
|
phys_addr_t address;
|
|
|
unsigned int i;
|
|
|
- int ret;
|
|
|
|
|
|
if (pfc->info->data_regs == NULL)
|
|
|
return 0;
|
|
@@ -379,29 +378,27 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
|
|
|
if (IS_ENABLED(CONFIG_OF) && pfc->dev->of_node)
|
|
|
return 0;
|
|
|
|
|
|
- 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 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];
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ 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;
|