From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/17] ARM: dts: imx6q-arm2: add pinctrl for uart and enet
Date: Mon, 13 Aug 2012 21:05:25 +0800 [thread overview]
Message-ID: <1344863137-6112-6-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1344863137-6112-1-git-send-email-shawn.guo@linaro.org>
Add missing pinctrl of uart and enet for imx6q-arm2 board.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx6q-arm2.dts | 21 +++++++++++++++++++++
arch/arm/boot/dts/imx6q.dtsi | 29 +++++++++++++++++++++++++++++
2 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index d792581..15df4c1 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -28,8 +28,27 @@
status = "disabled"; /* gpmi nand conflicts with SD */
};
+ aips-bus at 02000000 { /* AIPS1 */
+ iomuxc at 020e0000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
+
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
+ 176 0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */
+ 1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */
+ 1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */
+ >;
+ };
+ };
+ };
+ };
+
aips-bus at 02100000 { /* AIPS2 */
ethernet at 02188000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet_2>;
phy-mode = "rgmii";
status = "okay";
};
@@ -52,6 +71,8 @@
};
uart4: serial at 021f0000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart4_1>;
status = "okay";
};
};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 6bdfeea..23d680a 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -545,6 +545,26 @@
48 0x1b0b0 /* MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL */
>;
};
+
+ pinctrl_enet_2: enetgrp-2 {
+ fsl,pins = <
+ 890 0x1b0b0 /* MX6Q_PAD_KEY_COL1__ENET_MDIO */
+ 909 0x1b0b0 /* MX6Q_PAD_KEY_COL2__ENET_MDC */
+ 24 0x1b0b0 /* MX6Q_PAD_RGMII_TXC__ENET_RGMII_TXC */
+ 30 0x1b0b0 /* MX6Q_PAD_RGMII_TD0__ENET_RGMII_TD0 */
+ 34 0x1b0b0 /* MX6Q_PAD_RGMII_TD1__ENET_RGMII_TD1 */
+ 39 0x1b0b0 /* MX6Q_PAD_RGMII_TD2__ENET_RGMII_TD2 */
+ 44 0x1b0b0 /* MX6Q_PAD_RGMII_TD3__ENET_RGMII_TD3 */
+ 56 0x1b0b0 /* MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL */
+ 702 0x1b0b0 /* MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK */
+ 74 0x1b0b0 /* MX6Q_PAD_RGMII_RXC__ENET_RGMII_RXC */
+ 52 0x1b0b0 /* MX6Q_PAD_RGMII_RD0__ENET_RGMII_RD0 */
+ 61 0x1b0b0 /* MX6Q_PAD_RGMII_RD1__ENET_RGMII_RD1 */
+ 66 0x1b0b0 /* MX6Q_PAD_RGMII_RD2__ENET_RGMII_RD2 */
+ 70 0x1b0b0 /* MX6Q_PAD_RGMII_RD3__ENET_RGMII_RD3 */
+ 48 0x1b0b0 /* MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL */
+ >;
+ };
};
gpmi-nand {
@@ -591,6 +611,15 @@
};
};
+ uart4 {
+ pinctrl_uart4_1: uart4grp-1 {
+ fsl,pins = <
+ 877 0x1b0b1 /* MX6Q_PAD_KEY_COL0__UART4_TXD */
+ 885 0x1b0b1 /* MX6Q_PAD_KEY_ROW0__UART4_RXD */
+ >;
+ };
+ };
+
usdhc3 {
pinctrl_usdhc3_1: usdhc3grp-1 {
fsl,pins = <
--
1.7.5.4
next prev parent reply other threads:[~2012-08-13 13:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-13 13:05 [PATCH 00/17] ARM: imx: add pinctrl settings for DT boot Shawn Guo
2012-08-13 13:05 ` [PATCH 01/17] ARM: dts: imx6q: improve indentation for fsl,pins Shawn Guo
2012-08-13 13:05 ` [PATCH 02/17] ARM: dts: imx6q: name iomuxc sub-nodes following pin function Shawn Guo
2012-08-13 13:05 ` [PATCH 03/17] ARM: dts: imx6q: sort iomuxc sub-nodes in name Shawn Guo
2012-08-13 13:05 ` [PATCH 04/17] ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet Shawn Guo
2012-08-13 13:05 ` Shawn Guo [this message]
2012-08-13 13:05 ` [PATCH 06/17] ARM: dts: imx6q-sabresd: add pinctrl settings Shawn Guo
2012-08-13 13:05 ` [PATCH 07/17] ARM: imx6q: remove dummy pinctrl state Shawn Guo
2012-08-13 13:05 ` [PATCH 08/17] ARM: dts: imx53-qsb: add pinctrl settings Shawn Guo
2012-08-13 13:05 ` [PATCH 09/17] ARM: dts: imx53-ard: " Shawn Guo
2012-08-13 13:05 ` [PATCH 10/17] ARM: dts: imx53-evk: " Shawn Guo
2012-08-13 13:05 ` [PATCH 11/17] ARM: dts: imx53-smd: " Shawn Guo
2012-08-13 13:05 ` [PATCH 12/17] ARM: imx53: build in pinctrl support Shawn Guo
2012-08-13 13:05 ` [PATCH 13/17] ARM: imx53: decouple device tree boot from board files Shawn Guo
2012-08-13 13:05 ` [PATCH 14/17] ARM: imx53: support device tree boot only Shawn Guo
2012-08-13 13:05 ` [PATCH 16/17] ARM: dts: imx51-babbage: add pinctrl settings Shawn Guo
2012-08-13 13:05 ` [PATCH 17/17] ARM: imx51: build in pinctrl support Shawn Guo
2012-08-13 13:06 ` [PATCH 15/17] ARM: imx53: remove unneeded files and functions Shawn Guo
2012-08-13 13:17 ` [PATCH 18/18] ARM: imx51: decouple device tree boot from board files Shawn Guo
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=1344863137-6112-6-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).