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

Commit ca9c80d8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: set unit for debounce time pinconfig to usec"

parents f8583849 239f15e1

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

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,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
@@ -66,7 +66,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