Merge branch 'iomap' into cleanup (a5bee307) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap1/ams-delta-fiq-handler.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -15,11 +15,12 @@

		#include <linux/linkage.h>

		#include <plat/io.h>
		#include <plat/board-ams-delta.h>

		#include <mach/ams-delta-fiq.h>

		#include "iomap.h"

		/*
		* GPIO related definitions, copied from arch/arm/plat-omap/gpio.c.
		* Unfortunately, those were not placed in a separate header file.

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <plat/board-ams-delta.h>

		#include <asm/fiq.h>

		#include <mach/ams-delta-fiq.h>

		static struct fiq_handler fh = {

+6 −4

Original line number	Diff line number	Diff line
		@@ -20,25 +20,27 @@
		#include <linux/platform_device.h>
		#include <linux/serial_8250.h>
		#include <linux/export.h>
		#include <linux/io.h>

		#include <media/soc_camera.h>

		#include <asm/serial.h>
		#include <mach/hardware.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>

		#include <plat/io.h>
		#include <plat/board-ams-delta.h>
		#include <plat/keypad.h>
		#include <plat/mux.h>
		#include <plat/usb.h>
		#include <plat/board.h>
		#include "common.h"
		#include <mach/camera.h>

		#include <mach/hardware.h>
		#include <mach/ams-delta-fiq.h>
		#include <mach/camera.h>

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

		static u8 ams_delta_latch1_reg;
		static u16 ams_delta_latch2_reg;

+5 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include <linux/input.h>
		#include <linux/smc91x.h>

		#include <mach/hardware.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>
		@@ -32,9 +31,13 @@
		#include <plat/flash.h>
		#include <plat/fpga.h>
		#include <plat/keypad.h>
		#include "common.h"
		#include <plat/board.h>

		#include <mach/hardware.h>

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

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

		#define fsample_cpld_read(reg) __raw_readb(reg)

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@
		#include <linux/i2c/tps65010.h>
		#include <linux/smc91x.h>

		#include <mach/hardware.h>

		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>
		@@ -43,9 +41,11 @@
		#include <plat/irda.h>
		#include <plat/usb.h>
		#include <plat/keypad.h>
		#include "common.h"
		#include <plat/flash.h>

		#include <mach/hardware.h>

		#include "common.h"
		#include "board-h2.h"

		/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */