Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c8fd648a7108515def0e9492936fd3760f156579..4205a8ac9ddb1cbad8caeb7054c948000132b89a 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -180,7 +180,8 @@
                                };
 
                                omap5_padconf_global: omap5_padconf_global@5a0 {
-                                       compatible = "syscon";
+                                       compatible = "syscon",
+                                                    "simple-bus";
                                        reg = <0x5a0 0xec>;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
@@ -872,7 +873,12 @@
                        dwc3@4a030000 {
                                compatible = "snps,dwc3";
                                reg = <0x4a030000 0x10000>;
-                               interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-names = "peripheral",
+                                                 "host",
+                                                 "otg";
                                phys = <&usb2_phy>, <&usb3_phy>;
                                phy-names = "usb2-phy", "usb3-phy";
                                dr_mode = "peripheral";