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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Arnd Bergmann 8 years ago d5bd8507 8a36c27d

-3

2 changed files

expand all

drivers

memory

omap-gpmc.c

include

linux

platform_data

mtd-nand-omap2.h

-1

drivers/memory/omap-gpmc.c

··· 1079 1079 { 1080 1080 int i; 1081 1081 1082 - reg->gpmc_status = NULL; /* deprecated */ 1083 1082 reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET + 1084 1083 GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs; 1085 1084 reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +

-2

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

··· 63 63 void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER]; 64 64 void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER]; 65 65 void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER]; 66 - /* Deprecated. Do not use */ 67 - void __iomem *gpmc_status; 68 66 }; 69 67 70 68 struct omap_nand_platform_data {