ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / boot / dts / omap5.dtsi

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index ab9a21a..0523697 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -49,6 +49,12 @@
                                1000000 1060000
                                1500000 1250000
                        >;
+
+                       clocks = <&dpll_mpu_ck>;
+                       clock-names = "cpu";
+
+                       clock-latency = <300000>; /* From omap-cpufreq driver */
+
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <2>;
@@ -117,6 +123,58 @@
                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
 
+               prm: prm@4ae06000 {
+                       compatible = "ti,omap5-prm";
+                       reg = <0x4ae06000 0x3000>;
+
+                       prm_clocks: clocks {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+
+                       prm_clockdomains: clockdomains {
+                       };
+               };
+
+               cm_core_aon: cm_core_aon@4a004000 {
+                       compatible = "ti,omap5-cm-core-aon";
+                       reg = <0x4a004000 0x2000>;
+
+                       cm_core_aon_clocks: clocks {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+
+                       cm_core_aon_clockdomains: clockdomains {
+                       };
+               };
+
+               scrm: scrm@4ae0a000 {
+                       compatible = "ti,omap5-scrm";
+                       reg = <0x4ae0a000 0x2000>;
+
+                       scrm_clocks: clocks {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+
+                       scrm_clockdomains: clockdomains {
+                       };
+               };
+
+               cm_core: cm_core@4a008000 {
+                       compatible = "ti,omap5-cm-core";
+                       reg = <0x4a008000 0x3000>;
+
+                       cm_core_clocks: clocks {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+
+                       cm_core_clockdomains: clockdomains {
+                       };
+               };
+
                counter32k: counter@4ae04000 {
                        compatible = "ti,omap-counter32k";
                        reg = <0x4ae04000 0x40>;
@@ -301,6 +359,7 @@
                        compatible = "ti,omap4-hwspinlock";
                        reg = <0x4a0f6000 0x1000>;
                        ti,hwmods = "spinlock";
+                       #hwlock-cells = <1>;
                };
 
                mcspi1: spi@48098000 {
@@ -477,6 +536,7 @@
                        dmas = <&sdma 65>,
                               <&sdma 66>;
                        dma-names = "up_link", "dn_link";
+                       status = "disabled";
                };
 
                dmic: dmic@4012e000 {
@@ -488,6 +548,7 @@
                        ti,hwmods = "dmic";
                        dmas = <&sdma 67>;
                        dma-names = "up_link";
+                       status = "disabled";
                };
 
                mcbsp1: mcbsp@40122000 {
@@ -502,6 +563,7 @@
                        dmas = <&sdma 33>,
                               <&sdma 34>;
                        dma-names = "tx", "rx";
+                       status = "disabled";
                };
 
                mcbsp2: mcbsp@40124000 {
@@ -516,6 +578,7 @@
                        dmas = <&sdma 17>,
                               <&sdma 18>;
                        dma-names = "tx", "rx";
+                       status = "disabled";
                };
 
                mcbsp3: mcbsp@40126000 {
@@ -530,6 +593,7 @@
                        dmas = <&sdma 19>,
                               <&sdma 20>;
                        dma-names = "tx", "rx";
+                       status = "disabled";
                };
 
                timer1: timer@4ae18000 {
@@ -631,6 +695,13 @@
                        ti,hwmods = "wd_timer2";
                };
 
+               dmm@4e000000 {
+                       compatible = "ti,omap5-dmm";
+                       reg = <0x4e000000 0x800>;
+                       interrupts = <0 113 0x4>;
+                       ti,hwmods = "dmm";
+               };
+
                emif1: emif@4c000000 {
                        compatible      = "ti,emif-4d5";
                        ti,hwmods       = "emif1";
@@ -725,14 +796,14 @@
                        ranges;
 
                        usbhsohci: ohci@4a064800 {
-                               compatible = "ti,ohci-omap3", "usb-ohci";
+                               compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
                        usbhsehci: ehci@4a064c00 {
-                               compatible = "ti,ehci-omap", "usb-ehci";
+                               compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -751,3 +822,5 @@
                };
        };
 };
+
+/include/ "omap54xx-clocks.dtsi"