From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/10] ARM: imx6: update Carrier-1 DTs
Date: Tue, 7 Jan 2014 19:12:51 +0100 [thread overview]
Message-ID: <1389118376-1740-5-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1389118376-1740-1-git-send-email-l.stach@pengutronix.de>
From: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
arch/arm/dts/imx6dl-cubox-i-carrier-1.dts | 6 +++++-
arch/arm/dts/imx6qdl-microsom.dtsi | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/imx6dl-cubox-i-carrier-1.dts b/arch/arm/dts/imx6dl-cubox-i-carrier-1.dts
index 88c3ef7..1f13f03 100644
--- a/arch/arm/dts/imx6dl-cubox-i-carrier-1.dts
+++ b/arch/arm/dts/imx6dl-cubox-i-carrier-1.dts
@@ -51,7 +51,7 @@
&i2c1 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1_1>;
+ pinctrl-0 = <&pinctrl_i2c1>;
/*
* Not fitted on Carrier-1 board... yet
@@ -87,6 +87,10 @@
MX6QDL_PAD_GPIO_4__SD2_CD_B 0x1f071
>;
};
+
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <MX6QDL_I2C1_PINGRP1>;
+ };
};
};
diff --git a/arch/arm/dts/imx6qdl-microsom.dtsi b/arch/arm/dts/imx6qdl-microsom.dtsi
index 1d6d56d..85e43bf 100644
--- a/arch/arm/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/dts/imx6qdl-microsom.dtsi
@@ -58,12 +58,16 @@
*/
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
};
+
+ pinctrl_uart1: uart1grp {
+ fsl,pins = <MX6QDL_UART1_PINGRP1>;
+ };
};
};
&uart1 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_uart1_1>;
+ pinctrl-0 = <&pinctrl_uart1>;
status = "okay";
};
--
1.8.4.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-01-07 18:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 18:12 [PATCH 01/10] ARM: imx6: pull imx6qdl-pingrp.h from linux Lucas Stach
2014-01-07 18:12 ` [PATCH 02/10] ARM: imx6q: update sabrelite DT Lucas Stach
2014-01-07 18:12 ` [PATCH 03/10] ARM: imx6: update SabreSD DTs Lucas Stach
2014-01-07 18:12 ` [PATCH 04/10] ARM: imx6: update phytec-pfla02 DT Lucas Stach
2014-01-07 18:12 ` Lucas Stach [this message]
2014-01-07 18:12 ` [PATCH 06/10] ARM: imx6: update TQ DTs Lucas Stach
2014-01-07 18:12 ` [PATCH 07/10] ARM: imx6: update GK802 DT Lucas Stach
2014-01-07 18:12 ` [PATCH 08/10] ARM: imx6: update DMO RealQ7 DT Lucas Stach
2014-01-07 18:12 ` [PATCH 09/10] ARM: imx6: update DFI FS700 M60 DT Lucas Stach
2014-01-07 18:12 ` [PATCH 10/10] ARM: imx6: remove old pingroups Lucas Stach
2014-01-10 8:23 ` [PATCH 01/10] ARM: imx6: pull imx6qdl-pingrp.h from linux Sascha Hauer
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=1389118376-1740-5-git-send-email-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=barebox@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox