Skip to content

Commit 398c995

Browse files
committed
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: Linus Walleij <[email protected]>
2 parents a0cedbc + aa43c15 commit 398c995

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ additionalProperties:
120120
slew-rate: true
121121
gpio-hog: true
122122
gpios: true
123+
input: true
123124
input-enable: true
125+
output-enable: true
124126
output-high: true
125127
output-low: true
126128
line-name: true

drivers/pinctrl/renesas/pinctrl-rzg2l.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2063,8 +2063,17 @@ static void rzg2l_gpio_irq_restore(struct rzg2l_pinctrl *pctrl)
20632063
continue;
20642064
}
20652065

2066-
if (!irqd_irq_disabled(data))
2066+
if (!irqd_irq_disabled(data)) {
2067+
unsigned long flags;
2068+
2069+
/*
2070+
* This has to be atomically executed to protect against a concurrent
2071+
* interrupt.
2072+
*/
2073+
raw_spin_lock_irqsave(&pctrl->lock.rlock, flags);
20672074
rzg2l_gpio_irq_enable(data);
2075+
raw_spin_unlock_irqrestore(&pctrl->lock.rlock, flags);
2076+
}
20682077
}
20692078
}
20702079

0 commit comments

Comments
 (0)