linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: festevam@gmail.com (Fabio Estevam)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
Date: Wed, 10 Jul 2013 17:50:18 -0300	[thread overview]
Message-ID: <1373489419-20893-1-git-send-email-festevam@gmail.com> (raw)

From: Fabio Estevam <fabio.estevam@freescale.com>

Wandboard has a SD card slot on the baseboard connected to SDHC1 and a
BCM4329 (Wifi + Bluetooth chip) connected to SDHC2.

Add support for these ports.

While at it, provide the card detect gpio on SDHC3.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Also add the usdhc pinmux groups to mx6q

 arch/arm/boot/dts/imx6dl-wandboard.dts | 17 +++++++++++++++++
 arch/arm/boot/dts/imx6dl.dtsi          | 29 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6q.dtsi           | 28 ++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+)

diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index ab6a053..027ece5 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -83,6 +83,8 @@
 		pinctrl_hog: hoggrp {
 			fsl,pins = <
 				MX6DL_PAD_GPIO_0__CCM_CLKO1    0x130b0
+				MX6DL_PAD_GPIO_2__GPIO1_IO02	0x80000000
+				MX6DL_PAD_EIM_DA9__GPIO3_IO09	0x80000000
 			>;
 		};
 	};
@@ -110,8 +112,23 @@
 	status = "okay";
 };
 
+&usdhc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc1_2>;
+	cd-gpios = <&gpio1 2 0>;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2_2>;
+	non-removable;
+	status = "okay";
+};
+
 &usdhc3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc3_2>;
+	cd-gpios = <&gpio3 9 0>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index d75e32c..49ac931 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -264,6 +264,35 @@
 					};
 				};
 
+				usdhc1 {
+					pinctrl_usdhc1_1: usdhc1grp-1 {
+						fsl,pins = <
+							MX6DL_PAD_SD1_CMD__SD1_CMD    0x17059
+							MX6DL_PAD_SD1_CLK__SD1_CLK    0x10059
+							MX6DL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+							MX6DL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+							MX6DL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+							MX6DL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+							MX6DL_PAD_NANDF_D0__SD1_DATA4 0x17059
+							MX6DL_PAD_NANDF_D1__SD1_DATA5 0x17059
+							MX6DL_PAD_NANDF_D2__SD1_DATA6 0x17059
+							MX6DL_PAD_NANDF_D3__SD1_DATA7 0x17059
+						>;
+					};
+
+					pinctrl_usdhc1_2: usdhc1grp-2 {
+						fsl,pins = <
+							MX6DL_PAD_SD1_CMD__SD1_CMD    0x17059
+							MX6DL_PAD_SD1_CLK__SD1_CLK    0x10059
+							MX6DL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+							MX6DL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+							MX6DL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+							MX6DL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+						>;
+					};
+				};
+
+
 				usdhc2 {
 					pinctrl_usdhc2_1: usdhc2grp-1 {
 						fsl,pins = <
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index e0b7bad..f039a25 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -300,6 +300,34 @@
 					};
 				};
 
+				usdhc1 {
+					pinctrl_usdhc1_1: usdhc1grp-1 {
+						fsl,pins = <
+							MX6Q_PAD_SD1_CMD__SD1_CMD    0x17059
+							MX6Q_PAD_SD1_CLK__SD1_CLK    0x10059
+							MX6Q_PAD_SD1_DAT0__SD1_DATA0 0x17059
+							MX6Q_PAD_SD1_DAT1__SD1_DATA1 0x17059
+							MX6Q_PAD_SD1_DAT2__SD1_DATA2 0x17059
+							MX6Q_PAD_SD1_DAT3__SD1_DATA3 0x17059
+							MX6Q_PAD_NANDF_D0__SD1_DATA4 0x17059
+							MX6Q_PAD_NANDF_D1__SD1_DATA5 0x17059
+							MX6Q_PAD_NANDF_D2__SD1_DATA6 0x17059
+							MX6Q_PAD_NANDF_D3__SD1_DATA7 0x17059
+						>;
+					};
+
+					pinctrl_usdhc1_2: usdhc1grp-2 {
+						fsl,pins = <
+							MX6Q_PAD_SD1_CMD__SD1_CMD    0x17059
+							MX6Q_PAD_SD1_CLK__SD1_CLK    0x10059
+							MX6Q_PAD_SD1_DAT0__SD1_DATA0 0x17059
+							MX6Q_PAD_SD1_DAT1__SD1_DATA1 0x17059
+							MX6Q_PAD_SD1_DAT2__SD1_DATA2 0x17059
+							MX6Q_PAD_SD1_DAT3__SD1_DATA3 0x17059
+						>;
+					};
+				};
+
 				usdhc2 {
 					pinctrl_usdhc2_1: usdhc2grp-1 {
 						fsl,pins = <
-- 
1.8.1.2

             reply	other threads:[~2013-07-10 20:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-10 20:50 Fabio Estevam [this message]
2013-07-10 20:50 ` [PATCH v2 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3 Fabio Estevam
2013-07-12  5:34 ` [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports 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=1373489419-20893-1-git-send-email-festevam@gmail.com \
    --to=festevam@gmail.com \
    --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).