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

Commit 1306b20d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.19/gpmc-move-v2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 594b5d51 18640193

MAINTAINERS

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

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

arch/arm/mach-omap2/board-am3517crane.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/partitions.h>

#include <linux/omap-gpmc.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-omap2/board-cm-t35.c

+1 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/input/matrix_keypad.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/omap-gpmc.h>

#include <linux/platform_data/gpio-omap.h>



#include <linux/platform_data/at24.h>
@@ -51,8 +52,6 @@ 
#include "sdram-micron-mt46h32m32lf-6.h"

#include "hsmmc.h"

#include "common-board-devices.h"

#include "gpmc.h"

#include "gpmc-nand.h"



#define CM_T35_GPIO_PENDOWN		57

#define SB_T35_USB_HUB_RESET_GPIO	167