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
1e62c64
..
c2641a9
100644
(file)
--- a/
drivers/net/ldpaa_eth/lx2160a.c
+++ b/
drivers/net/ldpaa_eth/lx2160a.c
@@
-33,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;
@@
-41,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]);
}
@@
-58,7
+58,7
@@
phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
enum srds_prtcl;
if (is_device_disabled(dpmac_id))
enum srds_prtcl;
if (is_device_disabled(dpmac_id))
- return PHY_INTERFACE_MODE_N
ONE
;
+ 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;
@@
-78,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
@@
-92,7
+92,7
@@
void fsl_rgmii_init(void)
& FSL_CHASSIS3_EC1_REGSR_PRTCL_MASK;
ec >>= FSL_CHASSIS3_EC1_REGSR_PRTCL_SHIFT;
& FSL_CHASSIS3_EC1_REGSR_PRTCL_MASK;
ec >>= FSL_CHASSIS3_EC1_REGSR_PRTCL_SHIFT;
- if (!ec
&& (wriop_is_enabled_dpmac(17) == -ENODEV)
)
+ if (!ec)
wriop_init_dpmac_enet_if(17, PHY_INTERFACE_MODE_RGMII_ID);
#endif
wriop_init_dpmac_enet_if(17, PHY_INTERFACE_MODE_RGMII_ID);
#endif
@@
-101,7
+101,7
@@
void fsl_rgmii_init(void)
& FSL_CHASSIS3_EC2_REGSR_PRTCL_MASK;
ec >>= FSL_CHASSIS3_EC2_REGSR_PRTCL_SHIFT;
& FSL_CHASSIS3_EC2_REGSR_PRTCL_MASK;
ec >>= FSL_CHASSIS3_EC2_REGSR_PRTCL_SHIFT;
- if (!ec
&& (wriop_is_enabled_dpmac(18) == -ENODEV)
)
+ if (!ec)
wriop_init_dpmac_enet_if(18, PHY_INTERFACE_MODE_RGMII_ID);
#endif
}
wriop_init_dpmac_enet_if(18, PHY_INTERFACE_MODE_RGMII_ID);
#endif
}