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

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

Merge "pinctrl: Adds slew-rate, input-enable/disable"

parents 8be86310 fe388ba1

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

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ drive-push-pull - drive actively high and low 
drive-open-drain	- drive with open drain

drive-open-source	- drive with open source

drive-strength		- sink or source at most X mA

input-enable		- enable input on pin (no effect on output)

input-disable		- disable input on pin (no effect on output)

input-schmitt-enable	- enable schmitt-trigger mode

input-schmitt-disable	- disable schmitt-trigger mode

input-debounce		- debounce mode with debound time X
@@ -159,6 +161,7 @@ low-power-enable - enable low power mode 
low-power-disable	- disable low power mode

output-low		- set the pin to output mode with low level

output-high		- set the pin to output mode with high level

slew-rate		- set the slew rate



Arguments for parameters:

drivers/pinctrl/pinconf-generic.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static struct pin_config_item conf_items[] = { 
	PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL),

	PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL),

	PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA"),

	PCONFDUMP(PIN_CONFIG_INPUT_ENABLE, "input enabled", NULL),

	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", "usec"),
@@ -159,6 +160,8 @@ static struct pinconf_generic_dt_params dt_params[] = { 
	{ "drive-open-drain", PIN_CONFIG_DRIVE_OPEN_DRAIN, 0 },

	{ "drive-open-source", PIN_CONFIG_DRIVE_OPEN_SOURCE, 0 },

	{ "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 0 },

	{ "input-enable", PIN_CONFIG_INPUT_ENABLE, 1 },

	{ "input-disable", PIN_CONFIG_INPUT_ENABLE, 0 },

	{ "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 },

	{ "input-schmitt-disable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 0 },

	{ "input-debounce", PIN_CONFIG_INPUT_DEBOUNCE, 0 },
@@ -166,6 +169,7 @@ static struct pinconf_generic_dt_params dt_params[] = { 
	{ "low-power-disable", PIN_CONFIG_LOW_POWER_MODE, 0 },

	{ "output-low", PIN_CONFIG_OUTPUT, 0, },

	{ "output-high", PIN_CONFIG_OUTPUT, 1, },

	{ "slew-rate", PIN_CONFIG_SLEW_RATE, 0},

};



/**

include/linux/pinctrl/pinconf-generic.h

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 
 *	argument is ignored.

 * @PIN_CONFIG_DRIVE_STRENGTH: the pin will sink or source at most the current

 *	passed as argument. The argument is in mA.

 * @PIN_CONFIG_INPUT_ENABLE: enable the pin's input.  Note that this does not

 *	affect the pin's ability to drive output.  1 enables input, 0 disables

 *	input.

 * @PIN_CONFIG_INPUT_SCHMITT_ENABLE: control schmitt-trigger mode on the pin.

 *      If the argument != 0, schmitt-trigger mode is enabled. If it's 0,

 *      schmitt-trigger mode is disabled.
@@ -95,6 +98,7 @@ enum pin_config_param { 
	PIN_CONFIG_DRIVE_OPEN_DRAIN,

	PIN_CONFIG_DRIVE_OPEN_SOURCE,

	PIN_CONFIG_DRIVE_STRENGTH,

	PIN_CONFIG_INPUT_ENABLE,

	PIN_CONFIG_INPUT_SCHMITT_ENABLE,

	PIN_CONFIG_INPUT_SCHMITT,

	PIN_CONFIG_INPUT_DEBOUNCE,