Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel...

The patch fixes EDMA crossbar mapping to actually
make it work. The patch has been tagged for stable.

* tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: common: edma: Fix xbar mapping

diff --combined arch/arm/boot/dts/am33xx.dtsi
index cb6811e,a23af78..7ad75b4
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -72,7 -72,7 +72,7 @@@
        };
  
        /*
 -       * The soc node represents the soc top level view. It is uses for IPs
 +       * The soc node represents the soc top level view. It is used for IPs
         * that are not memory mapped in the MPU view or for the MPU itself.
         */
        soc {
@@@ -94,8 -94,8 +94,8 @@@
  
        /*
         * XXX: Use a flat representation of the AM33XX interconnect.
 -       * The real AM33XX interconnect network is quite complex.Since
 -       * that will not bring real advantage to represent that in DT
 +       * The real AM33XX interconnect network is quite complex. Since
 +       * it will not bring real advantage to represent that in DT
         * for the moment, just use a fake OCP bus entry to represent
         * the whole bus hierarchy.
         */
@@@ -144,7 -144,7 +144,7 @@@
                        compatible = "ti,edma3";
                        ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
                        reg =   <0x49000000 0x10000>,
-                               <0x44e10f90 0x10>;
+                               <0x44e10f90 0x40>;
                        interrupts = <12 13 14>;
                        #dma-cells = <1>;
                        dma-channels = <64>;
@@@ -802,7 -802,7 +802,7 @@@
                              <0x46000000 0x400000>;
                        reg-names = "mpu", "dat";
                        interrupts = <80>, <81>;
 -                      interrupts-names = "tx", "rx";
 +                      interrupt-names = "tx", "rx";
                        status = "disabled";
                        dmas = <&edma 8>,
                                <&edma 9>;
@@@ -816,7 -816,7 +816,7 @@@
                              <0x46400000 0x400000>;
                        reg-names = "mpu", "dat";
                        interrupts = <82>, <83>;
 -                      interrupts-names = "tx", "rx";
 +                      interrupt-names = "tx", "rx";
                        status = "disabled";
                        dmas = <&edma 10>,
                                <&edma 11>;