summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/gpmc.c
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2013-04-30 09:11:22 -0500
committerTony Lindgren <tony@atomide.com>2013-05-16 09:21:19 -0700
commitf40739faba8e804cf46505869ab98ad7c4a88833 (patch)
tree2cce922881e8fd89ca7864a7e861255cffecb340 /arch/arm/mach-omap2/gpmc.c
parent496c8a0bbb726c2608b3b1318d231ab04a9a2ec3 (diff)
downloadlinux-stable-f40739faba8e804cf46505869ab98ad7c4a88833.tar.gz
linux-stable-f40739faba8e804cf46505869ab98ad7c4a88833.tar.bz2
linux-stable-f40739faba8e804cf46505869ab98ad7c4a88833.zip
ARM: dts: OMAP2+: Simplify NAND support
Commit 8c8a777 (ARM: OMAP2+: Add function to read GPMC settings from device-tree) added a device-tree property "gpmc,device-nand" to indicate is the GPMC child device is NAND. This commit should have updated the GPMC NAND documentation (Documentation/devicetree/bindings/mtd/gpmc-nand.txt) to list the property "gpmc,device-nand" as a required property and also updated the example. However, this property is redundant and not needed because the GPMC child device node for NAND is called "nand". Therefore, remove this property. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
-rw-r--r--arch/arm/mach-omap2/gpmc.c1
1 files changed, 0 insertions, 1 deletions
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);