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

Commit 256aeb64 authored by Heiko Stübner's avatar Heiko Stübner Committed by Linus Walleij
Browse files

pinctrl: set unit for debounce time pinconfig to usec 



Currently the debounce time pinconfig option uses an unspecified
"time units" unit. As pinconfig options should use SI units and a
real unit is also necessary for generic dt bindings, change it
to usec. Currently no driver is using the generic pinconfig option
for this, so the unit change is safe to do.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 70637a6d

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

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ Arguments for parameters: 
- input-schmitt takes as argument the adjustable hysteresis in a

  driver-specific format



- input-debounce takes the debounce time as argument or 0 to disable debouncing

- input-debounce takes the debounce time in usec as argument

  or 0 to disable debouncing



- power-source argument is the custom value describing the source to select

drivers/pinctrl/pinconf-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct pin_config_item conf_items[] = { 
	PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA"),

	PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL),

	PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL),

	PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"),

	PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "usec"),

	PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"),

	PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL),

	PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"),

include/linux/pinctrl/pinconf-generic.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
 *	setting pins to this mode.

 * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode,

 *	which means it will wait for signals to settle when reading inputs. The

 *	argument gives the debounce time on a custom format. Setting the

 *	argument gives the debounce time in usecs. Setting the

 *	argument to zero turns debouncing off.

 * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power

 *	supplies, the argument to this parameter (on a custom format) tells