Skip to content

Commit 719af93

Browse files
committed
Merge tag 'pinctrl-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij: "Here are three pin control fixes for v4.7. Not much, and just driver fixes: - add device tree matches to MAINTAINERS - inversion bug in the Nomadik driver - dual edge handling bug in the mediatek driver" * tag 'pinctrl-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: mediatek: fix dual-edge code defect MAINTAINERS: Add file patterns for pinctrl device tree bindings pinctrl: nomadik: fix inversion of gpio direction
2 parents ebb8cb2 + 5edf673 commit 719af93

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8945,6 +8945,7 @@ M: Linus Walleij <[email protected]>
89458945
89468946
T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
89478947
S: Maintained
8948+
F: Documentation/devicetree/bindings/pinctrl/
89488949
F: drivers/pinctrl/
89498950
F: include/linux/pinctrl/
89508951

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,9 +1256,10 @@ static void mtk_eint_irq_handler(struct irq_desc *desc)
12561256
const struct mtk_desc_pin *pin;
12571257

12581258
chained_irq_enter(chip, desc);
1259-
for (eint_num = 0; eint_num < pctl->devdata->ap_num; eint_num += 32) {
1259+
for (eint_num = 0;
1260+
eint_num < pctl->devdata->ap_num;
1261+
eint_num += 32, reg += 4) {
12601262
status = readl(reg);
1261-
reg += 4;
12621263
while (status) {
12631264
offset = __ffs(status);
12641265
index = eint_num + offset;

drivers/pinctrl/nomadik/pinctrl-nomadik.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ static int nmk_gpio_get_dir(struct gpio_chip *chip, unsigned offset)
854854

855855
clk_enable(nmk_chip->clk);
856856

857-
dir = !!(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
857+
dir = !(readl(nmk_chip->addr + NMK_GPIO_DIR) & BIT(offset));
858858

859859
clk_disable(nmk_chip->clk);
860860

0 commit comments

Comments
 (0)