xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel

Browse Source
This commit is contained in:
Russell King
2008-10-09 21:31:54 +01:00
committed by Russell King
parent b4ffb0edf4 3bca103a1e 446b097a42 8e6c81fe28 0ac4ed9d76 bda0308609
commit 90bb28b064
425 changed files with 3039 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/mach-ep93xx/micro9.c
View File

@@ -16,10 +16,9 @@
#include <linux/mm.h>
#include <linux/platform_device.h>
#include <linux/sched.h>
#include <linux/io.h>
#include <linux/mtd/physmap.h>
#include <asm/io.h>
#include <mach/hardware.h>
#include <asm/mach/arch.h>
@@ -29,38 +28,9 @@ static struct ep93xx_eth_data micro9_eth_data = {
.phy_id = 0x1f,
};
static struct resource micro9_eth_resource[] = {
{
.start = EP93XX_ETHERNET_PHYS_BASE,
.end = EP93XX_ETHERNET_PHYS_BASE + 0xffff,
.flags = IORESOURCE_MEM,
}, {
.start = IRQ_EP93XX_ETHERNET,
.end = IRQ_EP93XX_ETHERNET,
.flags = IORESOURCE_IRQ,
}
};
static struct platform_device micro9_eth_device = {
.name = "ep93xx-eth",
.id = -1,
.dev = {
.platform_data = &micro9_eth_data,
},
.num_resources = ARRAY_SIZE(micro9_eth_resource),
.resource = micro9_eth_resource,
};
static void __init micro9_eth_init(void)
{
memcpy(micro9_eth_data.dev_addr,
(void *)(EP93XX_ETHERNET_BASE + 0x50), 6);
platform_device_register(&micro9_eth_device);
}
static void __init micro9_init(void)
{
micro9_eth_init();
ep93xx_register_eth(&micro9_eth_data, 1);
}
/*