[PATCH 0/6] ARM: OMAP2+: Don't force select OMAP_GPMC

[PATCH 0/6] ARM: OMAP2+: Don't force select OMAP_GPMC

[Franklin S Cooper Jr]

When building random configs a compile failure was detected due to
CONFIG_MEMORY not being selected. This was due to OMAP_GPMC being enabled
by ARCH_OMAP2PLUS which ignores config dependencies. This patchset fixes
this issue and also insures GPMC and NAND is enabled for multi_v7.

Boot tested that NAND works on AM335x EVM using both omap2plus and
multi_v7 config

Franklin S Cooper Jr (6):
  ARM: omap2plus_defconfig: Enable OMAP GPMC
  ARM: multi_v7_defconfig: Enable OMAP GPMC
  ARM: multi_v7_defconfig: Enable OMAP NAND drivers
  mtd: nand: Add OMAP_GPMC as a dependency to MTD_NAND_OMAP2
  memory: omap-gpmc: Enable omap-gpmc by default when dependency is met
  ARM: OMAP2+: Don't force select OMAP_GPMC

 arch/arm/configs/multi_v7_defconfig  | 3 +++
 arch/arm/configs/omap2plus_defconfig | 1 +
 arch/arm/mach-omap2/Kconfig          | 1 -
 drivers/memory/Kconfig               | 1 +
 drivers/mtd/nand/Kconfig             | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

-- 
2.7.0

[PATCH 1/6] ARM: omap2plus_defconfig: Enable OMAP GPMC

[Franklin S Cooper Jr]

OMAP_GPMC will soon not be forcibly enabled by ARCH_OMAP2PLUS. It needs
to be manually selected by the config. Enable it by default so features
like NAND boot will work.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/configs/omap2plus_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index ac717cc..c0c3bcd 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -117,6 +117,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DMA_CMA=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_CONNECTOR=m
+CONFIG_OMAP_GPMC=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
-- 
2.7.0

[PATCH 2/6] ARM: multi_v7_defconfig: Enable OMAP GPMC

[Franklin S Cooper Jr]

OMAP_GPMC will soon not be forcibly enabled by ARCH_OMAP2PLUS. It needs
to be manually selected by the config. Enable it by default so features
like NAND boot will work.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 8f85756..782d963 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -181,6 +181,7 @@ CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_SIMPLE_PM_BUS=y
 CONFIG_SUNXI_RSB=m
+CONFIG_OMAP_GPMC=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
-- 
2.7.0

[PATCH 3/6] ARM: multi_v7_defconfig: Enable OMAP NAND drivers

[Franklin S Cooper Jr]

Enable both MTD_NAND_OMAP2 and MTD_NAND_ECC_BCH to enable NAND support
for OMAP based boards.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/configs/multi_v7_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 782d963..d4152a4 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -187,6 +187,8 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_OMAP2=y
+CONFIG_MTD_NAND_OMAP_BCH=y
 CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_NAND_ATMEL=y
 CONFIG_MTD_NAND_BRCMNAND=y
-- 
2.7.0

[PATCH 4/6] mtd: nand: Add OMAP_GPMC as a dependency to MTD_NAND_OMAP2

[Franklin S Cooper Jr]

OMAP 2 NAND depends on the GPMC driver. Therefore, insure that the OMAP
GPMC config is selected before enabling the OMAP 2 NAND driver.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 drivers/mtd/nand/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f05e0e9..e24404f 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -89,7 +89,7 @@ config MTD_NAND_AMS_DELTA
 
 config MTD_NAND_OMAP2
 	tristate "NAND Flash device on OMAP2, OMAP3 and OMAP4"
-	depends on ARCH_OMAP2PLUS
+	depends on ARCH_OMAP2PLUS && OMAP_GPMC
 	help
           Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4
 	  platforms.
-- 
2.7.0

Re: [PATCH 4/6] mtd: nand: Add OMAP_GPMC as a dependency to MTD_NAND_OMAP2

[Boris Brezillon]

On Thu,  9 Jun 2016 12:02:55 -0500
Franklin S Cooper Jr <fcooper@ti.com> wrote:

> OMAP 2 NAND depends on the GPMC driver. Therefore, insure that the OMAP
> GPMC config is selected before enabling the OMAP 2 NAND driver.
> 
> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
> ---
>  drivers/mtd/nand/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
> index f05e0e9..e24404f 100644
> --- a/drivers/mtd/nand/Kconfig
> +++ b/drivers/mtd/nand/Kconfig
> @@ -89,7 +89,7 @@ config MTD_NAND_AMS_DELTA
>  
>  config MTD_NAND_OMAP2
>  	tristate "NAND Flash device on OMAP2, OMAP3 and OMAP4"
> -	depends on ARCH_OMAP2PLUS
> +	depends on ARCH_OMAP2PLUS && OMAP_GPMC

If you add

	depends on ARCH_OMAP2PLUS

in the OMAP_GPMC driver, you can just drop the ARCH_OMAP2PLUS
dependency here.

>  	help
>            Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4
>  	  platforms.



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[PATCH 5/6] memory: omap-gpmc: Enable omap-gpmc by default when dependency is met

[Franklin S Cooper Jr]

When dependencies are met enable OMAP GPMC by default. Later patches will
prevent OMAP GPMC from being automatically selected by mach-omap2 Kconfig.
Therefore, this will sure after that change the current behavior is still
maintained when dependencies are met.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 drivers/memory/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index 81ddb17..56a1c66 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -51,6 +51,7 @@ config TI_EMIF
 
 config OMAP_GPMC
 	bool
+	default y
 	select GPIOLIB
 	help
 	  This driver is for the General Purpose Memory Controller (GPMC)
-- 
2.7.0

Re: [PATCH 5/6] memory: omap-gpmc: Enable omap-gpmc by default when dependency is met

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3785 bytes --]

Hi,

[auto build test ERROR on arm/for-next]
[also build test ERROR on v4.7-rc2 next-20160609]
[cannot apply to omap/for-next]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Franklin-S-Cooper-Jr/ARM-OMAP2-Don-t-force-select-OMAP_GPMC/20160610-010648
base:   http://repo.or.cz/linux-2.6/linux-2.6-arm.git for-next
config: x86_64-acpi-redef (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

>> drivers/memory/omap-gpmc.c:38:28: fatal error: asm/mach-types.h: No such file or directory
    #include <asm/mach-types.h>
                               ^
   compilation terminated.

vim +38 drivers/memory/omap-gpmc.c

fced80c73 arch/arm/mach-omap2/gpmc.c Russell King         2008-09-06  22  #include <linux/io.h>
fd1dc87de arch/arm/mach-omap2/gpmc.c Paul Walmsley        2008-10-06  23  #include <linux/module.h>
d2d00862d drivers/memory/omap-gpmc.c Roger Quadros        2016-03-07  24  #include <linux/gpio/driver.h>
db97eb7df arch/arm/mach-omap2/gpmc.c Sukumar Ghorai       2011-01-28  25  #include <linux/interrupt.h>
384258f25 drivers/memory/omap-gpmc.c Roger Quadros        2015-07-30  26  #include <linux/irqdomain.h>
da4968739 arch/arm/mach-omap2/gpmc.c Afzal Mohammed       2012-09-23  27  #include <linux/platform_device.h>
bc6b1e7b8 arch/arm/mach-omap2/gpmc.c Daniel Mack          2012-12-14  28  #include <linux/of.h>
cdd6928c5 arch/arm/mach-omap2/gpmc.c Jon Hunter           2013-02-08  29  #include <linux/of_address.h>
bc6b1e7b8 arch/arm/mach-omap2/gpmc.c Daniel Mack          2012-12-14  30  #include <linux/of_device.h>
b1dc1ca9d drivers/memory/omap-gpmc.c Robert ABEL          2015-02-27  31  #include <linux/of_platform.h>
e639cd5bf arch/arm/mach-omap2/gpmc.c Tony Lindgren        2014-11-20  32  #include <linux/omap-gpmc.h>
b3f5525c5 arch/arm/mach-omap2/gpmc.c avinash philip       2013-06-12  33  #include <linux/pm_runtime.h>
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  34  
bc3668ea0 arch/arm/mach-omap2/gpmc.c Afzal Mohammed       2012-09-29  35  #include <linux/platform_data/mtd-nand-omap2.h>
e639cd5bf arch/arm/mach-omap2/gpmc.c Tony Lindgren        2014-11-20  36  #include <linux/platform_data/mtd-onenand-omap2.h>
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  37  
7f2451624 arch/arm/mach-omap2/gpmc.c Kyungmin Park        2006-12-29 @38  #include <asm/mach-types.h>
72d0f1c3c arch/arm/mach-omap2/gpmc.c Syed Mohammed Khasim 2006-12-06  39  
4be48fd53 arch/arm/mach-omap2/gpmc.c Afzal Mohammed       2012-09-23  40  #define	DEVICE_NAME		"omap-gpmc"
4be48fd53 arch/arm/mach-omap2/gpmc.c Afzal Mohammed       2012-09-23  41  
fd1dc87de arch/arm/mach-omap2/gpmc.c Paul Walmsley        2008-10-06  42  /* GPMC register offsets */
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  43  #define GPMC_REVISION		0x00
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  44  #define GPMC_SYSCONFIG		0x10
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  45  #define GPMC_SYSSTATUS		0x14
4bbbc1adc arch/arm/mach-omap2/gpmc.c Juha Yrjola          2006-06-26  46  #define GPMC_IRQSTATUS		0x18

:::::: The code at line 38 was first introduced by commit
:::::: 7f24516240c78760d0b19e6160dcab893ef81918 [PATCH] ARM: OMAP: fix GPMC compiler errors

:::::: TO: Kyungmin Park <kyungmin.park@samsung.com>
:::::: CC: Linus Torvalds <torvalds@woody.osdl.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 28312 bytes --]

Re: [PATCH 5/6] memory: omap-gpmc: Enable omap-gpmc by default when dependency is met

[Boris Brezillon]

On Thu,  9 Jun 2016 12:02:56 -0500
Franklin S Cooper Jr <fcooper@ti.com> wrote:

> When dependencies are met enable OMAP GPMC by default. Later patches will
> prevent OMAP GPMC from being automatically selected by mach-omap2 Kconfig.
> Therefore, this will sure after that change the current behavior is still
> maintained when dependencies are met.
> 
> Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
> ---
>  drivers/memory/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
> index 81ddb17..56a1c66 100644
> --- a/drivers/memory/Kconfig
> +++ b/drivers/memory/Kconfig
> @@ -51,6 +51,7 @@ config TI_EMIF
>  
>  config OMAP_GPMC
>  	bool
> +	default y

	depends ARCH_OMAP2PLUS

>  	select GPIOLIB
>  	help
>  	  This driver is for the General Purpose Memory Controller (GPMC)



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: [PATCH 5/6] memory: omap-gpmc: Enable omap-gpmc by default when dependency is met

[Boris Brezillon]

On Thu, 9 Jun 2016 20:45:03 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> On Thu,  9 Jun 2016 12:02:56 -0500
> Franklin S Cooper Jr <fcooper@ti.com> wrote:
> 
> > When dependencies are met enable OMAP GPMC by default. Later patches will
> > prevent OMAP GPMC from being automatically selected by mach-omap2 Kconfig.
> > Therefore, this will sure after that change the current behavior is still
> > maintained when dependencies are met.
> > 
> > Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
> > ---
> >  drivers/memory/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
> > index 81ddb17..56a1c66 100644
> > --- a/drivers/memory/Kconfig
> > +++ b/drivers/memory/Kconfig
> > @@ -51,6 +51,7 @@ config TI_EMIF
> >  
> >  config OMAP_GPMC
> >  	bool
> > +	default y  
> 
> 	depends ARCH_OMAP2PLUS

Actually, that was a question :).

> 
> >  	select GPIOLIB
> >  	help
> >  	  This driver is for the General Purpose Memory Controller (GPMC)  
> 
> 
> 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[PATCH 6/6] ARM: OMAP2+: Don't force select OMAP_GPMC

[Franklin S Cooper Jr]

OMAP_GPMC requires CONFIG_MEMORY to be enabled. However, by forcing
OMAP_GPMC to be selected dependencies are ignored. This is a problem
since it means OMAP_GPMC is always enabled even when it shouldn't be.

By avoiding this force selection it insures that OMAP_GPMC is only
enabled when its dependencies are met.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
---
 arch/arm/mach-omap2/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0517f0c..dcbb4bd 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -95,7 +95,6 @@ config ARCH_OMAP2PLUS
 	select MEMORY
 	select MFD_SYSCON
 	select OMAP_DM_TIMER
-	select OMAP_GPMC
 	select PINCTRL
 	select SOC_BUS
 	select OMAP_IRQCHIP
-- 
2.7.0