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

Commit 70342174 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Kevin Hilman
Browse files

DaVinci: move AEMIF #define's to the proper headers 



Currently each DaVinci board file #define's its own version of the EMIFA base
addresses (all named DAVINCI_ASYNC_EMIF_*_BASE), which leads to duplication.
Move these #define's to the SoC specific headers, changing their prefixes from
'DAVINCI' to the 'DM355', 'DM644X', and 'DM646X' since all these base addresses
are SoC specific...

And while at it, rename DM646X_ASYNC_EMIF_DATA_CE0_BASE to
DM646X_ASYNC_EMIF_CS2_SPACE_BASE in order to match the DM646x datasheet.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent ef03592a

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -33,9 +33,6 @@ 
#include <mach/mmc.h>

#include <mach/mmc.h>

#include <mach/usb.h>

#include <mach/usb.h>





#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x01e10000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x02000000



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

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

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

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

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

 * swap chips, maybe with a different block size, partitioning may
@@ -86,12 +83,12 @@ static struct davinci_nand_pdata davinci_nand_data = { 




static struct resource davinci_nand_resources[] = {

static struct resource davinci_nand_resources[] = {

	{

	{

		.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

		.start		= DM355_ASYNC_EMIF_DATA_CE0_BASE,

		.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.end		= DM355_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	}, {

	}, {

		.start		= DAVINCI_ASYNC_EMIF_CONTROL_BASE,

		.start		= DM355_ASYNC_EMIF_CONTROL_BASE,

		.end		= DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.end		= DM355_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

};

};

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -30,9 +30,6 @@ 
#include <mach/mmc.h>

#include <mach/mmc.h>

#include <mach/usb.h>

#include <mach/usb.h>





#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x01e10000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x02000000



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

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

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

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

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

 * swap chips, maybe with a different block size, partitioning may
@@ -82,12 +79,12 @@ static struct davinci_nand_pdata davinci_nand_data = { 




static struct resource davinci_nand_resources[] = {

static struct resource davinci_nand_resources[] = {

	{

	{

		.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

		.start		= DM355_ASYNC_EMIF_DATA_CE0_BASE,

		.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.end		= DM355_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	}, {

	}, {

		.start		= DAVINCI_ASYNC_EMIF_CONTROL_BASE,

		.start		= DM355_ASYNC_EMIF_CONTROL_BASE,

		.end		= DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.end		= DM355_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

};

};

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -54,11 +54,6 @@ static inline int have_tvp7002(void) 
	return 0;

	return 0;

}

}







#define DM365_ASYNC_EMIF_CONTROL_BASE	0x01d10000

#define DM365_ASYNC_EMIF_DATA_CE0_BASE	0x02000000

#define DM365_ASYNC_EMIF_DATA_CE1_BASE	0x04000000



#define DM365_EVM_PHY_MASK		(0x2)

#define DM365_EVM_PHY_MASK		(0x2)

#define DM365_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */

#define DM365_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */

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

+6 −12
Original line number Original line Diff line number Diff line
@@ -43,12 +43,6 @@ 




#define DAVINCI_CFC_ATA_BASE		  0x01C66000

#define DAVINCI_CFC_ATA_BASE		  0x01C66000





#define DAVINCI_ASYNC_EMIF_CONTROL_BASE   0x01e00000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE  0x02000000

#define DAVINCI_ASYNC_EMIF_DATA_CE1_BASE  0x04000000

#define DAVINCI_ASYNC_EMIF_DATA_CE2_BASE  0x06000000

#define DAVINCI_ASYNC_EMIF_DATA_CE3_BASE  0x08000000



#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_MASK	(0xfffffff0)

#define LXT971_PHY_MASK	(0xfffffff0)
@@ -92,8 +86,8 @@ static struct physmap_flash_data davinci_evm_norflash_data = { 
/* NOTE: CFI probe will correctly detect flash part as 32M, but EMIF

/* NOTE: CFI probe will correctly detect flash part as 32M, but EMIF

 * limits addresses to 16M, so using addresses past 16M will wrap */

 * limits addresses to 16M, so using addresses past 16M will wrap */

static struct resource davinci_evm_norflash_resource = {

static struct resource davinci_evm_norflash_resource = {

	.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

	.start		= DM644X_ASYNC_EMIF_DATA_CE0_BASE,

	.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,

	.end		= DM644X_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

	.flags		= IORESOURCE_MEM,

};

};
@@ -154,12 +148,12 @@ static struct davinci_nand_pdata davinci_evm_nandflash_data = { 




static struct resource davinci_evm_nandflash_resource[] = {

static struct resource davinci_evm_nandflash_resource[] = {

	{

	{

		.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

		.start		= DM644X_ASYNC_EMIF_DATA_CE0_BASE,

		.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,

		.end		= DM644X_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	}, {

	}, {

		.start		= DAVINCI_ASYNC_EMIF_CONTROL_BASE,

		.start		= DM644X_ASYNC_EMIF_CONTROL_BASE,

		.end		= DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.end		= DM644X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

};

};

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -80,17 +80,14 @@ static struct davinci_nand_pdata davinci_nand_data = { 
	.options		= 0,

	.options		= 0,

};

};





#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x20008000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x42000000



static struct resource davinci_nand_resources[] = {

static struct resource davinci_nand_resources[] = {

	{

	{

		.start		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,

		.start		= DM646X_ASYNC_EMIF_CS2_SPACE_BASE,

		.end		= DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_32M - 1,

		.end		= DM646X_ASYNC_EMIF_CS2_SPACE_BASE + SZ_32M - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	}, {

	}, {

		.start		= DAVINCI_ASYNC_EMIF_CONTROL_BASE,

		.start		= DM646X_ASYNC_EMIF_CONTROL_BASE,

		.end		= DAVINCI_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.end		= DM646X_ASYNC_EMIF_CONTROL_BASE + SZ_4K - 1,

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	},

};

};