Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm283x.dtsi

diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 31cc2f2ef040ca32331643f2ae2d180c2c0d65a6..10b27b912bac74b8193ac65c8397bd679624f8e4 100644 (file)
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -48,9 +48,29 @@
                                     <1 24>,
                                     <1 25>,
                                     <1 26>,
+                                    /* dma channel 11-14 share one irq */
                                     <1 27>,
+                                    <1 27>,
+                                    <1 27>,
+                                    <1 27>,
+                                    /* unused shared irq for all channels */
                                     <1 28>;
-
+                       interrupt-names = "dma0",
+                                         "dma1",
+                                         "dma2",
+                                         "dma3",
+                                         "dma4",
+                                         "dma5",
+                                         "dma6",
+                                         "dma7",
+                                         "dma8",
+                                         "dma9",
+                                         "dma10",
+                                         "dma11",
+                                         "dma12",
+                                         "dma13",
+                                         "dma14",
+                                         "dma-shared-all";
                        #dma-cells = <1>;
                        brcm,dma-channel-mask = <0x7f35>;
                };