pinctrl: generic: rename PIN_CONFIG_OUTPUT to LEVEL
Subsystems (3)
PATCH 1/1 pinctrl: generic: rename PIN_CONFIG_OUTPUT to LEVEL
To make porting drivers from newer Linux versions a bit easier, port Linux commit 203a83112e097a501fbe12722b6342787497efe0:
| pinctrl: generic: rename PIN_CONFIG_OUTPUT to LEVEL | | This generic pin config property is confusingly named so let's | rename it to make things clearer. | | There are already drivers in the tree that use PIN_CONFIG_OUTPUT | to *read* the value of an output driven pin, which is a big | semantic confusion for the head: are we then reading the | setting of the output or the actual value/level that is put | out on the pin? | | We already have PIN_CONFIG_OUTPUT_ENABLE that turns on driver | buffers for output, so this can by logical conclusion only | drive the voltage level if it should be any different. | | But if we read the pin, are we then reading the *setting* of | the output value or the *actual* value we can see on the | line? | | If the pin has not first been set into output mode with | PIN_CONFIG_OUTPUT_ENABLE, but is instead in some input mode | or tristate, what will reading this property actually | return? | | Reading the current users reading this property it is clear | that what we read is the logical level of the pin as 0 or 1 | depending on if it is low or high. | | Rename it to PIN_CONFIG_LEVEL so it is crystal clear that | we set or read the voltage level of the pin and nothing else. | | Acked-by: Sudeep Holla <[email protected]> | Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by Ahmad Fatoum <[email protected]>
--- drivers/pinctrl/pinctrl-rockchip.c | 8 ++++---- drivers/pinctrl/pinctrl-stm32.c | 2 +- include/linux/pinctrl/pinconf-generic.h | 12 ++++++++---- 3 files changed, 13 insertions(+), 9 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +4 -4
@@ -323,10 +323,10 @@ static unsigned long parse_gpio_direction(struct device_node *np)if (of_property_read_bool (np,"input-enable" )) { param =PIN_CONFIG_INPUT_ENABLE ; }else if (of_property_read_bool (np,"output-low" )) { - param =PIN_CONFIG_OUTPUT ; + param =PIN_CONFIG_LEVEL ; argument =0 ; }else if (of_property_read_bool (np,"output-high" )) { - param =PIN_CONFIG_OUTPUT ; + param =PIN_CONFIG_LEVEL ; argument =1 ; }
@@ -3188,7 +3188,7 @@ static void rockchip_set_gpio(struct rockchip_pin_bank *bank,enum pin_config_param param =pinconf_to_config_param (config);struct gpio_chip *gpio; -if (param !=PIN_CONFIG_OUTPUT && param !=PIN_CONFIG_INPUT_ENABLE ) +if (param !=PIN_CONFIG_LEVEL && param !=PIN_CONFIG_INPUT_ENABLE )return ; gpio =of_gpio_get_chip_by_alias (bank->name);
@@ -3202,7 +3202,7 @@ static void rockchip_set_gpio(struct rockchip_pin_bank *bank, }switch (param) { -case PIN_CONFIG_OUTPUT : +case PIN_CONFIG_LEVEL : gpio->ops->direction_output (gpio, pin_num,pinconf_to_config_argument (config));break ;
drivers/pinctrl/pinctrl-stm32.c +1 -1
@@ -289,7 +289,7 @@ static int stm32_gpio_set_config(struct gpio_chip *chip,case PIN_CONFIG_BIAS_PULL_DOWN :__stm32_pmx_set_bias (bank->base, gpio,STM32_PIN_PULL_DOWN );break ; -case PIN_CONFIG_OUTPUT : +case PIN_CONFIG_LEVEL :__stm32_pmx_gpio_output (bank->base, gpio, arg);break ;default :
include/linux/pinctrl/pinconf-generic.h +8 -4
@@ -79,9 +79,13 @@* passed in the argument on a custom form, else just use argument 1 * to indicate low power mode, argument 0 turns low power mode off. * @PIN_CONFIG_MODE_PWM: this will configure the pin for PWM -* @PIN_CONFIG_OUTPUT: this will configure the pin as an output and drive a -* value on the line. Use argument 1 to indicate high level, argument 0 to -* indicate low level. (Please see Documentation/driver-api/pin-control.rst, +* @PIN_CONFIG_LEVEL: setting this will configure the pin as an output and +* drive a value on the line. Use argument 1 to indicate high level, +* argument 0 to indicate low level. Conversely the value of the line +* can be read using this parameter, if and only if that value can be +* represented as a binary 0 or 1 where 0 indicate a low voltage level +* and 1 indicate a high voltage level. +* (Please see Documentation/driver-api/pin-control.rst, * section "GPIO mode pitfalls" for a discussion around this parameter.) * @PIN_CONFIG_OUTPUT_ENABLE: this will enable the pin's output mode * without driving a value there. For most platforms this reduces to
@@ -127,7 +131,7 @@ enum pin_config_param {PIN_CONFIG_INPUT_SCHMITT_ENABLE ,PIN_CONFIG_MODE_LOW_POWER ,PIN_CONFIG_MODE_PWM , -PIN_CONFIG_OUTPUT , +PIN_CONFIG_LEVEL ,PIN_CONFIG_OUTPUT_ENABLE ,PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS , PIN_CONFIG_PERSIST_STATE,
Signature · 1 line
2.47.3
Sascha Hauer
AppliedQuoted 37 lines · Ahmad Fatoum
To make porting drivers from newer Linux versions a bit easier, port Linux commit
203a83112e097a501fbe12722b6342787497efe0:| pinctrl: generic: rename PIN_CONFIG_OUTPUT to LEVEL | | This generic pin config property is confusingly named so let's | rename it to make things clearer. | | There are already drivers in the tree that use PIN_CONFIG_OUTPUT | to *read* the value of an output driven pin, which is a big | semantic confusion for the head: are we then reading the | setting of the output or the actual value/level that is put | out on the pin? | | We already have PIN_CONFIG_OUTPUT_ENABLE that turns on driver | buffers for output, so this can by logical conclusion only | drive the voltage level if it should be any different. | | But if we read the pin, are we then reading the *setting* of | the output value or the *actual* value we can see on the | line? | | If the pin has not first been set into output mode with | PIN_CONFIG_OUTPUT_ENABLE, but is instead in some input mode | or tristate, what will reading this property actually | return? | | Reading the current users reading this property it is clear | that what we read is the logical level of the pin as 0 or 1 | depending on if it is low or high. | | Rename it to PIN_CONFIG_LEVEL so it is crystal clear that | we set or read the voltage level of the pin and nothing else. | | Acked-by: Sudeep Holla <[email protected]> | Signed-off-by: Linus Walleij <[email protected]>
Quoted 1 line
[...]
Applied, thanks!
[1/1] pinctrl: generic: rename PIN_CONFIG_OUTPUT to LEVEL
https://git.pengutronix.de/cgit/barebox/commit/?id=afd843c1a83b (link may not be stable)
Best regards,
Signature · 1 line
Sascha Hauer <[email protected]>