aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2013-06-25 14:57:10 +0200
committerMark Brown <broonie@linaro.org>2014-04-04 16:23:01 +0100
commitaaba68a91d559c7aa1d52037031878025b8cd48e (patch)
tree5b89d9954d7adb1a7984aeb17c7cf52d973b3477
parent6d27cf9086952e6c563c5d4f912c549fe65812d2 (diff)
downloadlinux-linaro-stable-aaba68a91d559c7aa1d52037031878025b8cd48e.tar.gz
pinctrl: remove bindings for pinconf options needing more thought
Some options currently take arguments in unspecified driver-specific units. As pointed out by Stephen Warren, driver specific values should not be part of generic devicetree bindings describing the hardware. Therefore remove the critical bindings again, before they become part of an official release. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> (cherry picked from commit 5b81d55c4ccf23b9de398f819571dfc8941c7b04) Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt10
-rw-r--r--drivers/pinctrl/pinconf-generic.c3
2 files changed, 0 insertions, 13 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
index b0cf4e672c80..34155c2534e1 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
@@ -154,10 +154,7 @@ drive-open-source - drive with open source
drive-strength - sink or source at most X mA
input-schmitt-enable - enable schmitt-trigger mode
input-schmitt-disable - disable schmitt-trigger mode
-input-schmitt - run in schmitt-trigger mode with hysteresis X
input-debounce - debounce mode with debound time X
-power-source - select power source X
-slew-rate - use slew-rate X
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
@@ -171,16 +168,9 @@ Arguments for parameters:
- drive-strength takes as argument the target strength in mA.
-- input-schmitt takes as argument the adjustable hysteresis in a
- driver-specific format
-
- 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
-
-- slew-rate takes as argument the target rate in a driver-specific format
-
All parameters not listed here, do not take an argument.
More in-depth documentation on these parameters can be found in
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 2b271d5d90bf..8594f033ac21 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -161,10 +161,7 @@ static struct pinconf_generic_dt_params dt_params[] = {
{ "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 0 },
{ "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 },
{ "input-schmitt-disable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 0 },
- { "input-schmitt", PIN_CONFIG_INPUT_SCHMITT, 0 },
{ "input-debounce", PIN_CONFIG_INPUT_DEBOUNCE, 0 },
- { "power-source", PIN_CONFIG_POWER_SOURCE, 0 },
- { "slew-rate", PIN_CONFIG_SLEW_RATE, 0 },
{ "low-power-enable", PIN_CONFIG_LOW_POWER_MODE, 1 },
{ "low-power-disable", PIN_CONFIG_LOW_POWER_MODE, 0 },
{ "output-low", PIN_CONFIG_OUTPUT, 0, },