* [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
@ 2013-07-10 20:50 Fabio Estevam
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
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-07-10 20:50 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3
2013-07-10 20:50 [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
@ 2013-07-10 20:50 ` Fabio Estevam
2013-07-12 5:34 ` [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-07-10 20:50 UTC (permalink / raw)
To: linux-arm-kernel
From: Fabio Estevam <fabio.estevam@freescale.com>
Wandboard has a bluetooth device connected to UART3, so add support for it.
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 | 7 +++++++
arch/arm/boot/dts/imx6dl.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/imx6q.dtsi | 18 ++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index 027ece5..2654b32 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -108,6 +108,13 @@
status = "okay";
};
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart3_2>;
+ fsl,uart-has-rtscts;
+ status = "okay";
+};
+
&usbh1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 49ac931..58a7dbc 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -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 = <
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index f039a25..a0e17a5 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -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 = <
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
2013-07-10 20:50 [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
2013-07-10 20:50 ` [PATCH v2 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3 Fabio Estevam
@ 2013-07-12 5:34 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2013-07-12 5:34 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 10, 2013 at 05:50:18PM -0300, Fabio Estevam wrote:
> 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>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-12 5:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-10 20:50 [PATCH v2 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
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
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).