| From 6b187b21c92b6e2c7e8ef0b450181c37a3f31681 Mon Sep 17 00:00:00 2001 |
| From: Pekon Gupta <pekon@ti.com> |
| Date: Tue, 28 Jan 2014 11:42:40 +0530 |
| Subject: ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module |
| |
| From: Pekon Gupta <pekon@ti.com> |
| |
| commit 6b187b21c92b6e2c7e8ef0b450181c37a3f31681 upstream. |
| |
| Fixes: commit bc6b1e7b86f5d8e4a6fc1c0189e64bba4077efe0 |
| ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND |
| |
| OMAP SoC(s) depend on GPMC controller driver to parse GPMC DT child nodes and |
| register them platform_device for NAND driver to probe later. However this does |
| not happen if generic MTD_NAND framework is built as module (CONFIG_MTD_NAND=m). |
| |
| Therefore, when MTD/NAND and MTD/NAND/OMAP2 modules are loaded, they are unable |
| to find any matching platform_device and remain un-binded. This causes on board |
| NAND flash to remain un-detected. |
| |
| This patch causes GPMC controller to parse DT nodes when |
| CONFIG_MTD_NAND=y || CONFIG_MTD_NAND=m |
| |
| Signed-off-by: Pekon Gupta <pekon@ti.com> |
| Signed-off-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-omap2/gpmc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-omap2/gpmc.c |
| +++ b/arch/arm/mach-omap2/gpmc.c |
| @@ -1339,7 +1339,7 @@ static void __maybe_unused gpmc_read_tim |
| of_property_read_bool(np, "gpmc,time-para-granularity"); |
| } |
| |
| -#ifdef CONFIG_MTD_NAND |
| +#if IS_ENABLED(CONFIG_MTD_NAND) |
| |
| static const char * const nand_xfer_types[] = { |
| [NAND_OMAP_PREFETCH_POLLED] = "prefetch-polled", |
