mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
powerpc/mpc85xx: Few updates for B4860 cpu changes
- Added some more serdes1 and serdes2 combinations serdes1= 0x2c, 0x2d, 0x2e serdes2= 0x7a, 0x8d, 0x98 - Updated Number of DDR controllers to 2. - Added FMAN file for B4860, drivers/net/fm/b4860.c Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Shaveta Leekha <shaveta@freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com> Signed-off-by: Sandeep Singh <Sandeep@freescale.com> Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
parent
86a194b733
commit
e394ceb17f
3 changed files with 95 additions and 1 deletions
|
@ -41,6 +41,12 @@ static struct serdes_config serdes1_cfg_tbl[] = {
|
||||||
CPRI4, CPRI3, CPRI2, CPRI1}},
|
CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
{0x2a, {SGMII_FM1_DTSEC5, SGMII_FM1_DTSEC6,
|
{0x2a, {SGMII_FM1_DTSEC5, SGMII_FM1_DTSEC6,
|
||||||
CPRI6, CPRI5, CPRI4, CPRI3, CPRI2, CPRI1}},
|
CPRI6, CPRI5, CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
|
{0x2C, {SGMII_FM1_DTSEC5, SGMII_FM1_DTSEC6,
|
||||||
|
CPRI6, CPRI5, CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
|
{0x2D, {SGMII_FM1_DTSEC5, SGMII_FM1_DTSEC6,
|
||||||
|
CPRI6, CPRI5, CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
|
{0x2E, {SGMII_FM1_DTSEC5, SGMII_FM1_DTSEC6,
|
||||||
|
CPRI6, CPRI5, CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
{0x30, {AURORA, AURORA,
|
{0x30, {AURORA, AURORA,
|
||||||
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
||||||
CPRI4, CPRI3, CPRI2, CPRI1}},
|
CPRI4, CPRI3, CPRI2, CPRI1}},
|
||||||
|
@ -84,6 +90,8 @@ static struct serdes_config serdes2_cfg_tbl[] = {
|
||||||
{0x4E, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
{0x4E, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
||||||
SGMII_FM1_DTSEC3, AURORA,
|
SGMII_FM1_DTSEC3, AURORA,
|
||||||
SRIO1, SRIO1, SRIO1, SRIO1}},
|
SRIO1, SRIO1, SRIO1, SRIO1}},
|
||||||
|
{0x7A, {SRIO2, SRIO2, SRIO2, SRIO2,
|
||||||
|
SRIO1, SRIO1, SRIO1, SRIO1}},
|
||||||
{0x84, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
{0x84, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
||||||
SRIO2, SRIO2, AURORA, AURORA,
|
SRIO2, SRIO2, AURORA, AURORA,
|
||||||
XFI_FM1_MAC9, XFI_FM1_MAC10}},
|
XFI_FM1_MAC9, XFI_FM1_MAC10}},
|
||||||
|
@ -94,6 +102,9 @@ static struct serdes_config serdes2_cfg_tbl[] = {
|
||||||
SRIO2, SRIO2,
|
SRIO2, SRIO2,
|
||||||
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
||||||
XFI_FM1_MAC9, XFI_FM1_MAC10}},
|
XFI_FM1_MAC9, XFI_FM1_MAC10}},
|
||||||
|
{0x8D, {SRIO2, SRIO2, SRIO2, SRIO2,
|
||||||
|
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
||||||
|
XFI_FM1_MAC9, XFI_FM1_MAC10}},
|
||||||
{0x93, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
{0x93, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2,
|
||||||
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
SGMII_FM1_DTSEC3, SGMII_FM1_DTSEC4,
|
||||||
XAUI_FM1_MAC10, XAUI_FM1_MAC10,
|
XAUI_FM1_MAC10, XAUI_FM1_MAC10,
|
||||||
|
@ -111,6 +122,10 @@ static struct serdes_config serdes2_cfg_tbl[] = {
|
||||||
{0xC3, {XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
{0xC3, {XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
||||||
XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
||||||
SRIO1, SRIO1, SRIO1, SRIO1}},
|
SRIO1, SRIO1, SRIO1, SRIO1}},
|
||||||
|
{0x98, {XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
||||||
|
XAUI_FM1_MAC9, XAUI_FM1_MAC9,
|
||||||
|
XAUI_FM1_MAC10, XAUI_FM1_MAC10,
|
||||||
|
XAUI_FM1_MAC10, XAUI_FM1_MAC10}},
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
static struct serdes_config *serdes_cfg_tbl[] = {
|
static struct serdes_config *serdes_cfg_tbl[] = {
|
||||||
|
|
|
@ -537,7 +537,7 @@
|
||||||
#define CONFIG_SYS_NUM_FMAN 1
|
#define CONFIG_SYS_NUM_FMAN 1
|
||||||
#define CONFIG_SYS_NUM_FM1_DTSEC 6
|
#define CONFIG_SYS_NUM_FM1_DTSEC 6
|
||||||
#define CONFIG_SYS_NUM_FM1_10GEC 2
|
#define CONFIG_SYS_NUM_FM1_10GEC 2
|
||||||
#define CONFIG_NUM_DDR_CONTROLLERS 1
|
#define CONFIG_NUM_DDR_CONTROLLERS 2
|
||||||
#define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_7
|
#define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_7
|
||||||
#define CONFIG_SYS_FMAN_V3
|
#define CONFIG_SYS_FMAN_V3
|
||||||
#define CONFIG_SYS_FM_MURAM_SIZE 0x60000
|
#define CONFIG_SYS_FM_MURAM_SIZE 0x60000
|
||||||
|
|
79
drivers/net/fm/b4860.c
Normal file
79
drivers/net/fm/b4860.c
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Freescale Semiconductor, Inc.
|
||||||
|
* Roy Zang <tie-fei.zang@freescale.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||||
|
* MA 02111-1307 USA
|
||||||
|
*/
|
||||||
|
#include <common.h>
|
||||||
|
#include <phy.h>
|
||||||
|
#include <fm_eth.h>
|
||||||
|
#include <asm/io.h>
|
||||||
|
#include <asm/immap_85xx.h>
|
||||||
|
#include <asm/fsl_serdes.h>
|
||||||
|
|
||||||
|
u32 port_to_devdisr[] = {
|
||||||
|
[FM1_DTSEC1] = FSL_CORENET_DEVDISR2_DTSEC1_1,
|
||||||
|
[FM1_DTSEC2] = FSL_CORENET_DEVDISR2_DTSEC1_2,
|
||||||
|
[FM1_DTSEC3] = FSL_CORENET_DEVDISR2_DTSEC1_3,
|
||||||
|
[FM1_DTSEC4] = FSL_CORENET_DEVDISR2_DTSEC1_4,
|
||||||
|
[FM1_DTSEC5] = FSL_CORENET_DEVDISR2_DTSEC1_5,
|
||||||
|
[FM1_DTSEC6] = FSL_CORENET_DEVDISR2_DTSEC1_6,
|
||||||
|
[FM1_10GEC1] = FSL_CORENET_DEVDISR2_10GEC1_1,
|
||||||
|
[FM1_10GEC2] = FSL_CORENET_DEVDISR2_10GEC1_2,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int is_device_disabled(enum fm_port port)
|
||||||
|
{
|
||||||
|
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
|
||||||
|
u32 devdisr2 = in_be32(&gur->devdisr2);
|
||||||
|
|
||||||
|
return port_to_devdisr[port] & devdisr2;
|
||||||
|
}
|
||||||
|
|
||||||
|
void fman_disable_port(enum fm_port port)
|
||||||
|
{
|
||||||
|
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
|
||||||
|
|
||||||
|
setbits_be32(&gur->devdisr2, port_to_devdisr[port]);
|
||||||
|
}
|
||||||
|
|
||||||
|
phy_interface_t fman_port_enet_if(enum fm_port port)
|
||||||
|
{
|
||||||
|
if (is_device_disabled(port))
|
||||||
|
return PHY_INTERFACE_MODE_NONE;
|
||||||
|
|
||||||
|
if ((port == FM1_10GEC1 || port == FM1_10GEC2)
|
||||||
|
&& (is_serdes_configured(XAUI_FM1)))
|
||||||
|
return PHY_INTERFACE_MODE_XGMII;
|
||||||
|
|
||||||
|
/* Fix me need to handle RGMII here first */
|
||||||
|
|
||||||
|
switch (port) {
|
||||||
|
case FM1_DTSEC1:
|
||||||
|
case FM1_DTSEC2:
|
||||||
|
case FM1_DTSEC3:
|
||||||
|
case FM1_DTSEC4:
|
||||||
|
case FM1_DTSEC5:
|
||||||
|
case FM1_DTSEC6:
|
||||||
|
if (is_serdes_configured(SGMII_FM1_DTSEC1 + port - FM1_DTSEC1))
|
||||||
|
return PHY_INTERFACE_MODE_SGMII;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return PHY_INTERFACE_MODE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return PHY_INTERFACE_MODE_NONE;
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue