Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / omap3.dtsi

diff --git a/arch/arm/dts/omap3.dtsi b/arch/arm/dts/omap3.dtsi
index e6f9c9a6ddca7c5dc22422ae97f33d7f7bbd53bd..4043ecb3801682ebe37f1aad4c23e669fddfe47b 100644 (file)
--- a/arch/arm/dts/omap3.dtsi
+++ b/arch/arm/dts/omap3.dtsi
@@ -215,6 +215,7 @@
                        #dma-cells = <1>;
                        dma-channels = <32>;
                        dma-requests = <96>;
+                       ti,hwmods = "dma";
                };
 
                gpio1: gpio@48310000 {
@@ -287,7 +288,6 @@
                uart1: serial@4806a000 {
                        compatible = "ti,omap3-uart";
                        reg = <0x4806a000 0x2000>;
-                       reg-shift = <2>;
                        interrupts-extended = <&intc 72>;
                        dmas = <&sdma 49 &sdma 50>;
                        dma-names = "tx", "rx";
@@ -298,7 +298,6 @@
                uart2: serial@4806c000 {
                        compatible = "ti,omap3-uart";
                        reg = <0x4806c000 0x400>;
-                       reg-shift = <2>;
                        interrupts-extended = <&intc 73>;
                        dmas = <&sdma 51 &sdma 52>;
                        dma-names = "tx", "rx";
@@ -309,7 +308,6 @@
                uart3: serial@49020000 {
                        compatible = "ti,omap3-uart";
                        reg = <0x49020000 0x400>;
-                       reg-shift = <2>;
                        interrupts-extended = <&intc 74>;
                        dmas = <&sdma 53 &sdma 54>;
                        dma-names = "tx", "rx";
@@ -559,6 +557,7 @@
                        dma-names = "tx", "rx";
                        clocks = <&mcbsp4_fck>;
                        clock-names = "fck";
+                       #sound-dai-cells = <0>;
                        status = "disabled";
                };
 
@@ -589,20 +588,6 @@
                        dma-names = "rx";
                };
 
-               smartreflex_core: smartreflex@480cb000 {
-                       compatible = "ti,omap3-smartreflex-core";
-                       ti,hwmods = "smartreflex_core";
-                       reg = <0x480cb000 0x400>;
-                       interrupts = <19>;
-               };
-
-               smartreflex_mpu_iva: smartreflex@480c9000 {
-                       compatible = "ti,omap3-smartreflex-iva";
-                       ti,hwmods = "smartreflex_mpu_iva";
-                       reg = <0x480c9000 0x400>;
-                       interrupts = <18>;
-               };
-
                timer1: timer@48318000 {
                        compatible = "ti,omap3430-timer";
                        reg = <0x48318000 0x400>;
@@ -716,14 +701,13 @@
                        usbhsohci: ohci@48064400 {
                                compatible = "ti,ohci-omap3";
                                reg = <0x48064400 0x400>;
-                               interrupt-parent = <&intc>;
                                interrupts = <76>;
+                               remote-wakeup-connected;
                        };
 
                        usbhsehci: ehci@48064800 {
                                compatible = "ti,ehci-omap";
                                reg = <0x48064800 0x400>;
-                               interrupt-parent = <&intc>;
                                interrupts = <77>;
                        };
                };
@@ -834,7 +818,6 @@
                                reg-names = "tx",
                                            "rx";
 
-                               interrupt-parent = <&intc>;
                                interrupts = <67>,
                                             <68>;
                        };
@@ -847,7 +830,6 @@
                                reg-names = "tx",
                                            "rx";
 
-                               interrupt-parent = <&intc>;
                                interrupts = <69>,
                                             <70>;
                        };