diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:14:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:14:00 -0400 |
commit | 63c422afe3739b68bec0b5c42807d1450c951caf (patch) | |
tree | 2cdbcbd4c6fcea69fbe0b164242336c38168f631 /arch/arm/mach-ep93xx/gesbc9312.c | |
parent | 6f3a28f7d1f0a65a78443c273b6e8ec01becf301 (diff) | |
parent | d14b272bc63f35a8f20b4b1df16c080b8d24f8f1 (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support
[ARM] 3880/1: remove the last trace of iop31x support
[ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet
[ARM] 3809/3: get rid of 4 megabyte kernel image size limit
[ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c
[ARM] 3874/1: Remove leftover usage of asm/timeofday.h
Diffstat (limited to 'arch/arm/mach-ep93xx/gesbc9312.c')
-rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index e760fd4f3655..694590a451c1 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
@@ -43,10 +43,37 @@ static struct platform_device gesbc9312_flash = { | |||
43 | .resource = &gesbc9312_flash_resource, | 43 | .resource = &gesbc9312_flash_resource, |
44 | }; | 44 | }; |
45 | 45 | ||
46 | static struct ep93xx_eth_data gesbc9312_eth_data = { | ||
47 | .phy_id = 1, | ||
48 | }; | ||
49 | |||
50 | static struct resource gesbc9312_eth_resource[] = { | ||
51 | { | ||
52 | .start = EP93XX_ETHERNET_PHYS_BASE, | ||
53 | .end = EP93XX_ETHERNET_PHYS_BASE + 0xffff, | ||
54 | .flags = IORESOURCE_MEM, | ||
55 | }, { | ||
56 | .start = IRQ_EP93XX_ETHERNET, | ||
57 | .end = IRQ_EP93XX_ETHERNET, | ||
58 | .flags = IORESOURCE_IRQ, | ||
59 | } | ||
60 | }; | ||
61 | |||
62 | static struct platform_device gesbc9312_eth_device = { | ||
63 | .name = "ep93xx-eth", | ||
64 | .id = -1, | ||
65 | .dev = { | ||
66 | .platform_data = &gesbc9312_eth_data, | ||
67 | }, | ||
68 | .num_resources = 2, | ||
69 | .resource = gesbc9312_eth_resource, | ||
70 | }; | ||
71 | |||
46 | static void __init gesbc9312_init_machine(void) | 72 | static void __init gesbc9312_init_machine(void) |
47 | { | 73 | { |
48 | ep93xx_init_devices(); | 74 | ep93xx_init_devices(); |
49 | platform_device_register(&gesbc9312_flash); | 75 | platform_device_register(&gesbc9312_flash); |
76 | platform_device_register(&gesbc9312_eth_device); | ||
50 | } | 77 | } |
51 | 78 | ||
52 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | 79 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") |