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

Commit b4d2ea2a authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "pinctrl: generic: Add bi-directional and output-enable" 



This reverts commit 8c58f1a7.

It turns out that applying these generic properties was
premature: the properties used in the driver using this
are of unclear electrical nature and the subject need to
be discussed.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a9de080b

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

+0 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ bias-bus-hold - latch weakly 
bias-pull-up		- pull up the pin

bias-pull-down		- pull down the pin

bias-pull-pin-default	- use pin-default pull state

bi-directional		- pin supports simultaneous input/output operations

drive-push-pull		- drive actively high and low

drive-open-drain	- drive with open drain

drive-open-source	- drive with open source
@@ -260,7 +259,6 @@ input-debounce - debounce mode with debound time X 
power-source		- select between different power supplies

low-power-enable	- enable low power mode

low-power-disable	- disable low power mode

output-enable		- enable output on pin regardless of output value

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

drivers/pinctrl/pinconf-generic.c

+0 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static const struct pin_config_item conf_items[] = { 
	PCONFDUMP(PIN_CONFIG_BIAS_PULL_PIN_DEFAULT,

				"input bias pull to pin specific state", NULL, false),

	PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL, false),

	PCONFDUMP(PIN_CONFIG_BIDIRECTIONAL, "bi-directional pin operations", NULL, false),

	PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL, false),

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

	PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false),
@@ -161,7 +160,6 @@ static const struct pinconf_generic_params dt_params[] = { 
	{ "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 1 },

	{ "bias-pull-pin-default", PIN_CONFIG_BIAS_PULL_PIN_DEFAULT, 1 },

	{ "bias-pull-down", PIN_CONFIG_BIAS_PULL_DOWN, 1 },

	{ "bi-directional", PIN_CONFIG_BIDIRECTIONAL, 1 },

	{ "drive-open-drain", PIN_CONFIG_DRIVE_OPEN_DRAIN, 0 },

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

	{ "drive-push-pull", PIN_CONFIG_DRIVE_PUSH_PULL, 0 },
@@ -174,7 +172,6 @@ static const struct pinconf_generic_params dt_params[] = { 
	{ "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 },

	{ "low-power-disable", PIN_CONFIG_LOW_POWER_MODE, 0 },

	{ "low-power-enable", PIN_CONFIG_LOW_POWER_MODE, 1 },

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

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

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

	{ "power-source", PIN_CONFIG_POWER_SOURCE, 0 },

include/linux/pinctrl/pinconf-generic.h

+0 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
 * @PIN_CONFIG_BIAS_PULL_UP: the pin will be pulled up (usually with high

 *	impedance to VDD). If the argument is != 0 pull-up is enabled,

 *	if it is 0, pull-up is total, i.e. the pin is connected to VDD.

 * @PIN_CONFIG_BIDIRECTIONAL: the pin will be configured to allow simultaneous

 *	input and output operations.

 * @PIN_CONFIG_DRIVE_OPEN_DRAIN: the pin will be driven with open drain (open

 *	collector) which means it is usually wired with other output ports

 *	which are then pulled up with an external resistor. Setting this
@@ -98,7 +96,6 @@ enum pin_config_param { 
	PIN_CONFIG_BIAS_PULL_DOWN,

	PIN_CONFIG_BIAS_PULL_PIN_DEFAULT,

	PIN_CONFIG_BIAS_PULL_UP,

	PIN_CONFIG_BIDIRECTIONAL,

	PIN_CONFIG_DRIVE_OPEN_DRAIN,

	PIN_CONFIG_DRIVE_OPEN_SOURCE,

	PIN_CONFIG_DRIVE_PUSH_PULL,