aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/net/stmmac.txt1
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index c41afd963edf..8ca65cec52ae 100644
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -43,6 +43,7 @@ Optional properties:
43 available this clock is used for programming the Timestamp Addend Register. 43 available this clock is used for programming the Timestamp Addend Register.
44 If not passed then the system clock will be used and this is fine on some 44 If not passed then the system clock will be used and this is fine on some
45 platforms. 45 platforms.
46- snps,burst_len: The AXI burst lenth value of the AXI BUS MODE register.
46 47
47Examples: 48Examples:
48 49
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 879e29f48a89..fb846ebba1d9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -235,6 +235,9 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
235 of_property_read_bool(np, "snps,fixed-burst"); 235 of_property_read_bool(np, "snps,fixed-burst");
236 dma_cfg->mixed_burst = 236 dma_cfg->mixed_burst =
237 of_property_read_bool(np, "snps,mixed-burst"); 237 of_property_read_bool(np, "snps,mixed-burst");
238 of_property_read_u32(np, "snps,burst_len", &dma_cfg->burst_len);
239 if (dma_cfg->burst_len < 0 || dma_cfg->burst_len > 256)
240 dma_cfg->burst_len = 0;
238 } 241 }
239 plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode"); 242 plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
240 if (plat->force_thresh_dma_mode) { 243 if (plat->force_thresh_dma_mode) {