Commit 398c9955 authored by Linus Walleij's avatar Linus Walleij

Merge tag 'renesas-pinctrl-fixes-for-v6.9-tag1' of...

Merge tag 'renesas-pinctrl-fixes-for-v6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into fixes

pinctrl: renesas: Fixes for v6.9

  - Fix a dtbs_check warning on RZ/G3S,
  - Fix a lockdep warning on RZ/G2L.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents a0cedbcc aa43c15a
...@@ -120,7 +120,9 @@ additionalProperties: ...@@ -120,7 +120,9 @@ additionalProperties:
slew-rate: true slew-rate: true
gpio-hog: true gpio-hog: true
gpios: true gpios: true
input: true
input-enable: true input-enable: true
output-enable: true
output-high: true output-high: true
output-low: true output-low: true
line-name: true line-name: true
......
...@@ -2063,8 +2063,17 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl) ...@@ -2063,8 +2063,17 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl)
continue; continue;
} }
if (!irqd_irq_disabled(data)) if (!irqd_irq_disabled(data)) {
unsigned long flags;
/*
* This has to be atomically executed to protect against a concurrent
* interrupt.
*/
raw_spin_lock_irqsave(&pctrl->lock.rlock, flags);
rzg2l_gpio_irq_enable(data); rzg2l_gpio_irq_enable(data);
raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags);
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment