diff options
author | Steve Glendinning <steve.glendinning@smsc.com> | 2009-01-20 08:23:30 -0500 |
---|---|---|
committer | Steve Glendinning <steve.glendinning@smsc.com> | 2009-04-02 13:22:50 -0400 |
commit | c5142e84f3a39c6396ce2ddde01b1e420a67464a (patch) | |
tree | fd4f690e19b767b10b30231e31c0374f2babfeac | |
parent | 4353318ed5fe95debb8a80f289ebf1c03244cf9c (diff) |
arm: convert realview platform to use smsc911x
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
-rw-r--r-- | arch/arm/mach-realview/core.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index d6766685cfc7..9ab947c14f26 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/clocksource.h> | 28 | #include <linux/clocksource.h> |
29 | #include <linux/clockchips.h> | 29 | #include <linux/clockchips.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/smc911x.h> | 31 | #include <linux/smsc911x.h> |
32 | #include <linux/ata_platform.h> | 32 | #include <linux/ata_platform.h> |
33 | 33 | ||
34 | #include <asm/clkdev.h> | 34 | #include <asm/clkdev.h> |
@@ -128,14 +128,15 @@ int realview_flash_register(struct resource *res, u32 num) | |||
128 | return platform_device_register(&realview_flash_device); | 128 | return platform_device_register(&realview_flash_device); |
129 | } | 129 | } |
130 | 130 | ||
131 | static struct smc911x_platdata realview_smc911x_platdata = { | 131 | static struct smsc911x_platform_config smsc911x_config = { |
132 | .flags = SMC911X_USE_32BIT, | 132 | .flags = SMSC911X_USE_32BIT, |
133 | .irq_flags = IRQF_SHARED, | 133 | .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, |
134 | .irq_polarity = 1, | 134 | .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL, |
135 | .phy_interface = PHY_INTERFACE_MODE_MII, | ||
135 | }; | 136 | }; |
136 | 137 | ||
137 | static struct platform_device realview_eth_device = { | 138 | static struct platform_device realview_eth_device = { |
138 | .name = "smc911x", | 139 | .name = "smsc911x", |
139 | .id = 0, | 140 | .id = 0, |
140 | .num_resources = 2, | 141 | .num_resources = 2, |
141 | }; | 142 | }; |
@@ -145,8 +146,8 @@ int realview_eth_register(const char *name, struct resource *res) | |||
145 | if (name) | 146 | if (name) |
146 | realview_eth_device.name = name; | 147 | realview_eth_device.name = name; |
147 | realview_eth_device.resource = res; | 148 | realview_eth_device.resource = res; |
148 | if (strcmp(realview_eth_device.name, "smc911x") == 0) | 149 | if (strcmp(realview_eth_device.name, "smsc911x") == 0) |
149 | realview_eth_device.dev.platform_data = &realview_smc911x_platdata; | 150 | realview_eth_device.dev.platform_data = &smsc911x_config; |
150 | 151 | ||
151 | return platform_device_register(&realview_eth_device); | 152 | return platform_device_register(&realview_eth_device); |
152 | } | 153 | } |