aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2013-07-12 06:02:09 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 11:29:16 -0400
commit72a5cebfa1f8095b7fc507c4d902af6df2329c02 (patch)
tree5d442b743e778df51f83a7c0932ee5c805dde131
parentc770f7c0205cba854c2b1d4ba263ce9d70bd031e (diff)
ARM: dts: imx6qdl/imx6sl: add the dma property for uart
Add the dma property for all the uart. Note: Add the dma property does not mean we enable the dma for this uart. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6q-arm2.dts2
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi10
-rw-r--r--arch/arm/boot/dts/imx6sl.dtsi10
3 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 9b17393f24ec..edf1bd967164 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -102,8 +102,6 @@
102 pinctrl-0 = <&pinctrl_uart2_2>; 102 pinctrl-0 = <&pinctrl_uart2_2>;
103 fsl,dte-mode; 103 fsl,dte-mode;
104 fsl,uart-has-rtscts; 104 fsl,uart-has-rtscts;
105 dma-names = "rx", "tx";
106 dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
107 status = "okay"; 105 status = "okay";
108}; 106};
109 107
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 72a28d6092b9..4bcf5554ba7e 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -197,6 +197,8 @@
197 interrupts = <0 26 0x04>; 197 interrupts = <0 26 0x04>;
198 clocks = <&clks 160>, <&clks 161>; 198 clocks = <&clks 160>, <&clks 161>;
199 clock-names = "ipg", "per"; 199 clock-names = "ipg", "per";
200 dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
201 dma-names = "rx", "tx";
200 status = "disabled"; 202 status = "disabled";
201 }; 203 };
202 204
@@ -1479,6 +1481,8 @@
1479 interrupts = <0 27 0x04>; 1481 interrupts = <0 27 0x04>;
1480 clocks = <&clks 160>, <&clks 161>; 1482 clocks = <&clks 160>, <&clks 161>;
1481 clock-names = "ipg", "per"; 1483 clock-names = "ipg", "per";
1484 dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
1485 dma-names = "rx", "tx";
1482 status = "disabled"; 1486 status = "disabled";
1483 }; 1487 };
1484 1488
@@ -1488,6 +1492,8 @@
1488 interrupts = <0 28 0x04>; 1492 interrupts = <0 28 0x04>;
1489 clocks = <&clks 160>, <&clks 161>; 1493 clocks = <&clks 160>, <&clks 161>;
1490 clock-names = "ipg", "per"; 1494 clock-names = "ipg", "per";
1495 dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
1496 dma-names = "rx", "tx";
1491 status = "disabled"; 1497 status = "disabled";
1492 }; 1498 };
1493 1499
@@ -1497,6 +1503,8 @@
1497 interrupts = <0 29 0x04>; 1503 interrupts = <0 29 0x04>;
1498 clocks = <&clks 160>, <&clks 161>; 1504 clocks = <&clks 160>, <&clks 161>;
1499 clock-names = "ipg", "per"; 1505 clock-names = "ipg", "per";
1506 dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
1507 dma-names = "rx", "tx";
1500 status = "disabled"; 1508 status = "disabled";
1501 }; 1509 };
1502 1510
@@ -1506,6 +1514,8 @@
1506 interrupts = <0 30 0x04>; 1514 interrupts = <0 30 0x04>;
1507 clocks = <&clks 160>, <&clks 161>; 1515 clocks = <&clks 160>, <&clks 161>;
1508 clock-names = "ipg", "per"; 1516 clock-names = "ipg", "per";
1517 dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
1518 dma-names = "rx", "tx";
1509 status = "disabled"; 1519 status = "disabled";
1510 }; 1520 };
1511 }; 1521 };
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 0a297afce002..d048a785c05e 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -159,6 +159,8 @@
159 clocks = <&clks IMX6SL_CLK_UART>, 159 clocks = <&clks IMX6SL_CLK_UART>,
160 <&clks IMX6SL_CLK_UART_SERIAL>; 160 <&clks IMX6SL_CLK_UART_SERIAL>;
161 clock-names = "ipg", "per"; 161 clock-names = "ipg", "per";
162 dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
163 dma-names = "rx", "tx";
162 status = "disabled"; 164 status = "disabled";
163 }; 165 };
164 166
@@ -170,6 +172,8 @@
170 clocks = <&clks IMX6SL_CLK_UART>, 172 clocks = <&clks IMX6SL_CLK_UART>,
171 <&clks IMX6SL_CLK_UART_SERIAL>; 173 <&clks IMX6SL_CLK_UART_SERIAL>;
172 clock-names = "ipg", "per"; 174 clock-names = "ipg", "per";
175 dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
176 dma-names = "rx", "tx";
173 status = "disabled"; 177 status = "disabled";
174 }; 178 };
175 179
@@ -181,6 +185,8 @@
181 clocks = <&clks IMX6SL_CLK_UART>, 185 clocks = <&clks IMX6SL_CLK_UART>,
182 <&clks IMX6SL_CLK_UART_SERIAL>; 186 <&clks IMX6SL_CLK_UART_SERIAL>;
183 clock-names = "ipg", "per"; 187 clock-names = "ipg", "per";
188 dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
189 dma-names = "rx", "tx";
184 status = "disabled"; 190 status = "disabled";
185 }; 191 };
186 192
@@ -219,6 +225,8 @@
219 clocks = <&clks IMX6SL_CLK_UART>, 225 clocks = <&clks IMX6SL_CLK_UART>,
220 <&clks IMX6SL_CLK_UART_SERIAL>; 226 <&clks IMX6SL_CLK_UART_SERIAL>;
221 clock-names = "ipg", "per"; 227 clock-names = "ipg", "per";
228 dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
229 dma-names = "rx", "tx";
222 status = "disabled"; 230 status = "disabled";
223 }; 231 };
224 232
@@ -230,6 +238,8 @@
230 clocks = <&clks IMX6SL_CLK_UART>, 238 clocks = <&clks IMX6SL_CLK_UART>,
231 <&clks IMX6SL_CLK_UART_SERIAL>; 239 <&clks IMX6SL_CLK_UART_SERIAL>;
232 clock-names = "ipg", "per"; 240 clock-names = "ipg", "per";
241 dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
242 dma-names = "rx", "tx";
233 status = "disabled"; 243 status = "disabled";
234 }; 244 };
235 }; 245 };