public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx
@ 2010-06-29  7:23 Stefan Roese
  2010-07-12  6:51 ` Ben Warren
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Roese @ 2010-06-29  7:23 UTC (permalink / raw)
  To: u-boot

By defining CONFIG_M88E1111_DISABLE_FIBER boards can configure the
M88E1111 PYH to disable fiber. This is needed for an upcoming PPC460GT
based board, which has fiber/copper auto-selection enabled by default.
This doesn't seem to work. So we disable fiber in the PHY register.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Ben Warren <biggerbadderben@gmail.com>
---
v2: - Fixed spelling: fibre -> fiber

 drivers/net/4xx_enet.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 2fac641..144b851 100644
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -1095,6 +1095,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
 		miiphy_write (dev->name, reg, 0x18, 0x4101);
 		miiphy_write (dev->name, reg, 0x09, 0x0e00);
 		miiphy_write (dev->name, reg, 0x04, 0x01e1);
+#if defined(CONFIG_M88E1111_DISABLE_FIBER)
+		miiphy_read(dev->name, reg, 0x1b, &reg_short);
+		reg_short |= 0x8000;
+		miiphy_write(dev->name, reg, 0x1b, reg_short);
+#endif
 #endif
 #if defined(CONFIG_M88E1112_PHY)
 		if (bis->bi_phymode[devnum] == BI_PHYMODE_SGMII) {
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx
  2010-06-29  7:23 [U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx Stefan Roese
@ 2010-07-12  6:51 ` Ben Warren
  0 siblings, 0 replies; 2+ messages in thread
From: Ben Warren @ 2010-07-12  6:51 UTC (permalink / raw)
  To: u-boot

  Hi Stefen,

On 6/29/2010 12:23 AM, Stefan Roese wrote:
> By defining CONFIG_M88E1111_DISABLE_FIBER boards can configure the
> M88E1111 PYH to disable fiber. This is needed for an upcoming PPC460GT
> based board, which has fiber/copper auto-selection enabled by default.
> This doesn't seem to work. So we disable fiber in the PHY register.
>
> Signed-off-by: Stefan Roese<sr@denx.de>
> Cc: Ben Warren<biggerbadderben@gmail.com>
> ---
> v2: - Fixed spelling: fibre ->  fiber
>
>   drivers/net/4xx_enet.c |    5 +++++
>   1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
> index 2fac641..144b851 100644
> --- a/drivers/net/4xx_enet.c
> +++ b/drivers/net/4xx_enet.c
> @@ -1095,6 +1095,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
>   		miiphy_write (dev->name, reg, 0x18, 0x4101);
>   		miiphy_write (dev->name, reg, 0x09, 0x0e00);
>   		miiphy_write (dev->name, reg, 0x04, 0x01e1);
> +#if defined(CONFIG_M88E1111_DISABLE_FIBER)
> +		miiphy_read(dev->name, reg, 0x1b,&reg_short);
> +		reg_short |= 0x8000;
> +		miiphy_write(dev->name, reg, 0x1b, reg_short);
> +#endif
>   #endif
>   #if defined(CONFIG_M88E1112_PHY)
>   		if (bis->bi_phymode[devnum] == BI_PHYMODE_SGMII) {
Applied to net repo.

thanks,
Ben

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-12  6:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-29  7:23 [U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx Stefan Roese
2010-07-12  6:51 ` Ben Warren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox