* [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl for uart3
@ 2013-07-10 9:40 Huang Shijie
2013-07-10 9:40 ` [PATCH 2/2] ARM: dts: imx6q{dl}-sabreauto: add a DT node " Huang Shijie
2013-07-12 5:28 ` [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl " Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Huang Shijie @ 2013-07-10 9:40 UTC (permalink / raw)
To: linux-arm-kernel
Add the a new pinctrl for uart3. In the imx6q{dl}-sabreauto boards,
the uart3 is used for Bluetooth.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/boot/dts/imx6dl.dtsi | 11 +++++++++++
arch/arm/boot/dts/imx6q.dtsi | 11 +++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index a1302ed..d818ced 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -234,6 +234,17 @@
};
};
+ uart3 {
+ pinctrl_uart3_1: uart3grp-1 {
+ fsl,pins = <
+ MX6DL_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
+ MX6DL_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
+ MX6DL_PAD_EIM_D30__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 e0b7bad..1984ca4 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -277,6 +277,17 @@
};
};
+ uart3 {
+ pinctrl_uart3_1: uart3grp-1 {
+ fsl,pins = <
+ MX6Q_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
+ MX6Q_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
+ MX6Q_PAD_EIM_D30__UART3_CTS_B 0x1b0b1
+ MX6Q_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
+ >;
+ };
+ };
+
uart4 {
pinctrl_uart4_1: uart4grp-1 {
fsl,pins = <
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: imx6q{dl}-sabreauto: add a DT node for uart3
2013-07-10 9:40 [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl for uart3 Huang Shijie
@ 2013-07-10 9:40 ` Huang Shijie
2013-07-12 5:28 ` [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl " Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Huang Shijie @ 2013-07-10 9:40 UTC (permalink / raw)
To: linux-arm-kernel
Add a dt node for uart3, in the imx6q{dl}-sabreauto boards,
the uart3 is used by Bluetooth.
Since the uart3 has pin conflict with gpmi and weim nor, we keep it
disabled by default.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index e994011..765c9d5 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -45,6 +45,15 @@
status = "okay";
};
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart3_1>;
+ fsl,uart-has-rtscts;
+ dma-names = "rx", "tx";
+ dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
+ status = "disabled"; /* used by the BT, pin conflict with gpmi and weim NOR */
+};
+
&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4_1>;
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl for uart3
2013-07-10 9:40 [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl for uart3 Huang Shijie
2013-07-10 9:40 ` [PATCH 2/2] ARM: dts: imx6q{dl}-sabreauto: add a DT node " Huang Shijie
@ 2013-07-12 5:28 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2013-07-12 5:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 10, 2013 at 05:40:26PM +0800, Huang Shijie wrote:
> Add the a new pinctrl for uart3. In the imx6q{dl}-sabreauto boards,
> the uart3 is used for Bluetooth.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
We have some pin groups tweaking happening in DTS files. Can you please
rebase your patches on the latest imx/dt branch?
Shawn
> ---
> arch/arm/boot/dts/imx6dl.dtsi | 11 +++++++++++
> arch/arm/boot/dts/imx6q.dtsi | 11 +++++++++++
> 2 files changed, 22 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
> index a1302ed..d818ced 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -234,6 +234,17 @@
> };
> };
>
> + uart3 {
> + pinctrl_uart3_1: uart3grp-1 {
> + fsl,pins = <
> + MX6DL_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
> + MX6DL_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
> + MX6DL_PAD_EIM_D30__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 e0b7bad..1984ca4 100644
> --- a/arch/arm/boot/dts/imx6q.dtsi
> +++ b/arch/arm/boot/dts/imx6q.dtsi
> @@ -277,6 +277,17 @@
> };
> };
>
> + uart3 {
> + pinctrl_uart3_1: uart3grp-1 {
> + fsl,pins = <
> + MX6Q_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
> + MX6Q_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
> + MX6Q_PAD_EIM_D30__UART3_CTS_B 0x1b0b1
> + MX6Q_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1
> + >;
> + };
> + };
> +
> uart4 {
> pinctrl_uart4_1: uart4grp-1 {
> fsl,pins = <
> --
> 1.7.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-12 5:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-10 9:40 [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl for uart3 Huang Shijie
2013-07-10 9:40 ` [PATCH 2/2] ARM: dts: imx6q{dl}-sabreauto: add a DT node " Huang Shijie
2013-07-12 5:28 ` [PATCH 1/2] ARM: dts: imx6q{dl}: add a new pinctrl " 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.