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

Commit 7e4615cd authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Olof Johansson
Browse files

ARM: clps711x: Move specific definitions from hardware.h to boards files 



Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 6d640ede

arch/arm/mach-clps711x/board-edb7211.c

+6 −2
Original line number Diff line number Diff line
@@ -39,9 +39,13 @@ 


#define EDB7211_FLASH0_BASE	(CS0_PHYS_BASE)

#define EDB7211_FLASH1_BASE	(CS1_PHYS_BASE)



#define EDB7211_CS8900_BASE	(CS2_PHYS_BASE + 0x300)

#define EDB7211_CS8900_IRQ	(IRQ_EINT3)



/* The extra 8 lines of the keyboard matrix */

#define EDB7211_EXTKBD_BASE	(CS3_PHYS_BASE)



static struct resource edb7211_cs8900_resource[] __initdata = {

	DEFINE_RES_MEM(EDB7211_CS8900_BASE, SZ_1K),

	DEFINE_RES_IRQ(EDB7211_CS8900_IRQ),
@@ -113,8 +117,8 @@ static struct gpio edb7211_gpios[] __initconst = { 


static struct map_desc edb7211_io_desc[] __initdata = {

	{	/* Memory-mapped extra keyboard row */

		.virtual	= IO_ADDRESS(EP7211_PHYS_EXTKBD),

		.pfn		= __phys_to_pfn(EP7211_PHYS_EXTKBD),

		.virtual	= IO_ADDRESS(EDB7211_EXTKBD_BASE),

		.pfn		= __phys_to_pfn(EDB7211_EXTKBD_BASE),

		.length		= SZ_1M,

		.type		= MT_DEVICE,

	},

arch/arm/mach-clps711x/include/mach/hardware.h

+0 −7
Original line number Diff line number Diff line
@@ -70,11 +70,4 @@ 
#define CLPS711X_SDRAM0_BASE	(0xc0000000)

#define CLPS711X_SDRAM1_BASE	(0xd0000000)



#if defined (CONFIG_ARCH_EDB7211)



/* The extra 8 lines of the keyboard matrix are wired to chip select 3 */

#define EP7211_PHYS_EXTKBD	CS3_PHYS_BASE



#endif /* CONFIG_ARCH_EDB7211 */



#endif