Commit a9a1d2a7 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl/gpio: Unify namespace for cross-calls 



The pinctrl_request_gpio() and pinctrl_free_gpio() break the nice
namespacing in the other cross-calls like pinctrl_gpio_foo().
Just rename them and all references so we have one namespace
with all cross-calls under pinctrl_gpio_*().

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2bd6bf03

Documentation/driver-api/pinctl.rst

+3 −3
Original line number Diff line number Diff line
@@ -757,8 +757,8 @@ that your datasheet calls "GPIO mode", but actually is just an electrical 
configuration for a certain device. See the section below named

"GPIO mode pitfalls" for more details on this scenario.



The public pinmux API contains two functions named pinctrl_request_gpio()

and pinctrl_free_gpio(). These two functions shall *ONLY* be called from

The public pinmux API contains two functions named pinctrl_gpio_request()

and pinctrl_gpio_free(). These two functions shall *ONLY* be called from

gpiolib-based drivers as part of their gpio_request() and

gpio_free() semantics. Likewise the pinctrl_gpio_direction_[input|output]

shall only be called from within respective gpio_direction_[input|output]
@@ -790,7 +790,7 @@ gpiolib driver and the affected GPIO range, pin offset and desired direction 
will be passed along to this function.



Alternatively to using these special functions, it is fully allowed to use

named functions for each GPIO pin, the pinctrl_request_gpio() will attempt to

named functions for each GPIO pin, the pinctrl_gpio_request() will attempt to

obtain the function "gpioN" where "N" is the global GPIO pin number if no

special GPIO-handler is registered.

Documentation/gpio/gpio-legacy.txt

+5 −5
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ easily, gating off unused clocks. 


For GPIOs that use pins known to the pinctrl subsystem, that subsystem should

be informed of their use; a gpiolib driver's .request() operation may call

pinctrl_request_gpio(), and a gpiolib driver's .free() operation may call

pinctrl_free_gpio(). The pinctrl subsystem allows a pinctrl_request_gpio()

pinctrl_gpio_request(), and a gpiolib driver's .free() operation may call

pinctrl_gpio_free(). The pinctrl subsystem allows a pinctrl_gpio_request()

to succeed concurrently with a pin or pingroup being "owned" by a device for

pin multiplexing.
@@ -448,8 +448,8 @@ together with an optional gpio feature. We have already covered the 
case where e.g. a GPIO controller need to reserve a pin or set the

direction of a pin by calling any of:



pinctrl_request_gpio()

pinctrl_free_gpio()

pinctrl_gpio_request()

pinctrl_gpio_free()

pinctrl_gpio_direction_input()

pinctrl_gpio_direction_output()
@@ -466,7 +466,7 @@ gpio (under gpiolib) is still maintained by gpio drivers. It may happen 
that different pin ranges in a SoC is managed by different gpio drivers.



This makes it logical to let gpio drivers announce their pin ranges to

the pin ctrl subsystem before it will call 'pinctrl_request_gpio' in order

the pin ctrl subsystem before it will call 'pinctrl_gpio_request' in order

to request the corresponding pin to be prepared by the pinctrl subsystem

before any gpio usage.

Documentation/translations/zh_CN/gpio.txt

+3 −3
Original line number Diff line number Diff line
@@ -257,9 +257,9 @@ GPIO 值的命令需要等待其信息排到队首才发送命令，再获得其 
简单地关闭未使用时钟)。



对于 GPIO 使用 pinctrl 子系统已知的引脚，子系统应该被告知其使用情况；

一个 gpiolib 驱动的 .request()操作应调用 pinctrl_request_gpio()，

而 gpiolib 驱动的 .free()操作应调用 pinctrl_free_gpio()。pinctrl

子系统允许 pinctrl_request_gpio()在某个引脚或引脚组以复用形式“属于”

一个 gpiolib 驱动的 .request()操作应调用 pinctrl_gpio_request()，

而 gpiolib 驱动的 .free()操作应调用 pinctrl_gpio_free()。pinctrl

子系统允许 pinctrl_gpio_request()在某个引脚或引脚组以复用形式“属于”

一个设备时都成功返回。



任何须将 GPIO 信号导向适当引脚的引脚复用硬件的编程应该发生在 GPIO

drivers/gpio/gpio-aspeed.c

+2 −2
Original line number Diff line number Diff line
@@ -536,12 +536,12 @@ static int aspeed_gpio_request(struct gpio_chip *chip, unsigned int offset) 
	if (!have_gpio(gpiochip_get_data(chip), offset))

		return -ENODEV;



	return pinctrl_request_gpio(chip->base + offset);

	return pinctrl_gpio_request(chip->base + offset);

}



static void aspeed_gpio_free(struct gpio_chip *chip, unsigned int offset)

{

	pinctrl_free_gpio(chip->base + offset);

	pinctrl_gpio_free(chip->base + offset);

}



static inline void __iomem *bank_debounce_reg(struct aspeed_gpio *gpio,

drivers/gpio/gpio-em.c

+2 −2
Original line number Diff line number Diff line
@@ -239,12 +239,12 @@ static int em_gio_to_irq(struct gpio_chip *chip, unsigned offset) 


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

{

	return pinctrl_request_gpio(chip->base + offset);

	return pinctrl_gpio_request(chip->base + offset);

}



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

{

	pinctrl_free_gpio(chip->base + offset);

	pinctrl_gpio_free(chip->base + offset);



	/* Set the GPIO as an input to ensure that the next GPIO request won't

	* drive the GPIO pin as an output.

CRA Git | Maintained and supported by SUSTech CRA and CCSE