pinctrl: cy8c95x0: Fix typo
Subsystems (3)
Patrick Rudolph
maintainerPATCH 1/3 pinctrl: cy8c95x0: Fix typo
Fix typo to make pinctrl-cy8c95x compile again.
Signed-off-by Patrick Rudolph <[email protected]>
--- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-cy8c95x0.c +1 -1
@@ -822,7 +822,7 @@ static int cy8c95x0_setup_gpiochip(struct cy8c95x0_pinctrl *chip) gc->get_direction = cy8c95x0_gpio_get_direction; gc->get_multiple = cy8c95x0_gpio_get_multiple; gc->set_multiple = cy8c95x0_gpio_set_multiple; - gc->set_config = gpiochip_generic_config, + gc->set_config = gpiochip_generic_config; gc->can_sleep = true; gc->add_pin_ranges = cy8c95x0_add_pin_ranges;
Signature · 1 line
2.43.0
Patrick Rudolph
maintainerPATCH 2/3 pinctrl: cy8c95x0: Fix regression
Commit 1fa3df901f2c ("pinctrl: cy8c95x0: Remove custom ->set_config()") removed support for PIN_CONFIG_INPUT_ENABLE and PIN_CONFIG_OUTPUT.
Add the following options to restore functionality:
- PIN_CONFIG_INPUT_ENABLE
- PIN_CONFIG_OUTPUT_ENABLE
Signed-off-by Patrick Rudolph <[email protected]>
--- drivers/pinctrl/pinctrl-cy8c95x0.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pinctrl/pinctrl-cy8c95x0.c +10 -0
@@ -308,6 +308,9 @@ static const char * const cy8c95x0_groups[] = { "gp77", }; +static int cy8c95x0_pinmux_direction (struct cy8c95x0_pinctrl *chip, +unsigned int pin,bool input); +static inline u8 cypress_get_port (struct cy8c95x0_pinctrl *chip,unsigned int pin) {/* Account for GPORT2 which only has 4 bits */
@@ -727,6 +730,7 @@ static int cy8c95x0_gpio_set_pincfg(struct cy8c95x0_pinctrl *chip,u8 port =cypress_get_port (chip, off);u8 bit =cypress_get_pin_mask (chip, off);unsigned long param =pinconf_to_config_param (config); +unsigned long arg =pinconf_to_config_argument (config);unsigned int reg;int ret;
@@ -765,6 +769,12 @@ static int cy8c95x0_gpio_set_pincfg(struct cy8c95x0_pinctrl *chip,case PIN_CONFIG_MODE_PWM : reg =CY8C95X0_PWMSEL ;break ; +case PIN_CONFIG_OUTPUT_ENABLE : + ret =cy8c95x0_pinmux_direction (chip, off, !arg); + goto out; +case PIN_CONFIG_INPUT_ENABLE : + ret =cy8c95x0_pinmux_direction (chip, off, arg); + goto out;default : ret = -ENOTSUPP ; goto out;
Signature · 1 line
2.43.0
Patrick Rudolph
maintainerPATCH 3/3 pinctrl: cy8c95x0: Fix get_pincfg
In reply to Patrick RudolphInvert the register value for PIN_CONFIG_OUTPUT_ENABLE to return the opposite of PIN_CONFIG_INPUT_ENABLE.
Signed-off-by Patrick Rudolph <[email protected]>
--- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-cy8c95x0.c +2 -0
@@ -715,6 +715,8 @@ static int cy8c95x0_gpio_get_pincfg(struct cy8c95x0_pinctrl *chip, ret =regmap_read (chip->regmap, reg, ®_val);if (reg_val & bit) arg =1 ; +if (param ==PIN_CONFIG_OUTPUT_ENABLE ) + arg = !arg; *config =pinconf_to_config_packed (param, (u16 )arg); out:
Signature · 1 line
2.43.0
Quoted 3 lines · Patrick Rudolph
Fix typo to make pinctrl-cy8c95x compile again.
Signed-off-by Patrick Rudolph <[email protected]>
Given that the code doesn't even compile I just applied all three patches as fixe for current.
Yours,
Linus Walleij