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

Commit 39c6d2d1 authored by Manjunath Hadli's avatar Manjunath Hadli Committed by Sekhar Nori
Browse files

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: default avatarManjunath 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: default avatarSekhar Nori <nsekhar@ti.com>
parent 3d091406

arch/arm/mach-davinci/board-dm355-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -26,13 +26,14 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm355.h>

#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>

#include <mach/usb.h>



#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed

 * 2 GByte Micron NAND (MT29F16G08FAA) using 128KB sectors.  If you

 * swap chips, maybe with a different block size, partitioning may

arch/arm/mach-davinci/board-dm355-leopard.c

+2 −1
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm355.h>

#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>

#include <mach/usb.h>



#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed

 * 2 GByte Micron NAND (MT29F16G08FAA) using 128KB sectors.  If you

 * swap chips, maybe with a different block size, partitioning may

arch/arm/mach-davinci/board-dm365-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-davinci/board-dm644x-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -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>
@@ -40,6 +39,8 @@ 
#include <mach/usb.h>

#include <mach/aemif.h>



#include "davinci.h"



#define DM644X_EVM_PHY_ID		"0:01"

#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_MASK	(0xfffffff0)

arch/arm/mach-davinci/board-dm646x-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm646x.h>

#include <mach/common.h>

#include <mach/serial.h>

#include <mach/i2c.h>
@@ -45,6 +44,7 @@ 
#include <mach/cdce949.h>

#include <mach/aemif.h>



#include "davinci.h"

#include "clock.h"



#define NAND_BLOCK_SIZE		SZ_128K