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

Commit 2ccb0bcf authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Linus Walleij
Browse files

pinctrl: generic: add input schmitt disable parameter 



In Marvell PXA/MMP silicons, input schmitt disable value is 0x40, not 0.
So append new config parameter -- input schmitt disable.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8604ac34

drivers/pinctrl/pinconf-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct pin_config_item conf_items[] = { 
	PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL),

	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_INPUT_SCHMITT_DISABLE, "input schmitt disabled", NULL),

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

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

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

include/linux/pinctrl/pinconf-generic.h

+3 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
 * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source

 *	(open emitter). Sending this config will enabale open drain mode, the

 *	argument is ignored.

 * @PIN_CONFIG_INPUT_SCHMITT_DISABLE: disable schmitt-trigger mode on the pin.

 * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in

 *	schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis,

 *	the threshold value is given on a custom format as argument when

 *	setting pins to this mode. The argument zero turns the schmitt trigger

 *	off.

 *	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
@@ -74,6 +74,7 @@ enum pin_config_param { 
	PIN_CONFIG_DRIVE_PUSH_PULL,

	PIN_CONFIG_DRIVE_OPEN_DRAIN,

	PIN_CONFIG_DRIVE_OPEN_SOURCE,

	PIN_CONFIG_INPUT_SCHMITT_DISABLE,

	PIN_CONFIG_INPUT_SCHMITT,

	PIN_CONFIG_INPUT_DEBOUNCE,

	PIN_CONFIG_POWER_SOURCE,