git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 980386d2d6d49e0b42f48550853ef1ad6aa5d79a Mon Sep 17 00:00:00 2001
   2 From: Pekon Gupta <pekon@ti.com>
   3 Date: Tue, 28 Jan 2014 11:42:41 +0530
   4 Subject: ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
   5
   6 From: Pekon Gupta <pekon@ti.com>
   7
   8 commit 980386d2d6d49e0b42f48550853ef1ad6aa5d79a upstream.
   9
  10 Fixes: commit 75d3625e0e86b2d8d77b4e9c6f685fd7ea0d5a96
  11        ARM: OMAP2+: gpmc: add DT bindings for OneNAND
  12
  13 OMAP SoC(s) depend on GPMC controller driver to parse GPMC DT child nodes and
  14 register them platform_device for ONENAND driver to probe later. However this does
  15 not happen if generic MTD_ONENAND framework is built as module (CONFIG_MTD_ONENAND=m).
  16
  17 Therefore, when MTD/ONENAND and MTD/ONENAND/OMAP2 modules are loaded, they are unable
  18 to find any matching platform_device and remain un-binded. This causes on board
  19 ONENAND flash to remain un-detected.
  20
  21 This patch causes GPMC controller to parse DT nodes when
  22 CONFIG_MTD_ONENAND=y || CONFIG_MTD_ONENAND=m
  23
  24 Signed-off-by: Pekon Gupta <pekon@ti.com>
  25 Signed-off-by: Tony Lindgren <tony@atomide.com>
  26 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27
  28 ---
  29  arch/arm/mach-omap2/gpmc.c |    2 +-
  30  1 file changed, 1 insertion(+), 1 deletion(-)
  31
  32 --- a/arch/arm/mach-omap2/gpmc.c
  33 +++ b/arch/arm/mach-omap2/gpmc.c
  34 @@ -1429,7 +1429,7 @@ static int gpmc_probe_nand_child(struct
  35  }
  36  #endif
  37
  38 -#ifdef CONFIG_MTD_ONENAND
  39 +#if IS_ENABLED(CONFIG_MTD_ONENAND)
  40  static int gpmc_probe_onenand_child(struct platform_device *pdev,
  41                                  struct device_node *child)
  42  {