summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-dm365-evm.c
diff options
context:
space:
mode:
authorManjunath Hadli2011-12-21 14:43:35 +0100
committerSekhar Nori2012-02-24 22:10:13 +0100
commit39c6d2d1d743b8c925abae7043acc35e6cdc0051 (patch)
treee5e6e98ab71ffe835297ad9287c2573e7e652a4c /arch/arm/mach-davinci/board-dm365-evm.c
parentARM: davinci: dm646x: move private definitions to C file (diff)
downloadkernel-qcow2-linux-39c6d2d1d743b8c925abae7043acc35e6cdc0051.tar.gz
kernel-qcow2-linux-39c6d2d1d743b8c925abae7043acc35e6cdc0051.tar.xz
kernel-qcow2-linux-39c6d2d1d743b8c925abae7043acc35e6cdc0051.zip
ARM: davinci: create new common platform header for davinci
Remove individual platform header files for dm365, dm355, dm644x and dm646x and consolidate it into a single and common header file davinci.h placed in arch/arm/mach-davinci. This reduces the pollution in the include/mach and is consistent with Russell's suggestions as part of his "pet peaves" mail. (See #4 in: http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/071516.html) While at it, fix the forward declaration of spi_board_info, and include the right header file instead. The further patches in the series take advantage of this consolidation for easy implementation of IO_ADDRESS elimination. Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> [nsekhar@ti.com: make davinci.h the first local include file, fix forward declaration of spi_board_info and add back Deep Root Systems, LLC copyright] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm365-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-dm365-evm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 346e1de2f5a8..108c8b76c431 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -32,7 +32,6 @@
#include <asm/mach/arch.h>
#include <mach/mux.h>
-#include <mach/dm365.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
@@ -42,6 +41,8 @@
#include <media/tvp514x.h>
+#include "davinci.h"
+
static inline int have_imager(void)
{
/* REVISIT when it's supported, trigger via Kconfig */