Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / omap2430-sdp.dts

diff --git a/arch/arm/boot/dts/omap2430-sdp.dts b/arch/arm/boot/dts/omap2430-sdp.dts
index 05eca2e..4f7d9d7 100644 (file)
--- a/arch/arm/boot/dts/omap2430-sdp.dts
+++ b/arch/arm/boot/dts/omap2430-sdp.dts
@@ -13,7 +13,7 @@
        model = "TI OMAP2430 SDP";
        compatible = "ti,omap2430-sdp", "ti,omap2430", "ti,omap2";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x8000000>; /* 128 MB */
        };
@@ -48,22 +48,22 @@
                gpmc,device-width = <1>;
                gpmc,cycle2cycle-samecsen = <1>;
                gpmc,cycle2cycle-diffcsen = <1>;
-               gpmc,cs-on-ns = <7>;
-               gpmc,cs-rd-off-ns = <233>;
-               gpmc,cs-wr-off-ns = <233>;
-               gpmc,adv-on-ns = <22>;
-               gpmc,adv-rd-off-ns = <60>;
-               gpmc,adv-wr-off-ns = <60>;
-               gpmc,oe-on-ns = <67>;
-               gpmc,oe-off-ns = <210>;
-               gpmc,we-on-ns = <67>;
-               gpmc,we-off-ns = <210>;
-               gpmc,rd-cycle-ns = <233>;
-               gpmc,wr-cycle-ns = <233>;
-               gpmc,access-ns = <233>;
-               gpmc,page-burst-access-ns = <30>;
-               gpmc,bus-turnaround-ns = <30>;
-               gpmc,cycle2cycle-delay-ns = <30>;
+               gpmc,cs-on-ns = <6>;
+               gpmc,cs-rd-off-ns = <187>;
+               gpmc,cs-wr-off-ns = <187>;
+               gpmc,adv-on-ns = <18>;
+               gpmc,adv-rd-off-ns = <48>;
+               gpmc,adv-wr-off-ns = <48>;
+               gpmc,oe-on-ns = <60>;
+               gpmc,oe-off-ns = <169>;
+               gpmc,we-on-ns = <66>;
+               gpmc,we-off-ns = <169>;
+               gpmc,rd-cycle-ns = <187>;
+               gpmc,wr-cycle-ns = <187>;
+               gpmc,access-ns = <187>;
+               gpmc,page-burst-access-ns = <24>;
+               gpmc,bus-turnaround-ns = <24>;
+               gpmc,cycle2cycle-delay-ns = <24>;
                gpmc,wait-monitoring-ns = <0>;
                gpmc,clk-activation-ns = <0>;
                gpmc,wr-data-mux-bus-ns = <0>;