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@xxxxxxxxxxxxxxxx>
Date: Mon, 10 Nov 2014 17:30:59 +1100
Subject: [PATCH] pinctrl: nomadik: fix up for binding changes
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxxx
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:
pgpURtyQ1j2A5.pgp
Description: OpenPGP digital signature
