projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace
[platform/kernel/u-boot.git]
/
drivers
/
net
/
ldpaa_eth
/
lx2160a.c
diff --git
a/drivers/net/ldpaa_eth/lx2160a.c
b/drivers/net/ldpaa_eth/lx2160a.c
index
7dd46c0
..
c2641a9
100644
(file)
--- a/
drivers/net/ldpaa_eth/lx2160a.c
+++ b/
drivers/net/ldpaa_eth/lx2160a.c
@@
-1,6
+1,6
@@
// SPDX-License-Identifier: GPL-2.0+
/*
// SPDX-License-Identifier: GPL-2.0+
/*
- * Copyright 2018 NXP
+ * Copyright 2018
, 2020
NXP
*/
#include <common.h>
#include <phy.h>
*/
#include <common.h>
#include <phy.h>
@@
-8,6
+8,7
@@
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
+#include <linux/mii.h>
u32 dpmac_to_devdisr[] = {
[WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,
u32 dpmac_to_devdisr[] = {
[WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,
@@
-32,7
+33,7
@@
u32 dpmac_to_devdisr[] = {
static int is_device_disabled(int dpmac_id)
{
static int is_device_disabled(int dpmac_id)
{
- struct ccsr_gur __iomem *gur = (void *)C
ONFI
G_SYS_FSL_GUTS_ADDR;
+ struct ccsr_gur __iomem *gur = (void *)C
F
G_SYS_FSL_GUTS_ADDR;
u32 devdisr2 = in_le32(&gur->devdisr2);
return dpmac_to_devdisr[dpmac_id] & devdisr2;
u32 devdisr2 = in_le32(&gur->devdisr2);
return dpmac_to_devdisr[dpmac_id] & devdisr2;
@@
-40,14
+41,14
@@
static int is_device_disabled(int dpmac_id)
void wriop_dpmac_disable(int dpmac_id)
{
void wriop_dpmac_disable(int dpmac_id)
{
- struct ccsr_gur __iomem *gur = (void *)C
ONFI
G_SYS_FSL_GUTS_ADDR;
+ struct ccsr_gur __iomem *gur = (void *)C
F
G_SYS_FSL_GUTS_ADDR;
setbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]);
}
void wriop_dpmac_enable(int dpmac_id)
{
setbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]);
}
void wriop_dpmac_enable(int dpmac_id)
{
- struct ccsr_gur __iomem *gur = (void *)C
ONFI
G_SYS_FSL_GUTS_ADDR;
+ struct ccsr_gur __iomem *gur = (void *)C
F
G_SYS_FSL_GUTS_ADDR;
clrbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]);
}
clrbits_le32(&gur->devdisr2, dpmac_to_devdisr[dpmac_id]);
}
@@
-56,8
+57,8
@@
phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
{
enum srds_prtcl;
{
enum srds_prtcl;
- if (is_device_disabled(dpmac_id
+ 1
))
- return PHY_INTERFACE_MODE_N
ONE
;
+ if (is_device_disabled(dpmac_id))
+ return PHY_INTERFACE_MODE_N
A
;
if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII18)
return PHY_INTERFACE_MODE_SGMII;
if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII18)
return PHY_INTERFACE_MODE_SGMII;
@@
-77,13
+78,13
@@
phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
if (lane_prtcl >= _100GE1 && lane_prtcl <= _100GE2)
return PHY_INTERFACE_MODE_CAUI4;
if (lane_prtcl >= _100GE1 && lane_prtcl <= _100GE2)
return PHY_INTERFACE_MODE_CAUI4;
- return PHY_INTERFACE_MODE_N
ONE
;
+ return PHY_INTERFACE_MODE_N
A
;
}
#ifdef CONFIG_SYS_FSL_HAS_RGMII
void fsl_rgmii_init(void)
{
}
#ifdef CONFIG_SYS_FSL_HAS_RGMII
void fsl_rgmii_init(void)
{
- struct ccsr_gur __iomem *gur = (void *)(C
ONFI
G_SYS_FSL_GUTS_ADDR);
+ struct ccsr_gur __iomem *gur = (void *)(C
F
G_SYS_FSL_GUTS_ADDR);
u32 ec;
#ifdef CONFIG_SYS_FSL_EC1
u32 ec;
#ifdef CONFIG_SYS_FSL_EC1