diff mbox

[3/3] ARM: dts: i.MX51: Separate TXD/RXD and RTS/CTS pinmux entries for UARTs

Message ID 1376471153-3452-3-git-send-email-shc_work@mail.ru (mailing list archive)
State New, archived
Headers show

Commit Message

Alexander Shiyan Aug. 14, 2013, 9:05 a.m. UTC
RTS/CTS pins can be used for different purposes, so create separate
definitions for these pins.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/boot/dts/imx51-babbage.dts |  2 +-
 arch/arm/boot/dts/imx51.dtsi        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

Comments

Shawn Guo Aug. 15, 2013, 12:18 p.m. UTC | #1
On Wed, Aug 14, 2013 at 01:05:53PM +0400, Alexander Shiyan wrote:
> RTS/CTS pins can be used for different purposes, so create separate
> definitions for these pins.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/boot/dts/imx51-babbage.dts |  2 +-
>  arch/arm/boot/dts/imx51.dtsi        | 10 ++++++++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
> index 1d337d9..899f1ce 100644
> --- a/arch/arm/boot/dts/imx51-babbage.dts
> +++ b/arch/arm/boot/dts/imx51-babbage.dts
> @@ -252,7 +252,7 @@
>  
>  &uart1 {
>  	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_uart1_1>;
> +	pinctrl-0 = <&pinctrl_uart1_1 &pinctrl_uart1_rtscts1>;
>  	fsl,uart-has-rtscts;
>  	status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
> index a85abb4..f8fa106 100644
> --- a/arch/arm/boot/dts/imx51.dtsi
> +++ b/arch/arm/boot/dts/imx51.dtsi
> @@ -747,6 +747,11 @@
>  			fsl,pins = <
>  				MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
>  				MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
> +			>;
> +		};
> +
> +		pinctrl_uart1_rtscts1: uart1rtscts-1 {

Please follow the label name pattern to have it be pinctrl_uart1_rtscts_1.

> +			fsl,pins = <
>  				MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
>  				MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
>  			>;
> @@ -767,6 +772,11 @@
>  			fsl,pins = <
>  				MX51_PAD_EIM_D25__UART3_RXD 0x1c5
>  				MX51_PAD_EIM_D26__UART3_TXD 0x1c5
> +			>;
> +		};
> +
> +		pinctrl_uart3_rtscts1: uart3rtscts-1 {
> +			fsl,pins = <

I've seen pinctrl_uart3_1 has a consumer in imx51-babbage.dts, so you
need to update that.

Shawn

>  				MX51_PAD_EIM_D27__UART3_RTS 0x1c5
>  				MX51_PAD_EIM_D24__UART3_CTS 0x1c5
>  			>;
> -- 
> 1.8.1.5
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 1d337d9..899f1ce 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -252,7 +252,7 @@ 
 
 &uart1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_uart1_1>;
+	pinctrl-0 = <&pinctrl_uart1_1 &pinctrl_uart1_rtscts1>;
 	fsl,uart-has-rtscts;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index a85abb4..f8fa106 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -747,6 +747,11 @@ 
 			fsl,pins = <
 				MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
 				MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
+			>;
+		};
+
+		pinctrl_uart1_rtscts1: uart1rtscts-1 {
+			fsl,pins = <
 				MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
 				MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
 			>;
@@ -767,6 +772,11 @@ 
 			fsl,pins = <
 				MX51_PAD_EIM_D25__UART3_RXD 0x1c5
 				MX51_PAD_EIM_D26__UART3_TXD 0x1c5
+			>;
+		};
+
+		pinctrl_uart3_rtscts1: uart3rtscts-1 {
+			fsl,pins = <
 				MX51_PAD_EIM_D27__UART3_RTS 0x1c5
 				MX51_PAD_EIM_D24__UART3_CTS 0x1c5
 			>;