From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Adamski <krzysztof.adamski@tieto•com>
Subject: linux-next: manual merge of the gpio tree with the pinctrl tree
Date: Tue, 16 Feb 2016 14:37:28 +1100 [thread overview]
Message-ID: <20160216143728.61372efa@canb.auug.org.au> (raw)
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
drivers/pinctrl/sunxi/pinctrl-sunxi.c
between commit:
be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set")
from the pinctrl tree and commit:
6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking around in private vars")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 96f64a104a62,3e95bfe66a06..000000000000
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@@ -457,9 -457,8 +457,9 @@@ static int sunxi_pinctrl_gpio_get(struc
struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);
u32 reg = sunxi_data_reg(offset);
u8 index = sunxi_data_offset(offset);
- u32 set_mux = pctl->desc->irq_read_needs_mux &&
- test_bit(FLAG_USED_AS_IRQ, &chip->desc[offset].flags);
+ bool set_mux = pctl->desc->irq_read_needs_mux &&
+ gpiochip_line_is_irq(chip, offset);
+ u32 pin = offset + chip->base;
u32 val;
if (set_mux)
next reply other threads:[~2016-02-16 3:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 3:37 Stephen Rothwell [this message]
2016-02-16 8:23 ` linux-next: manual merge of the gpio tree with the pinctrl tree Geert Uytterhoeven
2016-02-16 10:16 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2016-09-13 3:15 Stephen Rothwell
2014-10-01 6:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160216143728.61372efa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=krzysztof.adamski@tieto$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox