Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f50b8e5 authored by Ocquidant, Sebastien's avatar Ocquidant, Sebastien Committed by Roger Quadros
Browse files

memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing 



In the omap gpmc driver it can be noticed that GPMC_CONFIG4_OEEXTRADELAY
is overwritten by the WEEXTRADELAY value from the device tree and
GPMC_CONFIG4_WEEXTRADELAY is not updated by the value from the device
tree.

As a consequence, the memory accesses cannot be configured properly when
the extra delay are needed for OE and WE.

Fix the update of GPMC_CONFIG4_WEEXTRADELAY with the value from the
device tree file and prevents GPMC_CONFIG4_OEXTRADELAY
being overwritten by the WEXTRADELAY value from the device tree.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarOcquidant, Sebastien <sebastienocquidant@eaton.com>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
parent 5edb5649

drivers/memory/omap-gpmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -398,7 +398,7 @@ static void gpmc_cs_bool_timings(int cs, const struct gpmc_bool_timings *p) 
	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,

	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,

			   GPMC_CONFIG4_OEEXTRADELAY, p->oe_extra_delay);

			   GPMC_CONFIG4_OEEXTRADELAY, p->oe_extra_delay);

	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,

	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG4,

			   GPMC_CONFIG4_OEEXTRADELAY, p->we_extra_delay);

			   GPMC_CONFIG4_WEEXTRADELAY, p->we_extra_delay);

	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG6,

	gpmc_cs_modify_reg(cs, GPMC_CS_CONFIG6,

			   GPMC_CONFIG6_CYCLE2CYCLESAMECSEN,

			   GPMC_CONFIG6_CYCLE2CYCLESAMECSEN,

			   p->cycle2cyclesamecsen);

			   p->cycle2cyclesamecsen);