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
Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree
Date: Mon, 10 Nov 2014 17:34:25 +1100 [thread overview]
Message-ID: <20141110173425.6962fc1c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2419 bytes --]
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi between commit 2096eb80e446
("ARM: nomadik: move GPIO I2C to S8815 board file") and 43c4034963d6
("ARM: nomadik: set up MCDATDIR2") from the arm-soc tree and commits
68d41f23ce8d ("pinctrl: nomadik: force-convert to generic mux
bindings") and 1637d480f873 ("pinctrl: nomadik: force-convert to
generic config bindings") from the pinctrl tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
I also added this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Nov 2014 17:30:59 +1100
Subject: [PATCH] pinctrl: nomadik: fix up for binding changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 7a7e2443503f..85d3b95dfdba 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -43,7 +43,7 @@
gpioi2c {
gpioi2c_default_mode: gpioi2c_default {
gpioi2c_default_cfg {
- ste,pins = "GPIO73_C21", "GPIO74_C20";
+ pins = "GPIO73_C21", "GPIO74_C20";
ste,input = <0>;
};
};
--
2.1.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index f435ff20aefe,c8b4a93180f8..000000000000
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@@ -116,8 -116,8 +116,8 @@@
mmcsd {
mmcsd_default_mux: mmcsd_mux {
mmcsd_default_mux {
- ste,function = "mmcsd";
- ste,pins = "mmcsd_a_1", "mmcsd_b_1";
+ function = "mmcsd";
- groups = "mmcsd_a_1";
++ groups = "mmcsd_a_1", "mmcsd_b_1";
};
};
mmcsd_default_mode: mmcsd_default {
@@@ -127,9 -127,9 +127,9 @@@
ste,output = <0>;
};
mmcsd_default_cfg2 {
- /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR */
+ /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR, MCDATDIR2 */
- ste,pins = "GPIO10_C11", "GPIO15_A12",
+ pins = "GPIO10_C11", "GPIO15_A12",
- "GPIO16_C13";
+ "GPIO16_C13", "GPIO23_D15";
ste,output = <1>;
};
mmcsd_default_cfg3 {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-10 6:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-10 6:34 Stephen Rothwell [this message]
2017-01-31 5:29 linux-next: manual merge of the pinctrl tree with the arm-soc tree Stephen Rothwell
2021-12-17 6:29 Stephen Rothwell
2021-12-17 6:29 ` Stephen Rothwell
2021-12-17 8:02 ` Arnd Bergmann
2021-12-17 8:02 ` Arnd Bergmann
2021-12-17 11:02 ` Andy Shevchenko
2021-12-17 11:02 ` Andy Shevchenko
2022-11-18 5:06 Stephen Rothwell
2022-11-18 5:06 ` Stephen Rothwell
2022-12-06 1:13 Stephen Rothwell
2022-12-06 1:13 ` Stephen Rothwell
2022-12-06 15:04 ` Andy Shevchenko
2022-12-06 15:04 ` Andy Shevchenko
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=20141110173425.6962fc1c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.