summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-pxa.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
-rw-r--r--drivers/gpio/gpio-pxa.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 6029899789f3..f480fb896963 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -330,16 +330,6 @@ static int pxa_gpio_of_xlate(struct gpio_chip *gc,
330} 330}
331#endif 331#endif
332 332
333static int pxa_gpio_request(struct gpio_chip *chip, unsigned int offset)
334{
335 return pinctrl_request_gpio(chip->base + offset);
336}
337
338static void pxa_gpio_free(struct gpio_chip *chip, unsigned int offset)
339{
340 pinctrl_free_gpio(chip->base + offset);
341}
342
343static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio, 333static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
344 struct device_node *np, void __iomem *regbase) 334 struct device_node *np, void __iomem *regbase)
345{ 335{
@@ -358,8 +348,8 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
358 pchip->chip.set = pxa_gpio_set; 348 pchip->chip.set = pxa_gpio_set;
359 pchip->chip.to_irq = pxa_gpio_to_irq; 349 pchip->chip.to_irq = pxa_gpio_to_irq;
360 pchip->chip.ngpio = ngpio; 350 pchip->chip.ngpio = ngpio;
361 pchip->chip.request = pxa_gpio_request; 351 pchip->chip.request = gpiochip_generic_request;
362 pchip->chip.free = pxa_gpio_free; 352 pchip->chip.free = gpiochip_generic_free;
363#ifdef CONFIG_OF_GPIO 353#ifdef CONFIG_OF_GPIO
364 pchip->chip.of_node = np; 354 pchip->chip.of_node = np;
365 pchip->chip.of_xlate = pxa_gpio_of_xlate; 355 pchip->chip.of_xlate = pxa_gpio_of_xlate;