pinctrl: ocelot: fix gpio direction for pins after 31
Subsystems (2)
PATCH 1/2 pinctrl: ocelot: fix gpio direction for pins after 31
The third argument passed to REG is not the correct one and ocelot_gpio_set_direction is not working for pins after 31. Fix that by passing the pin number instead of the modulo 32 value.
--- drivers/pinctrl/pinctrl-ocelot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ocelot.c +1 -1
@@ -432,7 +432,7 @@ static int ocelot_gpio_set_direction(struct pinctrl_dev *pctldev,struct ocelot_pinctrl *info =pinctrl_dev_get_drvdata (pctldev);unsigned int p = pin %32 ; -regmap_update_bits (info->map,REG (OCELOT_GPIO_OE , info, p),BIT (p), +regmap_update_bits (info->map,REG (OCELOT_GPIO_OE , info, pin),BIT (p), input ?0 :BIT (p));return 0 ;
Signature · 1 line
2.21.0
PATCH 2/2 pinctrl: ocelot: fix pinmuxing for pins after 31
The actual layout for OCELOT_GPIO_ALT[01] when there are more than 32 pins is interleaved, i.e. OCELOT_GPIO_ALT0[0], OCELOT_GPIO_ALT1[0], OCELOT_GPIO_ALT0[1], OCELOT_GPIO_ALT1[1]. Introduce a new REG_ALT macro to facilitate the register offset calculation and use it where necessary.
--- drivers/pinctrl/pinctrl-ocelot.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/pinctrl/pinctrl-ocelot.c +9 -7
@@ -396,7 +396,7 @@ static int ocelot_pin_function_idx(struct ocelot_pinctrl *info,return -1 ; } -#define REG (r, info, p) ((r) * (info)->stride + (4 * ((p) / 32))) +#define REG_ALT (msb, info, p) (OCELOT_GPIO_ALT0 * (info)->stride + 4 * ((msb) + ((info)->stride * ((p) / 32))))static int ocelot_pinmux_set_mux (struct pinctrl_dev *pctldev,unsigned int selector,unsigned int group)
@@ -412,19 +412,21 @@ static int ocelot_pinmux_set_mux(struct pinctrl_dev *pctldev,/* * f is encoded on two bits. -* bit 0 of f goes in BIT(pin) of ALT0, bit 1 of f goes in BIT(pin) of -* ALT1 +* bit 0 of f goes in BIT(pin) of ALT[0], bit 1 of f goes in BIT(pin) of +* ALT[1] * This is racy because both registers can't be updated at the same time * but it doesn't matter much for now. */ -regmap_update_bits (info->map,REG (OCELOT_GPIO_ALT0 , info, pin->pin), +regmap_update_bits (info->map,REG_ALT (0 , info, pin->pin),BIT (p), f << p); -regmap_update_bits (info->map,REG (OCELOT_GPIO_ALT1 , info, pin->pin), +regmap_update_bits (info->map,REG_ALT (1 , info, pin->pin),BIT (p), f << (p -1 ));return 0 ; } +#define REG (r, info, p) ((r) * (info)->stride + (4 * ((p) / 32))) +static int ocelot_gpio_set_direction (struct pinctrl_dev *pctldev,struct pinctrl_gpio_range *range,unsigned int pin,bool input)
@@ -445,9 +447,9 @@ static int ocelot_gpio_request_enable(struct pinctrl_dev *pctldev,struct ocelot_pinctrl *info =pinctrl_dev_get_drvdata (pctldev);unsigned int p = offset %32 ; -regmap_update_bits (info->map,REG (OCELOT_GPIO_ALT0 , info, offset), +regmap_update_bits (info->map,REG_ALT (0 , info, offset),BIT (p),0 ); -regmap_update_bits (info->map,REG (OCELOT_GPIO_ALT1 , info, offset), +regmap_update_bits (info->map,REG_ALT (1 , info, offset),BIT (p),0 );return 0 ;
Signature · 1 line
2.21.0
Re: [PATCH 2/2] pinctrl: ocelot: fix pinmuxing for pins after 31
Quoted 7 lines · Alexandre Belloni
The actual layout for OCELOT_GPIO_ALT[01] when there are more than 32 pins is interleaved, i.e. OCELOT_GPIO_ALT0[0], OCELOT_GPIO_ALT1[0], OCELOT_GPIO_ALT0[1], OCELOT_GPIO_ALT1[1]. Introduce a new
REG_ALTmacro to facilitate the register offset calculation and use it where necessary.Fixes da801ab56ad8 pinctrl: ocelot: add MSCC Jaguar2 supportSigned-off-by Alexandre Belloni <[email protected]>
Patch applied for fixes.
Yours,
Linus Walleij
Quoted 6 lines · Alexandre Belloni
The third argument passed to REG is not the correct one and
ocelot_gpio_set_directionis not working for pins after 31. Fix that by passing the pin number instead of the modulo 32 value.Fixes da801ab56ad8 pinctrl: ocelot: add MSCC Jaguar2 supportSigned-off-by Alexandre Belloni <[email protected]>
Patch applied.
Yours,
Linus Walleij