Commit 3b5e1590 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix bitops logic in gpio-vf610

 - return an error if the user tries to use inverted polarity in
   gpio-mvebu

* tag 'gpio-fixes-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: mvebu/pwm: Refuse requests with inverted polarity
  gpio: gpio-vf610: do not touch other bits when set the target bit
parents 317de3db 3ecb1017

drivers/gpio/gpio-mvebu.c

+3 −0
Original line number Diff line number Diff line
@@ -707,6 +707,9 @@ static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, 
	unsigned long flags;

	unsigned int on, off;



	if (state->polarity != PWM_POLARITY_NORMAL)

		return -EINVAL;



	val = (unsigned long long) mvpwm->clk_rate * state->duty_cycle;

	do_div(val, NSEC_PER_SEC);

	if (val > UINT_MAX + 1ULL)

drivers/gpio/gpio-vf610.c

+6 −2
Original line number Diff line number Diff line
@@ -125,9 +125,13 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, 
{

	struct vf610_gpio_port *port = gpiochip_get_data(chip);

	unsigned long mask = BIT(gpio);

	u32 val;



	if (port->sdata && port->sdata->have_paddr)

		vf610_gpio_writel(mask, port->gpio_base + GPIO_PDDR);

	if (port->sdata && port->sdata->have_paddr) {

		val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);

		val |= mask;

		vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);

	}



	vf610_gpio_set(chip, gpio, value);