Skip to content

Commit

Permalink
[ARM] Orion: common platform setup for Gigabit Ethernet port
Browse files Browse the repository at this point in the history
The Orion Ethernet port is the same port used in the Discovery
family (MV643XX). This patch include the common platform_device
stuff according to the existing mv643xx_eth conventions.

Signed-off-by: Tzachi Perelstein <tzachi@marvell.com>
Reviewed-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Tzachi Perelstein authored and Russell King committed Jan 26, 2008
1 parent ca26f7d commit e07c9d8
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
44 changes: 44 additions & 0 deletions arch/arm/mach-orion/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <linux/mv643xx_eth.h>
#include <asm/page.h>
#include <asm/timex.h>
#include <asm/mach/map.h>
Expand Down Expand Up @@ -168,6 +169,49 @@ static struct platform_device orion_ehci1 = {
.num_resources = ARRAY_SIZE(orion_ehci1_resources),
};

/*****************************************************************************
* Gigabit Ethernet port
* (The Orion and Discovery (MV643xx) families use the same Ethernet driver)
****************************************************************************/

static struct resource orion_eth_shared_resources[] = {
{
.start = ORION_ETH_REG_BASE,
.end = ORION_ETH_REG_BASE + 0xffff,
.flags = IORESOURCE_MEM,
},
};

static struct platform_device orion_eth_shared = {
.name = MV643XX_ETH_SHARED_NAME,
.id = 0,
.num_resources = 1,
.resource = orion_eth_shared_resources,
};

static struct resource orion_eth_resources[] = {
{
.name = "eth irq",
.start = IRQ_ORION_ETH_SUM,
.end = IRQ_ORION_ETH_SUM,
.flags = IORESOURCE_IRQ,
}
};

static struct platform_device orion_eth = {
.name = MV643XX_ETH_NAME,
.id = 0,
.num_resources = 1,
.resource = orion_eth_resources,
};

void __init orion_eth_init(struct mv643xx_eth_platform_data *eth_data)
{
orion_eth.dev.platform_data = eth_data;
platform_device_register(&orion_eth_shared);
platform_device_register(&orion_eth);
}

/*****************************************************************************
* General
****************************************************************************/
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/mach-orion/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,12 @@ void gpio_display(void); /* debug */
*/
extern struct sys_timer orion_timer;

/*
* Pull in Orion Ethernet platform_data, used by machine-setup
*/

struct mv643xx_eth_platform_data;

void __init orion_eth_init(struct mv643xx_eth_platform_data *eth_data);

#endif /* __ARCH_ORION_COMMON_H__ */

0 comments on commit e07c9d8

Please sign in to comment.