| From 8f50b8e57442d28e41bb736c173d8a2490549a82 Mon Sep 17 00:00:00 2001 |
| From: "Ocquidant, Sebastien" <sebastienocquidant@eaton.com> |
| Date: Wed, 15 Jun 2016 13:47:35 +0200 |
| Subject: memory: omap-gpmc: Fix omap gpmc EXTRADELAY timing |
| |
| From: Ocquidant, Sebastien <sebastienocquidant@eaton.com> |
| |
| commit 8f50b8e57442d28e41bb736c173d8a2490549a82 upstream. |
| |
| 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. |
| |
| Signed-off-by: Ocquidant, Sebastien <sebastienocquidant@eaton.com> |
| Signed-off-by: Roger Quadros <rogerq@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/memory/omap-gpmc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/memory/omap-gpmc.c |
| +++ b/drivers/memory/omap-gpmc.c |
| @@ -394,7 +394,7 @@ static void gpmc_cs_bool_timings(int cs, |
| 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); |
