Skip to contentSkip to conversation

ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports

PATCH New Fabio Estevam 2 participants 3 messages Jul 10, 2013 – Jul 12, 2013

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports

From: Fabio Estevam <[email protected]>

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 <[email protected]>

---
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(+)
arch/arm/boot/dts/imx6dl-wandboard.dts +17 -0
index ab6a053..027ece5 100644
@@ -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";
 };
arch/arm/boot/dts/imx6dl.dtsi +29 -0
index d75e32c..49ac931 100644
@@ -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 = <
arch/arm/boot/dts/imx6q.dtsi +28 -0
index e0b7bad..f039a25 100644
@@ -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 = <
Signature · 1 line
1.8.1.2
author reviewer
#1 lore raw

PATCH v2 2/2 ARM: dts: imx6dl-wandboard: Add support for UART3

From: Fabio Estevam <[email protected]>

Wandboard has a bluetooth device connected to UART3, so add support for it.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Also add the usdhc pinmux groups to mx6q

 arch/arm/boot/dts/imx6dl-wandboard.dts |  7 +++++++
 arch/arm/boot/dts/imx6dl.dtsi          | 18 ++++++++++++++++++
 arch/arm/boot/dts/imx6q.dtsi           | 18 ++++++++++++++++++
 3 files changed, 43 insertions(+)
arch/arm/boot/dts/imx6dl-wandboard.dts +7 -0
index 027ece5..2654b32 100644
@@ -108,6 +108,13 @@
 	status = "okay";
 };
 
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart3_2>;
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
+
 &usbh1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx6dl.dtsi +18 -0
index 49ac931..58a7dbc 100644
@@ -241,6 +241,24 @@
 					};
 				};
 
+				uart3 {
+					pinctrl_uart3_1: uart3grp-1 {
+						fsl,pins = <
+							MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+							MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+						>;
+					};
+
+					pinctrl_uart3_2: uart3grp-2 {
+						fsl,pins = <
+							MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+							MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+							MX6DL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
+							MX6DL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
+						>;
+					};
+				};
+
 				uart4 {
 					pinctrl_uart4_1: uart4grp-1 {
 						fsl,pins = <
arch/arm/boot/dts/imx6q.dtsi +18 -0
index f039a25..a0e17a5 100644
@@ -277,6 +277,24 @@
 					};
 				};
 
+				uart3 {
+					pinctrl_uart3_1: uart3grp-1 {
+						fsl,pins = <
+							MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+							MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+						>;
+					};
+
+					pinctrl_uart3_2: uart3grp-2 {
+						fsl,pins = <
+							MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+							MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+							MX6Q_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
+							MX6Q_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
+						>;
+					};
+				};
+
 				uart4 {
 					pinctrl_uart4_1: uart4grp-1 {
 						fsl,pins = <
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH v2 1/2 ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports

In reply to Fabio Estevam
Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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 <[email protected]>

Fabio,

I did some tweaking on pin groups definition in DTS, so that we do not have too much maintenance burden to keep the groups aligned between imx6q and imx6dl. Can you please rebase your patch on the latest imx/dt branch? Also please separate soc changes and board changes into different patches.

Shawn