linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/17] ARM: dts: imx53-smd: add pinctrl settings
Date: Mon, 13 Aug 2012 21:05:31 +0800	[thread overview]
Message-ID: <1344863137-6112-12-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1344863137-6112-1-git-send-email-shawn.guo@linaro.org>

Add pinctrl settings for the exsiting devices in imx53-smd.dts.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx53-smd.dts |   38 ++++++++++++++++++++++++++++++++++++--
 arch/arm/boot/dts/imx53.dtsi    |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index 8cdf0a2..dd7e792 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -25,22 +25,30 @@
 		aips at 50000000 { /* AIPS1 */
 			spba at 50000000 {
 				esdhc at 50004000 { /* ESDHC1 */
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_esdhc1_1>;
 					cd-gpios = <&gpio3 13 0>;
 					wp-gpios = <&gpio4 11 0>;
 					status = "okay";
 				};
 
 				esdhc at 50008000 { /* ESDHC2 */
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_esdhc2_1>;
 					non-removable;
 					status = "okay";
 				};
 
 				uart3: serial at 5000c000 {
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_uart3_1>;
 					fsl,uart-has-rtscts;
 					status = "okay";
 				};
 
 				ecspi at 50010000 { /* ECSPI1 */
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_ecspi1_1>;
 					fsl,spi-num-chipselects = <2>;
 					cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>;
 					status = "okay";
@@ -72,27 +80,49 @@
 				};
 
 				esdhc at 50020000 { /* ESDHC3 */
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_esdhc3_1>;
 					non-removable;
 					status = "okay";
 				};
 			};
 
 			iomuxc at 53fa8000 {
-				compatible = "fsl,imx53-iomuxc-smd";
-				reg = <0x53fa8000 0x4000>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_hog>;
+
+				hog {
+					pinctrl_hog: hoggrp {
+						fsl,pins = <
+							982 0x80000000	/* MX53_PAD_PATA_DATA14__GPIO2_14 */
+							989 0x80000000	/* MX53_PAD_PATA_DATA15__GPIO2_15 */
+							424 0x80000000	/* MX53_PAD_EIM_EB2__GPIO2_30 */
+							701 0x80000000	/* MX53_PAD_EIM_DA13__GPIO3_13 */
+							449 0x80000000	/* MX53_PAD_EIM_D19__GPIO3_19 */
+							43  0x80000000	/* MX53_PAD_KEY_ROW2__GPIO4_11 */
+							868 0x80000000	/* MX53_PAD_PATA_DA_0__GPIO7_6 */
+						>;
+					};
+				};
 			};
 
 			uart1: serial at 53fbc000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_uart1_1>;
 				status = "okay";
 			};
 
 			uart2: serial at 53fc0000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_uart2_1>;
 				status = "okay";
 			};
 		};
 
 		aips at 60000000 {	/* AIPS2 */
 			i2c at 63fc4000 { /* I2C2 */
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c2_1>;
 				status = "okay";
 
 				codec: sgtl5000 at 0a {
@@ -112,6 +142,8 @@
 			};
 
 			i2c at 63fc8000 { /* I2C1 */
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c1_1>;
 				status = "okay";
 
 				accelerometer: mma8450 at 1c {
@@ -131,6 +163,8 @@
 			};
 
 			ethernet at 63fec000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_fec_1>;
 				phy-mode = "rmii";
 				phy-reset-gpios = <&gpio7 6 0>;
 				status = "okay";
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index e91cbc0..a8df8a4 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -251,6 +251,19 @@
 					};
 				};
 
+				esdhc2 {
+					pinctrl_esdhc2_1: esdhc2grp-1 {
+						fsl,pins = <
+							1038 0x1d5	/* MX53_PAD_SD2_CMD__ESDHC2_CMD */
+							1032 0x1d5	/* MX53_PAD_SD2_CLK__ESDHC2_CLK */
+							1062 0x1d5	/* MX53_PAD_SD2_DATA0__ESDHC2_DAT0 */
+							1056 0x1d5	/* MX53_PAD_SD2_DATA1__ESDHC2_DAT1 */
+							1050 0x1d5	/* MX53_PAD_SD2_DATA2__ESDHC2_DAT2 */
+							1044 0x1d5	/* MX53_PAD_SD2_DATA3__ESDHC2_DAT3 */
+						>;
+					};
+				};
+
 				esdhc3 {
 					pinctrl_esdhc3_1: esdhc3grp-1 {
 						fsl,pins = <
@@ -301,6 +314,26 @@
 						>;
 					};
 				};
+
+				uart2 {
+					pinctrl_uart2_1: uart2grp-1 {
+						fsl,pins = <
+							841 0x1c5	/* MX53_PAD_PATA_BUFFER_EN__UART2_RXD_MUX */
+							836 0x1c5	/* MX53_PAD_PATA_DMARQ__UART2_TXD_MUX */
+						>;
+					};
+				};
+
+				uart3 {
+					pinctrl_uart3_1: uart3grp-1 {
+						fsl,pins = <
+							884 0x1c5	/* MX53_PAD_PATA_CS_0__UART3_TXD_MUX */
+							888 0x1c5	/* MX53_PAD_PATA_CS_1__UART3_RXD_MUX */
+							875 0x1c5	/* MX53_PAD_PATA_DA_1__UART3_CTS */
+							880 0x1c5	/* MX53_PAD_PATA_DA_2__UART3_RTS */
+						>;
+					};
+				};
 			};
 
 			uart1: serial at 53fbc000 {
-- 
1.7.5.4

  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 ` [PATCH 05/17] ARM: dts: imx6q-arm2: add pinctrl for uart " Shawn Guo
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 ` Shawn Guo [this message]
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-12-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).