summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-neuros-osd2.c
diff options
context:
space:
mode:
authorManjunath Hadli <manjunath.hadli@ti.com>2011-12-21 19:13:35 +0530
committerSekhar Nori <nsekhar@ti.com>2012-02-25 02:40:13 +0530
commit39c6d2d1d743b8c925abae7043acc35e6cdc0051 (patch)
treee5e6e98ab71ffe835297ad9287c2573e7e652a4c /arch/arm/mach-davinci/board-neuros-osd2.c
parent3d0914061fc3016250b00c0155113e27a1b8a269 (diff)
downloadop-kernel-dev-39c6d2d1d743b8c925abae7043acc35e6cdc0051.zip
op-kernel-dev-39c6d2d1d743b8c925abae7043acc35e6cdc0051.tar.gz
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-neuros-osd2.c')
-rw-r--r--arch/arm/mach-davinci/board-neuros-osd2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 6c4a164..3d12a3a 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -30,7 +30,6 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <mach/dm644x.h>
#include <mach/common.h>
#include <mach/i2c.h>
#include <mach/serial.h>
@@ -39,6 +38,8 @@
#include <mach/mmc.h>
#include <mach/usb.h>
+#include "davinci.h"
+
#define NEUROS_OSD2_PHY_ID "0:01"
#define LXT971_PHY_ID 0x001378e2
#define LXT971_PHY_MASK 0xfffffff0
OpenPOWER on IntegriCloud