memory: gpmc: Move omap gpmc code to live under drivers

Just move to drivers as further clean-up can now happen there
finally.

Let's also add Roger and me to the MAINTAINERS so we get
notified for any patches related to GPMC.

Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index dab92a78d1d5e5756d474109b3061290afd67550..78cc0595d5d4aa375e29c1f1a808c2d8f3ab932a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6629,6 +6629,14 @@ L:       linux-omap@vger.kernel.org
 S:     Maintained
 F:     sound/soc/omap/
 
+OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
+M:     Roger Quadros <rogerq@ti.com>
+M:     Tony Lindgren <tony@atomide.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/memory/omap-gpmc.c
+F:     arch/arm/mach-omap2/*gpmc*
+
 OMAP FRAMEBUFFER SUPPORT
 M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-fbdev@vger.kernel.org

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index f4d06aea84605993bc2464313adf4f79628ab914..0ea218e3dce5a57c1bb9a765d3d0f43e5568ad60 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -79,7 +79,9 @@ config ARCH_OMAP2PLUS
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
        select MACH_OMAP_GENERIC
+       select MEMORY
        select OMAP_DM_TIMER
+       select OMAP_GPMC
        select PINCTRL
        select SOC_BUS
        select TI_PRIV_EDMA

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 3e824f8fec48f6f769fa91382e4bc2ff794fd6c0..bd85741a972445ee1c7834a300626e5159083b87 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -6,7 +6,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
        -I$(srctree)/arch/arm/plat-omap/include
 
 # Common support
-obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
+obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o timer.o pm.o \
         common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
         omap_device.o sram.o drm.o
 

diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index 6d91c27fd4c8f325f29b7d21f5e93a89cff59691..6759de7ce209c34990bc299c3e224d361ed08388 100644 (file)
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -41,6 +41,14 @@ config TI_EMIF
          parameters and other settings during frequency, voltage and
          temperature changes
 
+config OMAP_GPMC
+       bool
+       help
+         This driver is for the General Purpose Memory Controller (GPMC)
+         present on Texas Instruments SoCs (e.g. OMAP2+). GPMC allows
+         interfacing to a variety of asynchronous as well as synchronous
+         memory drives like NOR, NAND, OneNAND, SRAM.
+
 config MVEBU_DEVBUS
        bool "Marvell EBU Device Bus Controller"
        default y

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index c32d31981be314518d16c8933177937e97841545..a7d410f3ca32a8e9604bf714487da4419054d9f2 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -8,6 +8,7 @@ endif
 obj-$(CONFIG_ATMEL_SDRAMC)     += atmel-sdramc.o
 obj-$(CONFIG_TI_AEMIF)         += ti-aemif.o
 obj-$(CONFIG_TI_EMIF)          += emif.o
+obj-$(CONFIG_OMAP_GPMC)                += omap-gpmc.o
 obj-$(CONFIG_FSL_CORENET_CF)   += fsl-corenet-cf.o
 obj-$(CONFIG_FSL_IFC)          += fsl_ifc.o
 obj-$(CONFIG_MVEBU_DEVBUS)     += mvebu-devbus.o

diff --git a/arch/arm/mach-omap2/gpmc.c b/drivers/memory/omap-gpmc.c
similarity index 100%
rename from arch/arm/mach-omap2/gpmc.c
rename to drivers/memory/omap-gpmc.c