| Message ID | 20221011115012.6181-2-rogerq@kernel.org |
|---|---|
| State | Accepted, archived |
| Commit | c6bafdae50f2f55fd09dd46375c918a5b96328c5 |
| Delegated to: | Dario Binacchi |
| Headers | show |
| Series | rawnand: omap_gpmc: driver model support | expand |
Hi On Tue, Oct 11, 2022 at 1:50 PM Roger Quadros <rogerq@kernel.org> wrote: > > We want to get rid of <asm/arch/mem.h> so don't > enforce it for new platforms. > > This also means GPMC_MAX CS doesn't have to be defined > by platform code. > > Define it locally here for now. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > drivers/mtd/nand/raw/omap_gpmc.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c > index 8b9ff4de18..7e9ccf7878 100644 > --- a/drivers/mtd/nand/raw/omap_gpmc.c > +++ b/drivers/mtd/nand/raw/omap_gpmc.c > @@ -8,7 +8,11 @@ > #include <log.h> > #include <asm/io.h> > #include <linux/errno.h> > + > +#ifdef CONFIG_ARCH_OMAP2PLUS > #include <asm/arch/mem.h> > +#endif > + > #include <linux/mtd/omap_gpmc.h> > #include <linux/mtd/nand_ecc.h> > #include <linux/mtd/rawnand.h> > @@ -17,6 +21,10 @@ > #include <nand.h> > #include <linux/mtd/omap_elm.h> > > +#ifndef GPMC_MAX_CS > +#define GPMC_MAX_CS 4 > +#endif > + Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> > #define BADBLOCK_MARKER_LENGTH 2 > #define SECTOR_BYTES 512 > #define ECCCLEAR (0x1 << 8) > -- > 2.17.1 >
diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c index 8b9ff4de18..7e9ccf7878 100644 --- a/drivers/mtd/nand/raw/omap_gpmc.c +++ b/drivers/mtd/nand/raw/omap_gpmc.c @@ -8,7 +8,11 @@ #include <log.h> #include <asm/io.h> #include <linux/errno.h> + +#ifdef CONFIG_ARCH_OMAP2PLUS #include <asm/arch/mem.h> +#endif + #include <linux/mtd/omap_gpmc.h> #include <linux/mtd/nand_ecc.h> #include <linux/mtd/rawnand.h> @@ -17,6 +21,10 @@ #include <nand.h> #include <linux/mtd/omap_elm.h> +#ifndef GPMC_MAX_CS +#define GPMC_MAX_CS 4 +#endif + #define BADBLOCK_MARKER_LENGTH 2 #define SECTOR_BYTES 512 #define ECCCLEAR (0x1 << 8)
We want to get rid of <asm/arch/mem.h> so don't enforce it for new platforms. This also means GPMC_MAX CS doesn't have to be defined by platform code. Define it locally here for now. Signed-off-by: Roger Quadros <rogerq@kernel.org> --- drivers/mtd/nand/raw/omap_gpmc.c | 8 ++++++++ 1 file changed, 8 insertions(+)