aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/board-ap325rxa.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/boards/board-ap325rxa.c')
-rw-r--r--arch/sh/boards/board-ap325rxa.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 1c67cba6e34f..25a3306ce8dc 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -18,7 +18,7 @@
18#include <linux/mtd/sh_flctl.h> 18#include <linux/mtd/sh_flctl.h>
19#include <linux/delay.h> 19#include <linux/delay.h>
20#include <linux/i2c.h> 20#include <linux/i2c.h>
21#include <linux/smc911x.h> 21#include <linux/smsc911x.h>
22#include <linux/gpio.h> 22#include <linux/gpio.h>
23#include <media/soc_camera_platform.h> 23#include <media/soc_camera_platform.h>
24#include <media/sh_mobile_ceu.h> 24#include <media/sh_mobile_ceu.h>
@@ -27,12 +27,14 @@
27#include <asm/clock.h> 27#include <asm/clock.h>
28#include <cpu/sh7723.h> 28#include <cpu/sh7723.h>
29 29
30static struct smc911x_platdata smc911x_info = { 30static struct smsc911x_platform_config smsc911x_config = {
31 .flags = SMC911X_USE_32BIT, 31 .phy_interface = PHY_INTERFACE_MODE_MII,
32 .irq_flags = IRQF_TRIGGER_LOW, 32 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
33 .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
34 .flags = SMSC911X_USE_32BIT,
33}; 35};
34 36
35static struct resource smc9118_resources[] = { 37static struct resource smsc9118_resources[] = {
36 [0] = { 38 [0] = {
37 .start = 0xb6080000, 39 .start = 0xb6080000,
38 .end = 0xb60fffff, 40 .end = 0xb60fffff,
@@ -45,13 +47,13 @@ static struct resource smc9118_resources[] = {
45 } 47 }
46}; 48};
47 49
48static struct platform_device smc9118_device = { 50static struct platform_device smsc9118_device = {
49 .name = "smc911x", 51 .name = "smsc911x",
50 .id = -1, 52 .id = -1,
51 .num_resources = ARRAY_SIZE(smc9118_resources), 53 .num_resources = ARRAY_SIZE(smsc9118_resources),
52 .resource = smc9118_resources, 54 .resource = smsc9118_resources,
53 .dev = { 55 .dev = {
54 .platform_data = &smc911x_info, 56 .platform_data = &smsc911x_config,
55 }, 57 },
56}; 58};
57 59
@@ -316,7 +318,7 @@ static struct platform_device ceu_device = {
316}; 318};
317 319
318static struct platform_device *ap325rxa_devices[] __initdata = { 320static struct platform_device *ap325rxa_devices[] __initdata = {
319 &smc9118_device, 321 &smsc9118_device,
320 &ap325rxa_nor_flash_device, 322 &ap325rxa_nor_flash_device,
321 &lcdc_device, 323 &lcdc_device,
322 &ceu_device, 324 &ceu_device,