diff options
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 5 | ||||
| -rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt index 2d730e3dd496..7498bdc00e19 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | |||
| @@ -165,9 +165,8 @@ output-high - set the pin to output mode with high level | |||
| 165 | 165 | ||
| 166 | Arguments for parameters: | 166 | Arguments for parameters: |
| 167 | 167 | ||
| 168 | - bias-pull-up, -down and -pin-default take as optional argument 0 to disable | 168 | - bias-pull-up, -down and -pin-default take as optional argument on hardware |
| 169 | the pull, on hardware supporting it the pull strength in Ohm. bias-disable | 169 | supporting it the pull strength in Ohm. bias-disable will disable the pull. |
| 170 | will also disable any active pull. | ||
| 171 | 170 | ||
| 172 | - drive-strength takes as argument the target strength in mA. | 171 | - drive-strength takes as argument the target strength in mA. |
| 173 | 172 | ||
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 10ad996afee4..48aa4ba7b089 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h | |||
| @@ -41,7 +41,10 @@ | |||
| 41 | * impedance to GROUND). If the argument is != 0 pull-down is enabled, | 41 | * impedance to GROUND). If the argument is != 0 pull-down is enabled, |
| 42 | * if it is 0, pull-down is total, i.e. the pin is connected to GROUND. | 42 | * if it is 0, pull-down is total, i.e. the pin is connected to GROUND. |
| 43 | * @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based | 43 | * @PIN_CONFIG_BIAS_PULL_PIN_DEFAULT: the pin will be pulled up or down based |
| 44 | * on embedded knowledge of the controller, like current mux function. | 44 | * on embedded knowledge of the controller hardware, like current mux |
| 45 | * function. The pull direction and possibly strength too will normally | ||
| 46 | * be decided completely inside the hardware block and not be readable | ||
| 47 | * from the kernel side. | ||
| 45 | * If the argument is != 0 pull up/down is enabled, if it is 0, the | 48 | * If the argument is != 0 pull up/down is enabled, if it is 0, the |
| 46 | * configuration is ignored. The proper way to disable it is to use | 49 | * configuration is ignored. The proper way to disable it is to use |
| 47 | * @PIN_CONFIG_BIAS_DISABLE. | 50 | * @PIN_CONFIG_BIAS_DISABLE. |
