From 865ff856403fb4bec6fe7f18101364384880068f Mon Sep 17 00:00:00 2001 From: Andy Fleming Date: Wed, 13 Apr 2011 00:37:12 -0500 Subject: fsl: Change fsl_phy_enet_if to phy_interface_t The fsl_phy_enet_if enum was, essentially, the phy_interface_t enum. This meant that drivers which used fsl_phy_enet_if to deal with PHY interfaces would have to convert between the two (or we would have to have them mirror each other, and deal with the ensuing maintenance headache). Instead, we switch all clients of fsl_phy_enet_if over to phy_interface_t, which should become the standard, anyway. Signed-off-by: Andy Fleming Acked-by: Detlev Zundel --- arch/powerpc/include/asm/fsl_enet.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'arch/powerpc/include/asm/fsl_enet.h') diff --git a/arch/powerpc/include/asm/fsl_enet.h b/arch/powerpc/include/asm/fsl_enet.h index 1f8f8e493f..8227b667cb 100644 --- a/arch/powerpc/include/asm/fsl_enet.h +++ b/arch/powerpc/include/asm/fsl_enet.h @@ -13,20 +13,7 @@ #ifndef __ASM_PPC_FSL_ENET_H #define __ASM_PPC_FSL_ENET_H -enum fsl_phy_enet_if { - MII, - RMII, - GMII, - RGMII, - RGMII_ID, - RGMII_RXID, - RGMII_TXID, - SGMII, - TBI, - RTBI, - XAUI, - FSL_ETH_IF_NONE, -}; +#include struct tsec_mii_mng { u32 miimcfg; /* MII management configuration reg */ @@ -38,6 +25,6 @@ struct tsec_mii_mng { u32 ifstat; /* Interface Status Register */ } __attribute__ ((packed)); -int fdt_fixup_phy_connection(void *blob, int offset, enum fsl_phy_enet_if phyc); +int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc); #endif /* __ASM_PPC_FSL_ENET_H */ -- cgit