drivers/qe: add sgmii support in for UEC driver

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Haiying Wang 2009-06-04 16:12:42 -04:00 committed by Kumar Gala
parent 8e55258f14
commit e8efef7c1b
2 changed files with 46 additions and 2 deletions

View file

@ -379,6 +379,10 @@ static int uec_set_mac_if_mode(uec_private_t *uec, enet_interface_e if_mode)
maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE; maccfg2 |= MACCFG2_INTERFACE_MODE_NIBBLE;
upsmr |= (UPSMR_R10M | UPSMR_RMM); upsmr |= (UPSMR_R10M | UPSMR_RMM);
break; break;
case ENET_1000_SGMII:
maccfg2 |= MACCFG2_INTERFACE_MODE_BYTE;
upsmr |= UPSMR_SGMM;
break;
default: default:
return -EINVAL; return -EINVAL;
break; break;
@ -1078,6 +1082,18 @@ static int uec_startup(uec_private_t *uec)
out_be32(&uec_regs->utbipar, utbipar); out_be32(&uec_regs->utbipar, utbipar);
/* Configure the TBI for SGMII operation */
if (uec->uec_info->enet_interface == ENET_1000_SGMII) {
uec_write_phy_reg(uec->dev, uec_regs->utbipar,
ENET_TBI_MII_ANA, TBIANA_SETTINGS);
uec_write_phy_reg(uec->dev, uec_regs->utbipar,
ENET_TBI_MII_TBICON, TBICON_CLK_SELECT);
uec_write_phy_reg(uec->dev, uec_regs->utbipar,
ENET_TBI_MII_CR, TBICR_SETTINGS);
}
/* Allocate Tx BDs */ /* Allocate Tx BDs */
length = ((uec_info->tx_bd_ring_len * SIZEOFBD) / length = ((uec_info->tx_bd_ring_len * SIZEOFBD) /
UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) * UEC_TX_BD_RING_SIZE_MEMORY_ALIGNMENT) *
@ -1333,6 +1349,7 @@ int uec_initialize(bd_t *bis, uec_info_t *uec_info)
devlist[uec_info->uf_info.ucc_num] = dev; devlist[uec_info->uf_info.ucc_num] = dev;
uec->uec_info = uec_info; uec->uec_info = uec_info;
uec->dev = dev;
sprintf(dev->name, "FSL UEC%d", uec_info->uf_info.ucc_num); sprintf(dev->name, "FSL UEC%d", uec_info->uf_info.ucc_num);
dev->iobase = 0; dev->iobase = 0;

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006 Freescale Semiconductor, Inc. * Copyright (C) 2006-2009 Freescale Semiconductor, Inc.
* *
* Dave Liu <daveliu@freescale.com> * Dave Liu <daveliu@freescale.com>
* based on source code of Shlomi Gridish * based on source code of Shlomi Gridish
@ -47,6 +47,7 @@
#define UPSMR_CAM 0x00000400 /* CAM Address Matching */ #define UPSMR_CAM 0x00000400 /* CAM Address Matching */
#define UPSMR_BRO 0x00000200 /* Broadcast Address */ #define UPSMR_BRO 0x00000200 /* Broadcast Address */
#define UPSMR_RES1 0x00002000 /* Reserved feild - must be 1 */ #define UPSMR_RES1 0x00002000 /* Reserved feild - must be 1 */
#define UPSMR_SGMM 0x00000020 /* SGMII mode */
#define UPSMR_INIT_VALUE (UPSMR_HSE | UPSMR_RES1) #define UPSMR_INIT_VALUE (UPSMR_HSE | UPSMR_RES1)
@ -621,6 +622,31 @@ typedef enum enet_tbi_mii_reg {
ENET_TBI_MII_TBICON = 0x11 ENET_TBI_MII_TBICON = 0x11
} enet_tbi_mii_reg_e; } enet_tbi_mii_reg_e;
/* TBI MDIO register bit fields*/
#define TBICON_CLK_SELECT 0x0020
#define TBIANA_ASYMMETRIC_PAUSE 0x0100
#define TBIANA_SYMMETRIC_PAUSE 0x0080
#define TBIANA_HALF_DUPLEX 0x0040
#define TBIANA_FULL_DUPLEX 0x0020
#define TBICR_PHY_RESET 0x8000
#define TBICR_ANEG_ENABLE 0x1000
#define TBICR_RESTART_ANEG 0x0200
#define TBICR_FULL_DUPLEX 0x0100
#define TBICR_SPEED1_SET 0x0040
#define TBIANA_SETTINGS ( \
TBIANA_ASYMMETRIC_PAUSE \
| TBIANA_SYMMETRIC_PAUSE \
| TBIANA_FULL_DUPLEX \
)
#define TBICR_SETTINGS ( \
TBICR_PHY_RESET \
| TBICR_ANEG_ENABLE \
| TBICR_FULL_DUPLEX \
| TBICR_SPEED1_SET \
)
/* UEC number of threads /* UEC number of threads
*/ */
typedef enum uec_num_of_threads { typedef enum uec_num_of_threads {
@ -645,7 +671,8 @@ typedef enum enet_interface {
ENET_1000_RGMII_ID, ENET_1000_RGMII_ID,
ENET_1000_RGMII_RXID, ENET_1000_RGMII_RXID,
ENET_1000_TBI, ENET_1000_TBI,
ENET_1000_RTBI ENET_1000_RTBI,
ENET_1000_SGMII
} enet_interface_e; } enet_interface_e;
/* UEC initialization info struct /* UEC initialization info struct