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

Commit 70637a6d authored Jun 25, 2013 by Heiko Stübner Committed by Linus Walleij Jun 25, 2013

pinctrl: more clarifications for generic pull configs



PULL_PIN_DEFAULT is meant for hardware completely hiding any pull
settings from the driver, so that it's really only possible to turn
the pull on or off, but it not being possible to determine any
pull settings from software.

Also the binding-documentation for the pull arguments did not match
the changes to the expected values.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent ad42fc6c

Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -165,9 +165,8 @@ output-high - set the pin to output mode with high level

	Arguments for parameters:		Arguments for parameters:

	- bias-pull-up, -down and -pin-default take as optional argument 0 to disable		- bias-pull-up, -down and -pin-default take as optional argument on hardware
	the pull, on hardware supporting it the pull strength in Ohm. bias-disable		supporting it the pull strength in Ohm. bias-disable will disable the pull.
	will also disable any active pull.

	- drive-strength takes as argument the target strength in mA.		- drive-strength takes as argument the target strength in mA.

include/linux/pinctrl/pinconf-generic.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,10 @@
	* impedance to GROUND). If the argument is != 0 pull-down is enabled,		* impedance to GROUND). If the argument is != 0 pull-down is enabled,
	* if it is 0, pull-down is total, i.e. the pin is connected to GROUND.		* if it is 0, pull-down is total, i.e. the pin is connected to GROUND.
	* @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based		* @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based
	* on embedded knowledge of the controller, like current mux function.		* on embedded knowledge of the controller hardware, like current mux
			* function. The pull direction and possibly strength too will normally
			* be decided completely inside the hardware block and not be readable
			* from the kernel side.
	* If the argument is != 0 pull up/down is enabled, if it is 0, the		* If the argument is != 0 pull up/down is enabled, if it is 0, the
	* configuration is ignored. The proper way to disable it is to use		* configuration is ignored. The proper way to disable it is to use
	* @PIN_CONFIG_BIAS_DISABLE.		* @PIN_CONFIG_BIAS_DISABLE.