From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/12] ARM: dts: remove mxs-dma channel interrupt number from client nodes
Date: Wed, 27 Feb 2013 23:25:48 +0800 [thread overview]
Message-ID: <1361978748-25281-13-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1361978748-25281-1-git-send-email-shawn.guo@linaro.org>
With adopting generic DMA device tree binding, all mxs-dma channel
interrupt numbers are defined in DMA controller nodes, so they can be
removed from client nodes.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/boot/dts/imx23.dtsi | 12 ++++++------
arch/arm/boot/dts/imx28.dtsi | 36 ++++++++++++++++++------------------
arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 889a89a..1d5b0ac 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -72,8 +72,8 @@
#size-cells = <1>;
reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch";
- interrupts = <13>, <56>;
- interrupt-names = "gpmi-dma", "bch";
+ interrupts = <56>;
+ interrupt-names = "bch";
clocks = <&clks 34>;
clock-names = "gpmi_io";
dmas = <&dma_apbh 4>;
@@ -84,7 +84,7 @@
ssp0: ssp at 80010000 {
reg = <0x80010000 0x2000>;
- interrupts = <15 14>;
+ interrupts = <15>;
clocks = <&clks 33>;
dmas = <&dma_apbh 1>;
dma-names = "ssp";
@@ -360,7 +360,7 @@
ssp1: ssp at 80034000 {
reg = <0x80034000 0x2000>;
- interrupts = <2 20>;
+ interrupts = <2>;
clocks = <&clks 33>;
dmas = <&dma_apbh 2>;
dma-names = "ssp";
@@ -465,7 +465,7 @@
auart0: serial at 8006c000 {
compatible = "fsl,imx23-auart";
reg = <0x8006c000 0x2000>;
- interrupts = <24 25 23>;
+ interrupts = <24>;
clocks = <&clks 32>;
dmas = <&dma_apbx 6>, <&dma_apbx 7>;
dma-names = "rx", "tx";
@@ -475,7 +475,7 @@
auart1: serial at 8006e000 {
compatible = "fsl,imx23-auart";
reg = <0x8006e000 0x2000>;
- interrupts = <59 60 58>;
+ interrupts = <59>;
clocks = <&clks 32>;
dmas = <&dma_apbx 8>, <&dma_apbx 9>;
dma-names = "rx", "tx";
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index bb63d4e..79af54e 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -60,7 +60,7 @@
hsadc at 80002000 {
reg = <0x80002000 0x2000>;
- interrupts = <13 87>;
+ interrupts = <13>;
dmas = <&dma_apbh 12>;
dma-names = "hsadc";
status = "disabled";
@@ -94,8 +94,8 @@
#size-cells = <1>;
reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
reg-names = "gpmi-nand", "bch";
- interrupts = <88>, <41>;
- interrupt-names = "gpmi-dma", "bch";
+ interrupts = <41>;
+ interrupt-names = "bch";
clocks = <&clks 50>;
clock-names = "gpmi_io";
dmas = <&dma_apbh 4>;
@@ -108,7 +108,7 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x80010000 0x2000>;
- interrupts = <96 82>;
+ interrupts = <96>;
clocks = <&clks 46>;
dmas = <&dma_apbh 0>;
dma-names = "ssp";
@@ -120,7 +120,7 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x80012000 0x2000>;
- interrupts = <97 83>;
+ interrupts = <97>;
clocks = <&clks 47>;
dmas = <&dma_apbh 1>;
dma-names = "ssp";
@@ -132,7 +132,7 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x80014000 0x2000>;
- interrupts = <98 84>;
+ interrupts = <98>;
clocks = <&clks 48>;
dmas = <&dma_apbh 2>;
dma-names = "ssp";
@@ -144,7 +144,7 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x80016000 0x2000>;
- interrupts = <99 85>;
+ interrupts = <99>;
clocks = <&clks 49>;
dmas = <&dma_apbh 3>;
dma-names = "ssp";
@@ -720,7 +720,7 @@
lcdif at 80030000 {
compatible = "fsl,imx28-lcdif";
reg = <0x80030000 0x2000>;
- interrupts = <38 86>;
+ interrupts = <38>;
clocks = <&clks 55>;
dmas = <&dma_apbh 13>;
dma-names = "lcdif";
@@ -797,7 +797,7 @@
saif0: saif at 80042000 {
compatible = "fsl,imx28-saif";
reg = <0x80042000 0x2000>;
- interrupts = <59 80>;
+ interrupts = <59>;
clocks = <&clks 53>;
dmas = <&dma_apbx 4>;
dma-names = "saif";
@@ -813,7 +813,7 @@
saif1: saif at 80046000 {
compatible = "fsl,imx28-saif";
reg = <0x80046000 0x2000>;
- interrupts = <58 81>;
+ interrupts = <58>;
clocks = <&clks 54>;
dmas = <&dma_apbx 5>;
dma-names = "saif";
@@ -831,7 +831,7 @@
spdif at 80054000 {
reg = <0x80054000 0x2000>;
- interrupts = <45 66>;
+ interrupts = <45>;
dmas = <&dma_apbx 2>;
dma-names = "spdif";
status = "disabled";
@@ -848,7 +848,7 @@
#size-cells = <0>;
compatible = "fsl,imx28-i2c";
reg = <0x80058000 0x2000>;
- interrupts = <111 68>;
+ interrupts = <111>;
clock-frequency = <100000>;
dmas = <&dma_apbx 6>;
dma-names = "i2c";
@@ -861,7 +861,7 @@
#size-cells = <0>;
compatible = "fsl,imx28-i2c";
reg = <0x8005a000 0x2000>;
- interrupts = <110 69>;
+ interrupts = <110>;
clock-frequency = <100000>;
dmas = <&dma_apbx 7>;
dma-names = "i2c";
@@ -887,7 +887,7 @@
auart0: serial at 8006a000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
reg = <0x8006a000 0x2000>;
- interrupts = <112 70 71>;
+ interrupts = <112>;
dmas = <&dma_apbx 8>, <&dma_apbx 9>;
dma-names = "rx", "tx";
fsl,auart-dma-channel = <8 9>;
@@ -898,7 +898,7 @@
auart1: serial at 8006c000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
reg = <0x8006c000 0x2000>;
- interrupts = <113 72 73>;
+ interrupts = <113>;
dmas = <&dma_apbx 10>, <&dma_apbx 11>;
dma-names = "rx", "tx";
clocks = <&clks 45>;
@@ -908,7 +908,7 @@
auart2: serial at 8006e000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
reg = <0x8006e000 0x2000>;
- interrupts = <114 74 75>;
+ interrupts = <114>;
dmas = <&dma_apbx 12>, <&dma_apbx 13>;
dma-names = "rx", "tx";
clocks = <&clks 45>;
@@ -918,7 +918,7 @@
auart3: serial at 80070000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
reg = <0x80070000 0x2000>;
- interrupts = <115 76 77>;
+ interrupts = <115>;
dmas = <&dma_apbx 14>, <&dma_apbx 15>;
dma-names = "rx", "tx";
clocks = <&clks 45>;
@@ -928,7 +928,7 @@
auart4: serial at 80072000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
reg = <0x80072000 0x2000>;
- interrupts = <116 78 79>;
+ interrupts = <116>;
dmas = <&dma_apbx 0>, <&dma_apbx 1>;
dma-names = "rx", "tx";
clocks = <&clks 45>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ccdcb06..8abf2dc 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -81,8 +81,8 @@
#size-cells = <1>;
reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
reg-names = "gpmi-nand", "bch";
- interrupts = <0 13 0x04>, <0 15 0x04>;
- interrupt-names = "gpmi-dma", "bch";
+ interrupts = <0 15 0x04>;
+ interrupt-names = "bch";
clocks = <&clks 152>, <&clks 153>, <&clks 151>,
<&clks 150>, <&clks 149>;
clock-names = "gpmi_io", "gpmi_apb", "gpmi_bch",
--
1.7.9.5
next prev parent reply other threads:[~2013-02-27 15:25 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-27 15:25 [PATCH 00/12] ARM: mxs: move to generic DMA device tree binding Shawn Guo
2013-02-27 15:25 ` [PATCH 01/12] ARM: dts: add generic DMA device tree binding for mxs-dma Shawn Guo
2013-02-27 20:36 ` Arnd Bergmann
2013-02-28 6:39 ` Shawn Guo
2013-02-28 10:48 ` Arnd Bergmann
2013-02-27 15:25 ` [PATCH 02/12] dma: mxs-dma: use devm_* managed functions Shawn Guo
2013-02-27 15:25 ` [PATCH 03/12] dma: mxs-dma: move to generic device tree binding Shawn Guo
2013-02-27 20:50 ` Arnd Bergmann
2013-02-28 7:24 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 04/12] mmc: mxs-mmc: move to use generic DMA helper Shawn Guo
2013-02-27 20:54 ` Arnd Bergmann
2013-02-28 8:28 ` Shawn Guo
2013-02-28 10:50 ` Arnd Bergmann
2013-02-27 15:25 ` [PATCH 05/12] spi: mxs-spi: " Shawn Guo
2013-03-02 23:17 ` Grant Likely
2013-02-27 15:25 ` [PATCH 06/12] i2c: i2c-mxs: " Shawn Guo
2013-02-27 15:25 ` [PATCH 07/12] mtd: gpmi: " Shawn Guo
2013-02-28 8:39 ` Huang Shijie
2013-03-01 1:14 ` Shawn Guo
2013-03-08 13:19 ` Artem Bityutskiy
2013-03-08 14:06 ` Arnd Bergmann
2013-03-11 7:32 ` Artem Bityutskiy
2013-03-08 16:26 ` Huang Shijie
2013-03-11 3:03 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 08/12] serial: mxs-auart: " Shawn Guo
2013-02-27 15:25 ` [PATCH 09/12] ASoC: dmaengine_pcm: support use of " Shawn Guo
2013-02-27 21:02 ` Arnd Bergmann
2013-02-28 8:09 ` Shawn Guo
2013-03-01 10:23 ` Mark Brown
2013-03-04 8:37 ` Shawn Guo
2013-02-27 15:25 ` [PATCH 10/12] ASoC: mxs: move to use " Shawn Guo
2013-02-27 15:25 ` [PATCH 11/12] dma: mxs-dma: remove code left from generic DMA binding conversion Shawn Guo
2013-02-27 15:25 ` Shawn Guo [this message]
2013-02-27 21:05 ` [PATCH 00/12] ARM: mxs: move to generic DMA device tree binding Arnd Bergmann
2013-02-28 19:20 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361978748-25281-13-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).