Merge tag 'pm+acpi-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index b1a1263e600168291091a963f9f56aefc87fd59e..4c04389dab3252fdbdc4c6e904bac0964eb58421 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -185,9 +185,10 @@
                                        reg = <0x5a0 0xec>;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
+                                       ranges = <0 0x5a0 0xec>;
 
                                        pbias_regulator: pbias_regulator {
-                                               compatible = "ti,pbias-omap";
+                                               compatible = "ti,pbias-omap5", "ti,pbias-omap";
                                                reg = <0x60 0x4>;
                                                syscon = <&omap5_padconf_global>;
                                                pbias_mmc_reg: pbias_mmc_omap5 {
@@ -873,7 +874,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";