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

Commit 8ef5d844 authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Tony Lindgren
Browse files

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: default avatarYegor Yefremov <yegorslists@googlemail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent dbc3982a

arch/arm/mach-omap2/gpmc.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -528,7 +528,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval) 




	case GPMC_CONFIG_DEV_SIZE:

	case GPMC_CONFIG_DEV_SIZE:

		regval  = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);

		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);

		regval |= GPMC_CONFIG1_DEVICESIZE(wval);



		gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval);

		gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval);

		break;

		break;