* Tony Lindgren <tony@xxxxxxxxxxx> [170228 09:06]:
> * Roger Quadros <rogerq@xxxxxx> [170221 05:09]:
> > Hi,
> >
> > On 21/02/17 11:45, Ladislav Michl wrote:
> > > This field is no longer used, drop it.
> > >
> > > Signed-off-by: Ladislav Michl <ladis@xxxxxxxxxxxxxx>
> > > ---
> > > drivers/memory/omap-gpmc.c | 1 -
> > > include/linux/platform_data/mtd-nand-omap2.h | 2 --
> > > 2 files changed, 3 deletions(-)
> > >
> > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> > > index 725fceb2146a..5920c7eb3c01 100644
> > > --- a/drivers/memory/omap-gpmc.c
> > > +++ b/drivers/memory/omap-gpmc.c
> > > @@ -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 +
> > > diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
> > > index 17d57a18bac5..25e267f1970c 100644
> > > --- a/include/linux/platform_data/mtd-nand-omap2.h
> > > +++ b/include/linux/platform_data/mtd-nand-omap2.h
> > > @@ -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;
> >
> > If Tony takes the first 2 patches via his tree this is fine,
> > else it is better to not modify the gpmc_nand_regs structure yet
> > as it will result in build errors in -next if both patches don't go in
> > together.
> >
> > Tony, are you willing to pick both patches via omap-soc?
>
> Applying just the first one into omap-for-v4.11/fixes to drop
> the dead arch/arm/mach-omap2/onenand code. The rest should then
> be easy to merge via MTD list.
Oops, I got confused between onenand and nand. So applying
the onenand fix and dropping gpmc-nand.c into omap-for-v4.11/fixes.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
