diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 04:44:07 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-05-17 04:44:07 (GMT) |
| commit | 95c4dc7b2c622a3cc41535f67f46dd31332186c8 (patch) | |
| tree | 8d391b878824093d3f8599e521f40bebc3200983 /arch/arm | |
| parent | a365c9685438713dbf88828282c4699f571b97de (diff) | |
| parent | 0eef727a47c5ead7d8cf3373bdd81f280303e056 (diff) | |
| download | linux-95c4dc7b2c622a3cc41535f67f46dd31332186c8.tar.xz | |
Merge branch 'topic/bcm' into for-linus
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 8aaf193..84dcf3e 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -47,9 +47,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>; }; |