Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
cadence
/
macb.c
diff --git
a/kernel/drivers/net/ethernet/cadence/macb.c
b/kernel/drivers/net/ethernet/cadence/macb.c
index
169059c
..
8d54e7b
100644
(file)
--- a/
kernel/drivers/net/ethernet/cadence/macb.c
+++ b/
kernel/drivers/net/ethernet/cadence/macb.c
@@
-2405,9
+2405,9
@@
static int macb_init(struct platform_device *pdev)
if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)
val = GEM_BIT(RGMII);
else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&
if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)
val = GEM_BIT(RGMII);
else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&
- (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
+ (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII
_GMII
))
val = MACB_BIT(RMII);
val = MACB_BIT(RMII);
- else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
+ else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII
_GMII
))
val = MACB_BIT(MII);
if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
val = MACB_BIT(MII);
if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
@@
-2738,7
+2738,7
@@
static int at91ether_init(struct platform_device *pdev)
}
static const struct macb_config at91sam9260_config = {
}
static const struct macb_config at91sam9260_config = {
- .caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII,
+ .caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII
_GMII
,
.clk_init = macb_clk_init,
.init = macb_init,
};
.clk_init = macb_clk_init,
.init = macb_init,
};
@@
-2751,21
+2751,22
@@
static const struct macb_config pc302gem_config = {
};
static const struct macb_config sama5d2_config = {
};
static const struct macb_config sama5d2_config = {
- .caps =
0
,
+ .caps =
MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII
,
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
};
static const struct macb_config sama5d3_config = {
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
};
static const struct macb_config sama5d3_config = {
- .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
+ .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE
+ | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
};
static const struct macb_config sama5d4_config = {
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
};
static const struct macb_config sama5d4_config = {
- .caps =
0
,
+ .caps =
MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII
,
.dma_burst_length = 4,
.clk_init = macb_clk_init,
.init = macb_init,
.dma_burst_length = 4,
.clk_init = macb_clk_init,
.init = macb_init,