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

Commit 9e694621 authored by Roger Quadros's avatar Roger Quadros
Browse files

memory: omap-gpmc: Prevent GPMC_STATUS from being accessed via gpmc_regs 



GPMC_STATUS register is private to the GPMC module and must not be
accessed directly by NAND driver through the gpmc_regs.

They must use gpmc_omap_get_nand_ops() instead.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent b2bac25a

drivers/memory/omap-gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs) 
{

	int i;



	reg->gpmc_status = gpmc_base + GPMC_STATUS;

	reg->gpmc_status = NULL;	/* deprecated */

	reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET +

				GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs;

	reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +

include/linux/platform_data/mtd-nand-omap2.h

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ enum omap_ecc { 
};



struct gpmc_nand_regs {

	void __iomem	*gpmc_status;

	void __iomem	*gpmc_nand_command;

	void __iomem	*gpmc_nand_address;

	void __iomem	*gpmc_nand_data;
@@ -64,6 +63,8 @@ struct gpmc_nand_regs { 
	void __iomem	*gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];

	void __iomem	*gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];

	void __iomem	*gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];

	/* Deprecated. Do not use */

	void __iomem	*gpmc_status;

};



struct omap_nand_platform_data {