Commit 65829ef5 authored Nov 12, 2012 by Arnd Bergmann

Merge tag 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3-signed' of...

Merge tag 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers

From Tony Lindgren <tony@atomide.com>:

These changes deal with the issues of relative includes
introduced by the earlier clean-up and clean up few more
things for enabling multiplatform support.

The multiplatform kernel has been booted on omaps on
top of this branch with the work-in-progress patches
applied manually.

We cannot yet enable the multiplatform support though.
We still need the common clock framework patches, some
solution for dma-omap.h, and serial-omap.h moved before
we can enable it.

* tag 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: Remove omap_init_consistent_dma_size()
  ARM: OMAP: Remove NEED_MACH_GPIO_H
  ARM: OMAP: Remove unnecessary mach and plat includes
  ARM: OMAP2+: Fix relative includes for serial.h
  ARM: OMAP: Fix relative includes for fpga.h
  ARM: OMAP1: Remove relative includes
  ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c
  ARM: OMAP: Fix relative includes for debug-devices.h
  ARM: OMAP: Remove plat-omap/common.h
  ARM: OMAP: Move omap-pm-noop.c local to mach-omap2
  ARM: OMAP: Fix relative includes for shared i2c.h file
  ARM: OMAP: Make plat-omap/i2c.c port checks local
  ARM: OMAP: Move omap2+ specific parts of sram.c to mach-omap2
  ARM: OMAP: Move omap1 specific code to local sram.c
  ARM: OMAP: Introduce common omap_map_sram() and omap_sram_reset()
  ARM: OMAP: Split sram.h to local headers and minimal shared header
  ARM: OMAP1: usb: fix sparse warnings

Conflicts:
	arch/arm/mach-omap2/cm33xx.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 97666997 6ba54ab4

arch/arm/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -937,7 +937,6 @@ config ARCH_OMAP
		select CLKSRC_MMIO
		select GENERIC_CLOCKEVENTS
		select HAVE_CLK
		select NEED_MACH_GPIO_H
		help
		Support for TI's OMAP platform (OMAP1/2/3/4).

arch/arm/mach-omap1/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,8 @@
		#

		# Common support
		obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o
		obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \
		serial.o devices.o dma.o
		obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o

		ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

arch/arm/mach-omap1/board-fsample.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@
		#include <mach/tc.h>
		#include <mach/mux.h>
		#include <mach/flash.h>
		#include <../plat-omap/fpga.h>
		#include <linux/platform_data/keypad-omap.h>

		#include <mach/hardware.h>

		#include "iomap.h"
		#include "common.h"
		#include "fpga.h"

		/* fsample is pretty close to p2-sample */

arch/arm/mach-omap1/board-innovator.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@

		#include <mach/mux.h>
		#include <mach/flash.h>
		#include <../plat-omap/fpga.h>
		#include <mach/tc.h>
		#include <linux/platform_data/keypad-omap.h>

arch/arm/mach-omap1/board-perseus2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@

		#include <mach/tc.h>
		#include <mach/mux.h>
		#include <../plat-omap/fpga.h>
		#include <mach/flash.h>

		#include <mach/hardware.h>

		#include "iomap.h"
		#include "common.h"
		#include "fpga.h"

		static const unsigned int p2_keymap[] = {
		KEY(0, 0, KEY_UP),

Admin message