All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
@ 2013-07-08 15:14 Fabio Estevam
  2013-07-08 15:14 ` [PATCH 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3 Fabio Estevam
  2013-07-09  6:17 ` [PATCH 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-08 15:14 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>
---
 arch/arm/boot/dts/imx6dl-wandboard.dts | 17 +++++++++++++++++
 arch/arm/boot/dts/imx6dl.dtsi          | 29 +++++++++++++++++++++++++++++
 2 files changed, 46 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 4505109..e08c54c 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -255,6 +255,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 = <
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3
  2013-07-08 15:14 [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
@ 2013-07-08 15:14 ` Fabio Estevam
  2013-07-09  6:17 ` [PATCH 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-08 15:14 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>
---
 arch/arm/boot/dts/imx6dl-wandboard.dts |  7 +++++++
 arch/arm/boot/dts/imx6dl.dtsi          | 18 ++++++++++++++++++
 2 files changed, 25 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 e08c54c..c9850fc 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -232,6 +232,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 = <
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports
  2013-07-08 15:14 [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
  2013-07-08 15:14 ` [PATCH 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3 Fabio Estevam
@ 2013-07-09  6:17 ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2013-07-09  6:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jul 08, 2013 at 12:14:43PM -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>
> ---
>  arch/arm/boot/dts/imx6dl-wandboard.dts | 17 +++++++++++++++++
>  arch/arm/boot/dts/imx6dl.dtsi          | 29 +++++++++++++++++++++++++++++
>  2 files changed, 46 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 4505109..e08c54c 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -255,6 +255,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
> +						>;
> +					};
> +				};
> +
> +

Because imx6q and imx6dl are pin-to-pin compatible, from now on, I would
require that any pin function group addition for either imx6q or imx6dl
be added as a couple for both, with the same label name.

Shawn

>  				usdhc2 {
>  					pinctrl_usdhc2_1: usdhc2grp-1 {
>  						fsl,pins = <
> -- 
> 1.8.1.2
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-09  6:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-08 15:14 [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Fabio Estevam
2013-07-08 15:14 ` [PATCH 2/2] ARM: dts: imx6dl-wandboard: Add support for UART3 Fabio Estevam
2013-07-09  6:17 ` [PATCH 1/2] ARM: dts: imx6dl-wandboard: Add SDHC1 and SDHC2 ports Shawn Guo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.