diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fm/b4860.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/fm.h | 1 | ||||
| -rw-r--r-- | drivers/net/fm/init.c | 8 | ||||
| -rw-r--r-- | drivers/net/fm/p1023.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/p4080.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/p5020.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/p5040.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/t4240.c | 7 | 
8 files changed, 51 insertions, 0 deletions
| diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 9b3d5324e..373cc4f42 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -37,6 +37,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr2, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr2, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	if (is_device_disabled(port)) diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index 5f197a982..3ec49a4f3 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -99,6 +99,7 @@ int fm_init_common(int index, struct ccsr_fman *reg);  int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info);  phy_interface_t fman_port_enet_if(enum fm_port port);  void fman_disable_port(enum fm_port port); +void fman_enable_port(enum fm_port port);  struct fsl_enet_mac {  	void *base; /* MAC controller registers base address */ diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 2d13145f1..35edd7ad9 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -145,6 +145,14 @@ void fm_disable_port(enum fm_port port)  	fman_disable_port(port);  } +void fm_enable_port(enum fm_port port) +{ +	int i = fm_port_to_index(port); + +	fm_info[i].enabled = 1; +	fman_enable_port(port); +} +  void fm_info_set_mdio(enum fm_port port, struct mii_dev *bus)  {  	int i = fm_port_to_index(port); diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c index 0eaad0f45..b25d10ae0 100644 --- a/drivers/net/fm/p1023.c +++ b/drivers/net/fm/p1023.c @@ -34,6 +34,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c index febfdd4e8..de7191135 100644 --- a/drivers/net/fm/p4080.c +++ b/drivers/net/fm/p4080.c @@ -42,6 +42,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr2, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr2, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c index 8d49c7bc1..5c158cd5d 100644 --- a/drivers/net/fm/p5020.c +++ b/drivers/net/fm/p5020.c @@ -38,6 +38,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr2, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr2, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c index 546ebce56..403d7d794 100644 --- a/drivers/net/fm/p5040.c +++ b/drivers/net/fm/p5040.c @@ -44,6 +44,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr2, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr2, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index 6253f22f7..1eacb2284 100644 --- a/drivers/net/fm/t4240.c +++ b/drivers/net/fm/t4240.c @@ -49,6 +49,13 @@ void fman_disable_port(enum fm_port port)  	setbits_be32(&gur->devdisr2, port_to_devdisr[port]);  } +void fman_enable_port(enum fm_port port) +{ +	ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + +	clrbits_be32(&gur->devdisr2, port_to_devdisr[port]); +} +  phy_interface_t fman_port_enet_if(enum fm_port port)  {  	ccsr_gur_t *gur = (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); |