ARM: dts: omap4-droid4: Stop disabling SRAM and GPMC

I disabled SRAM and GPMC originally when seeing errors with
omap_barriers_init(). But that is no longer happening probably
because the memory range is now properly configured to 1021 MB
instead of 1024 MB. So let's enable SRAM and GPMC so we get
omap_barriers_init() working and can idle the GPMC.

Cc: Marcel Partap <mpartap@gmx.net>
Cc: Michael Scott <michael.scott@linaro.org>
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts
index f27966e3cbc05e83fbea6f9ecfd778f10061afb2..89eb607f4a9e1a6afc33571c626bd8d30251b54a 100644 (file)
--- a/arch/arm/boot/dts/omap4-droid4-xt894.dts
+++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts
@@ -24,8 +24,7 @@
 
        /*
         * We seem to have only 1021 MB accessible, 1021 - 1022 is locked,
-        * then 1023 - 1024 seems to contain mbm. For SRAM, see the notes
-        * below about SRAM and L3_ICLK2 being unused by default,
+        * then 1023 - 1024 seems to contain mbm.
         */
        memory {
                device_type = "memory";
@@ -176,11 +175,6 @@
        };
 };
 
-/* L3_2 interconnect is unused, SRAM, GPMC and L3_ICLK2 disabled */
-&gpmc {
-       status = "disabled";
-};
-
 &hdmi {
        status = "okay";
        pinctrl-0 = <&dss_hdmi_pins>;
@@ -356,11 +350,6 @@
        };
 };
 
-/* L3_2 interconnect is unused, SRAM, GPMC and L3_ICLK2 disabled */
-&ocmcram {
-       status = "disabled";
-};
-
 &omap4_pmx_core {
 
        /* hdmi_hpd.gpio_63 */