Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f9fec5 authored by Yunlei He's avatar Yunlei He Committed by Linus Walleij
Browse files

gpio: pl061: hook request if gpio-ranges avaiable 



Gpio-ranges property is useful to represent which GPIOs correspond
to which pins on which pin controllers. But there may be some gpios
without pinctrl operation. So check whether gpio-ranges property
exists in device node first.

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Signed-off-by: default avatarXinwei Kong <kong.kongxinwei@hisilicon.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a4e63554

drivers/gpio/gpio-pl061.c

+14 −6
Original line number Diff line number Diff line
@@ -52,27 +52,33 @@ struct pl061_gpio { 


	void __iomem		*base;

	struct gpio_chip	gc;

	bool			uses_pinctrl;



#ifdef CONFIG_PM

	struct pl061_context_save_regs csave_regs;

#endif

};



static int pl061_gpio_request(struct gpio_chip *chip, unsigned offset)

static int pl061_gpio_request(struct gpio_chip *gc, unsigned offset)

{

	/*

	 * Map back to global GPIO space and request muxing, the direction

	 * parameter does not matter for this controller.

	 */

	int gpio = chip->base + offset;

	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);

	int gpio = gc->base + offset;



	if (chip->uses_pinctrl)

		return pinctrl_request_gpio(gpio);

	return 0;

}



static void pl061_gpio_free(struct gpio_chip *chip, unsigned offset)

static void pl061_gpio_free(struct gpio_chip *gc, unsigned offset)

{

	int gpio = chip->base + offset;

	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);

	int gpio = gc->base + offset;



	if (chip->uses_pinctrl)

		pinctrl_free_gpio(gpio);

}
@@ -263,6 +269,8 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) 
		return PTR_ERR(chip->base);



	spin_lock_init(&chip->lock);

	if (of_property_read_bool(dev->of_node, "gpio-ranges"))

		chip->uses_pinctrl = true;



	chip->gc.request = pl061_gpio_request;

	chip->gc.free = pl061_gpio_free;