diff options
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-omap.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index c57244ef428b..3a0c1606f885 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c | |||
@@ -1037,18 +1037,6 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start, | |||
1037 | IRQ_NOREQUEST | IRQ_NOPROBE, 0); | 1037 | IRQ_NOREQUEST | IRQ_NOPROBE, 0); |
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | #if defined(CONFIG_OF_GPIO) | ||
1041 | static inline bool omap_gpio_chip_boot_dt(struct gpio_chip *chip) | ||
1042 | { | ||
1043 | return chip->of_node != NULL; | ||
1044 | } | ||
1045 | #else | ||
1046 | static inline bool omap_gpio_chip_boot_dt(struct gpio_chip *chip) | ||
1047 | { | ||
1048 | return false; | ||
1049 | } | ||
1050 | #endif | ||
1051 | |||
1052 | static void omap_gpio_chip_init(struct gpio_bank *bank) | 1040 | static void omap_gpio_chip_init(struct gpio_bank *bank) |
1053 | { | 1041 | { |
1054 | int j; | 1042 | int j; |
@@ -1089,7 +1077,7 @@ static void omap_gpio_chip_init(struct gpio_bank *bank) | |||
1089 | * irq_create_of_mapping() only for the GPIO lines that | 1077 | * irq_create_of_mapping() only for the GPIO lines that |
1090 | * are used as interrupts. | 1078 | * are used as interrupts. |
1091 | */ | 1079 | */ |
1092 | if (!omap_gpio_chip_boot_dt(&bank->chip)) | 1080 | if (!bank->chip.of_node) |
1093 | for (j = 0; j < bank->width; j++) | 1081 | for (j = 0; j < bank->width; j++) |
1094 | irq_create_mapping(bank->domain, j); | 1082 | irq_create_mapping(bank->domain, j); |
1095 | irq_set_chained_handler(bank->irq, gpio_irq_handler); | 1083 | irq_set_chained_handler(bank->irq, gpio_irq_handler); |
@@ -1125,7 +1113,7 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq, | |||
1125 | * but until then this has to be done on a per driver | 1113 | * but until then this has to be done on a per driver |
1126 | * basis. Remove this once this is managed by the core. | 1114 | * basis. Remove this once this is managed by the core. |
1127 | */ | 1115 | */ |
1128 | if (omap_gpio_chip_boot_dt(&bank->chip)) { | 1116 | if (bank->chip.of_node) { |
1129 | gpio = irq_to_gpio(bank, hwirq); | 1117 | gpio = irq_to_gpio(bank, hwirq); |
1130 | ret = gpio_request_one(gpio, GPIOF_IN, NULL); | 1118 | ret = gpio_request_one(gpio, GPIOF_IN, NULL); |
1131 | if (ret) { | 1119 | if (ret) { |