1 files changed, 10 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 12e9753f5ad9..d9c27195caf0 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -137,12 +137,16 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                         return err;
                 }
 
-                s.device_nand = true;
-
-                /* Enable RD PIN Monitoring Reg */
-                if (gpmc_nand_data->dev_ready) {
-                        s.wait_on_read = true;
-                        s.wait_on_write = true;
+                if (gpmc_nand_data->of_node) {
+                        gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
+                } else {
+                        s.device_nand = true;
+
+                        /* Enable RD PIN Monitoring Reg */
+                        if (gpmc_nand_data->dev_ready) {
+                                s.wait_on_read = true;
+                                s.wait_on_write = true;
+                        }
                 }
 
                 if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)