2 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 17c3cc0890ac..07d61bb8d481 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -434,9 +434,9 @@
         ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
         nand@0,0 {
                 reg = <0 0 0>; /* CS0, offset 0 */
-                nand-bus-width = <8>;
                 ti,nand-ecc-opt = "bch8";
-                gpmc,device-nand = "true";
+                ti,elm-id = <&elm>;
+                nand-bus-width = <8>;
                 gpmc,device-width = <1>;
                 gpmc,sync-clk-ps = <0>;
                 gpmc,cs-on-ns = <0>;
@@ -460,7 +460,6 @@
                 gpmc,wait-monitoring-ns = <0>;
                 gpmc,wr-access-ns = <40>;
                 gpmc,wr-data-mux-bus-ns = <0>;
-                elm_id = <&elm>;
                 /* MTD partition table */
                 /* All SPL-* partitions are sized to minimal length
                  * which can be independently programmable. For
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 281914ed0151..d48c08558de3 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -103,9 +103,8 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 reg = <1 0 0x08000000>;
+                ti,nand-ecc-opt = "ham1";
                 nand-bus-width = <8>;
-
-                ti,nand-ecc-opt = "sw";
                 gpmc,cs-on-ns = <0>;
                 gpmc,cs-rd-off-ns = <36>;
                 gpmc,cs-wr-off-ns = <36>;