diff options
| author | Ocquidant, Sebastien <sebastienocquidant@eaton.com> | 2016-06-15 13:47:35 +0200 |
|---|---|---|
| committer | Roger Quadros <rogerq@ti.com> | 2016-06-16 11:43:48 +0300 |
| commit | 8f50b8e57442d28e41bb736c173d8a2490549a82 (patch) | |
| tree | d0c009ac9280cceeb453222077ef88ec04ff5f75 /drivers/memory | |
| parent | 5edb56491d4812c42175980759da53388e5d86f5 (diff) | |
| download | op-kernel-dev-8f50b8e57442d28e41bb736c173d8a2490549a82.zip op-kernel-dev-8f50b8e57442d28e41bb736c173d8a2490549a82.tar.gz | |
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: Ocquidant, Sebastien <sebastienocquidant@eaton.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index af4884b..15508df 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -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_CONFIG4_OEEXTRADELAY, p->oe_extra_delay); 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_CONFIG6_CYCLE2CYCLESAMECSEN, p->cycle2cyclesamecsen); |
