diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 23:24:12 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 23:24:12 +0100 |
commit | 1306b20daa38c1429dabacc9ec8b437cb585e427 (patch) | |
tree | d6de9796f1d1da3d0aeba22c2085aa00afc6fac9 /MAINTAINERS | |
parent | 594b5d51c6fcb1af61be037e2e5ffd875495d866 (diff) | |
parent | 186401937927426f85a28bd798e82ca18e4e5549 (diff) | |
download | op-kernel-dev-1306b20daa38c1429dabacc9ec8b437cb585e427.zip op-kernel-dev-1306b20daa38c1429dabacc9ec8b437cb585e427.tar.gz |
Merge tag 'omap-for-v3.19/gpmc-move-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/omap-gpmc
Pull "move omap gpmc to drivers finally" from Tony Lindgren:
We can finally move the GPMC code to live in drivers/memory for
further clean up work.
Note that we still have dependencies to the legacy booting for
omap3 board-*.c files for setting up the board specific memory
timings. For that we need the timing related things still exposed
in include/linux/omap-gpmc.h. This will all become private data
to the GPMC driver once the legacy booting support can be dropped.
* tag 'omap-for-v3.19/gpmc-move-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
memory: gpmc: Move omap gpmc code to live under drivers
ARM: OMAP2+: Move GPMC initcall to devices.c
ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3c64271..66c0f2f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6633,6 +6633,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 |