]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: dts: imx: remove old DMA binding data from gpmi node
authorShawn Guo <shawn.guo@linaro.org>
Tue, 16 Jul 2013 09:13:00 +0000 (17:13 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Wed, 17 Jul 2013 00:21:53 +0000 (08:21 +0800)
After mxs-dma driver adopts generic DMA device tree binding, gpmi
channel interrupt number is defined in DMA controller node, and
channel ID is listed in "dmas" property.  So the DMA channel interrupt
number in gpmi node "interrupts" property and fsl,gpmi-dma-channel which
are used by old customized DMA binding can be removed now.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/imx6qdl.dtsi

index 9c64d17d58537d3b6eed70033c26b65a79723e58..11dfe5b8c08617c79d6e10fca85b296c30c9973d 100644 (file)
                        #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",
                                      "gpmi_bch_apb", "per1_bch";
                        dmas = <&dma_apbh 0>;
                        dma-names = "rx-tx";
-                       fsl,gpmi-dma-channel = <0>;
                        status = "disabled";
                };