diff options
| author | Yegor Yefremov <yegor_sub1@visionsystems.de> | 2012-01-23 11:32:23 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-27 03:30:30 +0400 |
| commit | 8ef5d844cc3a644ea6f7665932a4307e9fad01fa (patch) | |
| tree | 3ff62f33654275913f0d7d59336f64c72bb65ee9 /arch/arm/mach-omap2/gpmc.c | |
| parent | dbc3982ae286e934e71f0b44e78d14844a9ca83b (diff) | |
| download | linux-8ef5d844cc3a644ea6f7665932a4307e9fad01fa.tar.xz | |
ARM: OMAP2+: GPMC: fix device size setup
following statement can only change device size from 8-bit(0) to 16-bit(1),
but not vice versa:
regval |= GPMC_CONFIG1_DEVICESIZE(wval);
so as this field has 1 reserved bit, that could be used in future,
just clear both bits and then OR with the desired value
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Cc: stable@vger.kernel.org
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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 130034bf01d5..dfffbbf4c009 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -528,7 +528,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval) case GPMC_CONFIG_DEV_SIZE: regval = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1); + + /* clear 2 target bits */ + regval &= ~GPMC_CONFIG1_DEVICESIZE(3); + + /* set the proper value */ regval |= GPMC_CONFIG1_DEVICESIZE(wval); + gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval); break; |