From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>,
Lee Jones <lee.jones@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Andrew F. Davis" <afd@ti.com>,
Nicolas Saenz Julienne <nicolassaenzj@gmail.com>
Subject: linux-next: manual merge of the gpio tree with the mfd tree
Date: Tue, 16 Feb 2016 14:33:21 +1100 [thread overview]
Message-ID: <20160216143321.106e2e19@canb.auug.org.au> (raw)
Hi Linus,
Today's linux-next merge of the gpio tree got conflicts in:
drivers/gpio/Kconfig
drivers/gpio/Makefile
between commit:
5d8c473983fc ("gpio: tps65086: Add GPO driver for the TPS65086 PMIC")
from the mfd tree and commit:
b866526d0cfe ("gpio: Add driver for TI TPIC2810")
c366c76a2c41 ("gpio: add tps65218 gpio")
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/gpio/Kconfig
index 2b80903965d1,ad226485a8e4..000000000000
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -844,12 -889,13 +889,19 @@@ config GPIO_TIMBERDAL
---help---
Add support for the GPIO IP in the timberdale FPGA.
+config GPIO_TPS65086
+ tristate "TI TPS65086 GPO"
+ depends on MFD_TPS65086
+ help
+ This driver supports the GPO on TI TPS65086x PMICs.
+
+ config GPIO_TPS65218
+ tristate "TPS65218 GPIO"
+ depends on MFD_TPS65218
+ help
+ Select this option to enable GPIO driver for the TPS65218
+ chip family.
+
config GPIO_TPS6586X
bool "TPS6586X GPIO"
depends on MFD_TPS6586X
diff --cc drivers/gpio/Makefile
index c759190b73fa,f1d3d823d1bc..000000000000
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -95,7 -97,8 +97,9 @@@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc35
obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o
obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o
obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o
+obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o
+ obj-$(CONFIG_GPIO_TPIC2810) += gpio-tpic2810.o
+ obj-$(CONFIG_GPIO_TPS65218) += gpio-tps65218.o
obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o
obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o
obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o
next reply other threads:[~2016-02-16 3:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 3:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-28 7:28 linux-next: manual merge of the gpio tree with the mfd tree Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
2019-07-09 13:20 ` Linus Walleij
2016-03-09 3:37 Stephen Rothwell
2016-03-09 5:35 ` Lee Jones
2016-03-09 10:41 ` Linus Walleij
2011-06-22 3:51 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=20160216143321.106e2e19@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=afd@ti.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolassaenzj@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).