Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree bug fixes from Grant Likely:
 "These are some important bug fixes that need to get into v3.15.

  This branch contains a pair of important bug fixes for the DT code:

   - Fix some incorrect binding property names before they enter common
     usage

   - Fix bug where some platform devices will be unable to get their
     interrupt number when they depend on an interrupt controller that
     is not available at device creation time.  This is a problem
     causing mainline to fail on a number of ARM platforms"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of/irq: do irq resolution in platform_get_irq
  of: selftest: add deferred probe interrupt test
  dt: Fix binding typos in clock-names and interrupt-names

diff --combined arch/arm/boot/dts/am33xx.dtsi
index 07f283c20eb12260f362753e544ddd2e6584b75d,3bce3c9dbd24cf86361d6b1aa793df28c8551fcc..cb6811e5ae5a9a148321d4e667dc34cde9bc9846
--- 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.
         */
@@@ -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>;