4 files changed, 2 insertions, 5 deletions

diff --git a/Documentation/devicetree/bindings/bus/ti-gpmc.txt b/Documentation/devicetree/bindings/bus/ti-gpmc.txt
index 4b87ea1194e3..704be9306c9f 100644
--- a/Documentation/devicetree/bindings/bus/ti-gpmc.txt
+++ b/Documentation/devicetree/bindings/bus/ti-gpmc.txt
@@ -95,7 +95,6 @@ GPMC chip-select settings properties for child nodes. All are optional.
 - gpmc,burst-wrap       Enables wrap bursting
 - gpmc,burst-read       Enables read page/burst mode
 - gpmc,burst-write      Enables write page/burst mode
-- gpmc,device-nand      Device is NAND
 - gpmc,device-width     Total width of device(s) connected to a GPMC
                         chip-select in bytes. The GPMC supports 8-bit
                         and 16-bit devices and so this property must be
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index 144ae43453c4..6076d016b479 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -105,7 +105,6 @@
                 nand-bus-width = <8>;
 
                 ti,nand-ecc-opt = "sw";
-                gpmc,device-nand;
                 gpmc,cs-on-ns = <0>;
                 gpmc,cs-rd-off-ns = <36>;
                 gpmc,cs-wr-off-ns = <36>;
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index c8044b08dada..662c7fd633cc 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -102,8 +102,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                 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;
@@ -111,6 +109,8 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                         }
                 }
 
+                s.device_nand = true;
+
                 if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
                         s.device_width = GPMC_DEVWIDTH_16BIT;
                 else
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index a195468286f4..70d11ceec0d7 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1245,7 +1245,6 @@ void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
 
         p->sync_read = of_property_read_bool(np, "gpmc,sync-read");
         p->sync_write = of_property_read_bool(np, "gpmc,sync-write");
-        p->device_nand = of_property_read_bool(np, "gpmc,device-nand");
         of_property_read_u32(np, "gpmc,device-width", &p->device_width);
         of_property_read_u32(np, "gpmc,mux-add-data", &p->mux_add_data);