Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18640193 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a8612809

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/memory/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -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

drivers/memory/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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