Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / am33xx.dtsi

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index e4f165a7833a008b948650f1d62e89b9973bb163..831810583823b78f735a11b354c715461f376401 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -132,11 +132,15 @@
                        };
                };
 
+               cm: syscon@44e10000 {
+                       compatible = "ti,am33xx-controlmodule", "syscon";
+                       reg = <0x44e10000 0x800>;
+               };
+
                intc: interrupt-controller@48200000 {
-                       compatible = "ti,omap2-intc";
+                       compatible = "ti,am33xx-intc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
-                       ti,intc-size = <128>;
                        reg = <0x48200000 0x1000>;
                };
 
@@ -700,6 +704,7 @@
                         */
                        interrupts = <40 41 42 43>;
                        ranges;
+                       syscon = <&cm>;
                        status = "disabled";
 
                        davinci_mdio: mdio@4a101000 {
@@ -730,9 +735,8 @@
                };
 
                ocmcram: ocmcram@40300000 {
-                       compatible = "ti,am3352-ocmcram";
-                       reg = <0x40300000 0x10000>;
-                       ti,hwmods = "ocmcram";
+                       compatible = "mmio-sram";
+                       reg = <0x40300000 0x10000>; /* 64k */
                };
 
                wkup_m3: wkup_m3@44d00000 {