diff options
author | Cyril Chemparathy <cyril@ti.com> | 2010-09-15 10:11:25 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-09-24 10:40:30 -0400 |
commit | 782f2d782771484bb951be1c394ca2128ed7774e (patch) | |
tree | 47f621c022942f5f6a1cbbd450219347180de911 /arch/arm/mach-davinci/board-da830-evm.c | |
parent | 5d69e0076a726588265af040b21ac3f8266856d1 (diff) |
davinci: cleanup mdio arch code and switch to phy_id
This patch removes davinci architecture code that has now been rendered
useless by the previous patches in the MDIO separation series.
In addition, the earlier phy_mask definitions have been replaced with
corresponding phy_id definitions.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Tested-by: Michael Williamson <michael.williamson@criticallink.com>
Tested-by: Caglar Akyuz <caglarakyuz@gmail.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-da830-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-da830-evm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index ef1ab0b6576e..1bb89d3f9b1f 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c | |||
@@ -31,9 +31,7 @@ | |||
31 | #include <mach/usb.h> | 31 | #include <mach/usb.h> |
32 | #include <mach/aemif.h> | 32 | #include <mach/aemif.h> |
33 | 33 | ||
34 | #define DA830_EVM_PHY_MASK 0x0 | 34 | #define DA830_EVM_PHY_ID "" |
35 | #define DA830_EVM_MDIO_FREQUENCY 2200000 /* PHY bus frequency */ | ||
36 | |||
37 | /* | 35 | /* |
38 | * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4]. | 36 | * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4]. |
39 | */ | 37 | */ |
@@ -558,9 +556,8 @@ static __init void da830_evm_init(void) | |||
558 | 556 | ||
559 | da830_evm_usb_init(); | 557 | da830_evm_usb_init(); |
560 | 558 | ||
561 | soc_info->emac_pdata->phy_mask = DA830_EVM_PHY_MASK; | ||
562 | soc_info->emac_pdata->mdio_max_freq = DA830_EVM_MDIO_FREQUENCY; | ||
563 | soc_info->emac_pdata->rmii_en = 1; | 559 | soc_info->emac_pdata->rmii_en = 1; |
560 | soc_info->emac_pdata->phy_id = DA830_EVM_PHY_ID; | ||
564 | 561 | ||
565 | ret = davinci_cfg_reg_list(da830_cpgmac_pins); | 562 | ret = davinci_cfg_reg_list(da830_cpgmac_pins); |
566 | if (ret) | 563 | if (ret) |