mtd: rawnand: omap_gpmc: Deprecate asm/arch/mem.h
authorRoger Quadros <rogerq@kernel.org>
Tue, 11 Oct 2022 11:49:59 +0000 (14:49 +0300)
committerDario Binacchi <dario.binacchi@amarulasolutions.com>
Sat, 10 Dec 2022 10:11:25 +0000 (11:11 +0100)
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>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Link: https://lore.kernel.org/all/20221011115012.6181-2-rogerq@kernel.org
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
drivers/mtd/nand/raw/omap_gpmc.c

index 8b9ff4d..7e9ccf7 100644 (file)
@@ -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>
 #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)