Commit a2bd40d2 authored by Hartley Sweeten's avatar Hartley Sweeten Committed by Russell King
Browse files

[ARM] 5504/1: ep93xx: Merge all edb93xx platforms 



The Cirrus Logic EDB93xx development board platform init files
share redundant code. The only differences are in the flash
memory configuration, MACH_TYPE, and additional on-board
I2C devices. This patch merges all of them into one file.

Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Herbert Valerio Riedel <hvr@gnu.org>
Cc: Toufeeq Hussain <toufeeq_hussain@infosys.com>
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b4175b89

arch/arm/mach-ep93xx/Kconfig

+35 −17
Original line number Diff line number Diff line
@@ -15,44 +15,62 @@ config MACH_ADSSPHERE 
	  Say 'Y' here if you want your kernel to support the ADS

	  Sphere board.



config MACH_EDB93XX

	bool

	default n



config MACH_EDB9301

	bool "Support Cirrus Logic EDB9301"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9301 Evaluation Board.



config MACH_EDB9302

	bool "Support Cirrus Logic EDB9302"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9302 Evaluation Board.



config MACH_EDB9302A

	bool "Support Cirrus Logic EDB9302A"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9302A Evaluation Board.



config MACH_EDB9307

	bool "Support Cirrus Logic EDB9307"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9307 Evaluation Board.



config MACH_EDB9307A

	bool "Support Cirrus Logic EDB9307A"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9307A Evaluation Board.



config MACH_EDB9312

	bool "Support Cirrus Logic EDB9312"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9312 Evaluation Board.



config MACH_EDB9315

	bool "Support Cirrus Logic EDB9315"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9315 Evaluation Board.



config MACH_EDB9315A

	bool "Support Cirrus Logic EDB9315A"

	select MACH_EDB93XX

	help

	  Say 'Y' here if you want your kernel to support the Cirrus

	  Logic EDB9315A Evaluation Board.

arch/arm/mach-ep93xx/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -7,13 +7,7 @@ obj-n := 
obj-			:=



obj-$(CONFIG_MACH_ADSSPHERE)	+= adssphere.o

obj-$(CONFIG_MACH_EDB9302)	+= edb9302.o

obj-$(CONFIG_MACH_EDB9302A)	+= edb9302a.o

obj-$(CONFIG_MACH_EDB9307)	+= edb9307.o

obj-$(CONFIG_MACH_EDB9307A)	+= edb9307a.o

obj-$(CONFIG_MACH_EDB9312)	+= edb9312.o

obj-$(CONFIG_MACH_EDB9315)	+= edb9315.o

obj-$(CONFIG_MACH_EDB9315A)	+= edb9315a.o

obj-$(CONFIG_MACH_EDB93XX)	+= edb93xx.o

obj-$(CONFIG_MACH_GESBC9312)	+= gesbc9312.o

obj-$(CONFIG_MACH_MICRO9)	+= micro9.o

obj-$(CONFIG_MACH_TS72XX)	+= ts72xx.o

arch/arm/mach-ep93xx/edb9302.c

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ep93xx/edb9302.c

 * Cirrus Logic EDB9302 support.

 *

 * Copyright (C) 2006 George Kashperko <george@chas.com.ua>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



static struct physmap_flash_data edb9302_flash_data = {

	.width		= 2,

};



static struct resource edb9302_flash_resource = {

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device edb9302_flash = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

		.platform_data	= &edb9302_flash_data,

	},

	.num_resources	= 1,

	.resource	= &edb9302_flash_resource,

};



static struct ep93xx_eth_data edb9302_eth_data = {

	.phy_id		= 1,

};



static void __init edb9302_init_machine(void)

{

	ep93xx_init_devices();

	platform_device_register(&edb9302_flash);



	ep93xx_register_eth(&edb9302_eth_data, 1);

}



MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")

	/* Maintainer: George Kashperko <george@chas.com.ua> */

	.phys_io	= EP93XX_APB_PHYS_BASE,

	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,

	.boot_params	= EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb9302_init_machine,

MACHINE_END

arch/arm/mach-ep93xx/edb9302a.c

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ep93xx/edb9302a.c

 * Cirrus Logic EDB9302A support.

 *

 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



static struct physmap_flash_data edb9302a_flash_data = {

	.width		= 2,

};



static struct resource edb9302a_flash_resource = {

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device edb9302a_flash = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

		.platform_data	= &edb9302a_flash_data,

	},

	.num_resources	= 1,

	.resource	= &edb9302a_flash_resource,

};



static struct ep93xx_eth_data edb9302a_eth_data = {

	.phy_id		= 1,

};



static void __init edb9302a_init_machine(void)

{

	ep93xx_init_devices();

	platform_device_register(&edb9302a_flash);



	ep93xx_register_eth(&edb9302a_eth_data, 1);

}



MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")

	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.phys_io	= EP93XX_APB_PHYS_BASE,

	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,

	.boot_params	= EP93XX_SDCE0_PHYS_BASE + 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb9302a_init_machine,

MACHINE_END

arch/arm/mach-ep93xx/edb9307.c

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ep93xx/edb9307.c

 * Cirrus Logic EDB9307 support.

 *

 * Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/i2c.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



static struct physmap_flash_data edb9307_flash_data = {

	.width		= 4,

};



static struct resource edb9307_flash_resource = {

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_32M - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device edb9307_flash = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

		.platform_data	= &edb9307_flash_data,

	},

	.num_resources	= 1,

	.resource	= &edb9307_flash_resource,

};



static struct ep93xx_eth_data edb9307_eth_data = {

	.phy_id		= 1,

};



static void __init edb9307_init_machine(void)

{

	ep93xx_init_devices();

	platform_device_register(&edb9307_flash);



	ep93xx_register_eth(&edb9307_eth_data, 1);

}



MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")

	/* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */

	.phys_io	= EP93XX_APB_PHYS_BASE,

	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,

	.boot_params	= EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.timer		= &ep93xx_timer,

	.init_machine	= edb9307_init_machine,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE