diff options
author | Steve Glendinning <steve.glendinning@smsc.com> | 2009-01-07 03:20:07 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-01-21 03:42:21 -0500 |
commit | 90b764916abedbebe62ac41b2e4a3fc3e2b82f9b (patch) | |
tree | f0d08c4e26e13d1071720d1d7e15ba5ae4cc3015 | |
parent | deae7b860a5aca341410b72cca789589c5c93ce4 (diff) |
sh: convert ap325rxa platform to use smsc911x.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 24 | ||||
-rw-r--r-- | arch/sh/configs/ap325rxa_defconfig | 21 |
2 files changed, 32 insertions, 13 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 | ||
30 | static struct smc911x_platdata smc911x_info = { | 30 | static 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 | ||
35 | static struct resource smc9118_resources[] = { | 37 | static 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 | ||
48 | static struct platform_device smc9118_device = { | 50 | static 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 | ||
318 | static struct platform_device *ap325rxa_devices[] __initdata = { | 320 | static 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, |
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index 874dd9726e52..9317e817a406 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig | |||
@@ -541,13 +541,30 @@ CONFIG_NETDEVICES=y | |||
541 | # CONFIG_EQUALIZER is not set | 541 | # CONFIG_EQUALIZER is not set |
542 | # CONFIG_TUN is not set | 542 | # CONFIG_TUN is not set |
543 | # CONFIG_VETH is not set | 543 | # CONFIG_VETH is not set |
544 | # CONFIG_PHYLIB is not set | 544 | CONFIG_PHYLIB=y |
545 | |||
546 | # | ||
547 | # MII PHY device drivers | ||
548 | # | ||
549 | # CONFIG_MARVELL_PHY is not set | ||
550 | # CONFIG_DAVICOM_PHY is not set | ||
551 | # CONFIG_QSEMI_PHY is not set | ||
552 | # CONFIG_LXT_PHY is not set | ||
553 | # CONFIG_CICADA_PHY is not set | ||
554 | # CONFIG_VITESSE_PHY is not set | ||
555 | CONFIG_SMSC_PHY=y | ||
556 | # CONFIG_BROADCOM_PHY is not set | ||
557 | # CONFIG_ICPLUS_PHY is not set | ||
558 | # CONFIG_REALTEK_PHY is not set | ||
559 | # CONFIG_FIXED_PHY is not set | ||
560 | # CONFIG_MDIO_BITBANG is not set | ||
545 | CONFIG_NET_ETHERNET=y | 561 | CONFIG_NET_ETHERNET=y |
546 | CONFIG_MII=y | 562 | CONFIG_MII=y |
547 | # CONFIG_AX88796 is not set | 563 | # CONFIG_AX88796 is not set |
548 | # CONFIG_STNIC is not set | 564 | # CONFIG_STNIC is not set |
549 | # CONFIG_SMC91X is not set | 565 | # CONFIG_SMC91X is not set |
550 | CONFIG_SMC911X=y | 566 | # CONFIG_SMC911X is not set |
567 | CONFIG_SMSC911X=y | ||
551 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 568 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
552 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 569 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
553 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 570 | # CONFIG_IBM_NEW_EMAC_TAH is not set |