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

Commit d5bd8507 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux into next/drivers 

Pull "OMAP-GPMC: driver updates for v4.15" from Roger Quadros:
* get rid of unused field in platform data structure.

* tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux:
  memory: omap-gpmc: Drop gpmc_status
parents 8a36c27d 0d96a4f6

drivers/memory/omap-gpmc.c

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

	int i;



	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

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ 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 {