diff options
author | Andy Fleming <afleming@freescale.com> | 2007-07-11 11:43:07 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-18 18:29:37 -0400 |
commit | 7132ab7f6e0309bb8e0424e395ba149aee0c750e (patch) | |
tree | b947434ef6edefdbe683b4a6c5740ccec977bc4e /arch | |
parent | af2d940df2b60b15c271033d381c2f3ead655562 (diff) | |
download | linux-3.10-7132ab7f6e0309bb8e0424e395ba149aee0c750e.tar.gz linux-3.10-7132ab7f6e0309bb8e0424e395ba149aee0c750e.tar.bz2 linux-3.10-7132ab7f6e0309bb8e0424e395ba149aee0c750e.zip |
Fix RGMII-ID handling in gianfar
The TSEC/eTSEC can detect the interface to the PHY automatically,
but it isn't able to detect whether the RGMII connection needs internal
delay. So we need to detect that change in the device tree, propagate
it to the platform data, and then check it if we're in RGMII. This fixes
a bug on the 8641D HPCN board where the Vitesse PHY doesn't use the delay
for RGMII.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index c0ddc80d816..3289fab01e9 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -197,6 +197,7 @@ static int __init gfar_of_init(void) struct gianfar_platform_data gfar_data; const unsigned int *id; const char *model; + const char *ctype; const void *mac_addr; const phandle *ph; int n_res = 2; @@ -254,6 +255,14 @@ static int __init gfar_of_init(void) FSL_GIANFAR_DEV_HAS_VLAN | FSL_GIANFAR_DEV_HAS_EXTENDED_HASH; + ctype = of_get_property(np, "phy-connection-type", NULL); + + /* We only care about rgmii-id. The rest are autodetected */ + if (ctype && !strcmp(ctype, "rgmii-id")) + gfar_data.interface = PHY_INTERFACE_MODE_RGMII_ID; + else + gfar_data.interface = PHY_INTERFACE_MODE_MII; + ph = of_get_property(np, "phy-handle", NULL); phy = of_find_node_by_phandle(*ph); |