diff options
author | Andy Fleming <afleming@freescale.com> | 2007-07-11 12:43:07 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-18 18:29:37 -0400 |
commit | 7132ab7f6e0309bb8e0424e395ba149aee0c750e (patch) | |
tree | b947434ef6edefdbe683b4a6c5740ccec977bc4e /arch | |
parent | af2d940df2b60b15c271033d381c2f3ead655562 (diff) |
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 c0ddc80d8160..3289fab01e92 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) | |||
197 | struct gianfar_platform_data gfar_data; | 197 | struct gianfar_platform_data gfar_data; |
198 | const unsigned int *id; | 198 | const unsigned int *id; |
199 | const char *model; | 199 | const char *model; |
200 | const char *ctype; | ||
200 | const void *mac_addr; | 201 | const void *mac_addr; |
201 | const phandle *ph; | 202 | const phandle *ph; |
202 | int n_res = 2; | 203 | int n_res = 2; |
@@ -254,6 +255,14 @@ static int __init gfar_of_init(void) | |||
254 | FSL_GIANFAR_DEV_HAS_VLAN | | 255 | FSL_GIANFAR_DEV_HAS_VLAN | |
255 | FSL_GIANFAR_DEV_HAS_EXTENDED_HASH; | 256 | FSL_GIANFAR_DEV_HAS_EXTENDED_HASH; |
256 | 257 | ||
258 | ctype = of_get_property(np, "phy-connection-type", NULL); | ||
259 | |||
260 | /* We only care about rgmii-id. The rest are autodetected */ | ||
261 | if (ctype && !strcmp(ctype, "rgmii-id")) | ||
262 | gfar_data.interface = PHY_INTERFACE_MODE_RGMII_ID; | ||
263 | else | ||
264 | gfar_data.interface = PHY_INTERFACE_MODE_MII; | ||
265 | |||
257 | ph = of_get_property(np, "phy-handle", NULL); | 266 | ph = of_get_property(np, "phy-handle", NULL); |
258 | phy = of_find_node_by_phandle(*ph); | 267 | phy = of_find_node_by_phandle(*ph); |
259 | 268 | ||