mirror of
https://github.com/torvalds/linux.git
synced 2026-07-31 11:37:06 +02:00
Merge branch 'net-stmmac-remove-unused-and-unimplemented-axi-properties'
Russell King says:
====================
net: stmmac: remove unused and unimplemented AXI properties
commit afea03656a ("stmmac: rework DMA bus setting and introduce new
platform AXI structure") added support for parsing all the stmmac AXI
attributes, and added code to set most of the appropriate register bits
with three exceptions:
snps,kbbe
snps,mb
snps,rb
These were parsed by the driver, but the result of parsing was never
used by any of the cores.
Moreover, no DTS in the kernel makes use of these properties.
Thus, it doesn't make sense for the driver to parse these, so let's
remove them. Also remove them from the DT binding document.
====================
Link: https://patch.msgid.link/acJh4z3pRKkeaFbR@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
5fffa6fe40
|
|
@ -204,11 +204,8 @@ properties:
|
|||
* snps,xit_frm, unlock on WoL
|
||||
* snps,wr_osr_lmt, max write outstanding req. limit
|
||||
* snps,rd_osr_lmt, max read outstanding req. limit
|
||||
* snps,kbbe, do not cross 1KiB boundary.
|
||||
* snps,blen, this is a vector of supported burst length.
|
||||
* snps,fb, fixed-burst
|
||||
* snps,mb, mixed-burst
|
||||
* snps,rb, rebuild INCRx Burst
|
||||
|
||||
snps,mtl-rx-config:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
|
|
@ -588,11 +585,6 @@ properties:
|
|||
description:
|
||||
max read outstanding req. limit
|
||||
|
||||
snps,kbbe:
|
||||
$ref: /schemas/types.yaml#/definitions/flag
|
||||
description:
|
||||
do not cross 1KiB boundary.
|
||||
|
||||
snps,blen:
|
||||
$ref: /schemas/types.yaml#/definitions/uint32-array
|
||||
description:
|
||||
|
|
@ -605,16 +597,6 @@ properties:
|
|||
description:
|
||||
fixed-burst
|
||||
|
||||
snps,mb:
|
||||
$ref: /schemas/types.yaml#/definitions/flag
|
||||
description:
|
||||
mixed-burst
|
||||
|
||||
snps,rb:
|
||||
$ref: /schemas/types.yaml#/definitions/flag
|
||||
description:
|
||||
rebuild INCRx Burst
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
|
|
|||
|
|
@ -231,7 +231,6 @@ motorcomm_default_plat_data(struct pci_dev *pdev)
|
|||
|
||||
plat->axi->axi_wr_osr_lmt = 1;
|
||||
plat->axi->axi_rd_osr_lmt = 1;
|
||||
plat->axi->axi_mb = true;
|
||||
plat->axi->axi_blen_regval = DMA_AXI_BLEN4 | DMA_AXI_BLEN8 |
|
||||
DMA_AXI_BLEN16 | DMA_AXI_BLEN32;
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,7 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev)
|
|||
|
||||
axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");
|
||||
axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
|
||||
axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe");
|
||||
axi->axi_fb = of_property_read_bool(np, "snps,fb");
|
||||
axi->axi_mb = of_property_read_bool(np, "snps,mb");
|
||||
axi->axi_rb = of_property_read_bool(np, "snps,rb");
|
||||
|
||||
if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt))
|
||||
axi->axi_wr_osr_lmt = 1;
|
||||
|
|
|
|||
|
|
@ -133,10 +133,7 @@ struct stmmac_axi {
|
|||
u32 axi_blen_regval;
|
||||
bool axi_lpi_en;
|
||||
bool axi_xit_frm;
|
||||
bool axi_kbbe;
|
||||
bool axi_fb;
|
||||
bool axi_mb;
|
||||
bool axi_rb;
|
||||
};
|
||||
|
||||
struct stmmac_rxq_cfg {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user