Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap2420.dtsi

diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index 494bf69..bb529a2 100644 (file)
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -192,16 +192,15 @@
                        compatible = "ti,omap2-mailbox";
                        reg = <0x48094000 0x200>;
                        interrupts = <26>, <34>;
-                       interrupt-names = "dsp", "iva";
                        ti,hwmods = "mailbox";
                        #mbox-cells = <1>;
                        ti,mbox-num-users = <4>;
                        ti,mbox-num-fifos = <6>;
-                       mbox_dsp: dsp {
+                       mbox_dsp: mbox-dsp {
                                ti,mbox-tx = <0 0 0>;
                                ti,mbox-rx = <1 0 0>;
                        };
-                       mbox_iva: iva {
+                       mbox_iva: mbox-iva {
                                ti,mbox-tx = <2 1 3>;
                                ti,mbox-rx = <3 1 3>;
                        };