Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59494dd6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cpsw-delete-rx_descs' 



Ivan Khoronzhuk says:

====================
net: ethernet: ti: cpsw: delete rx_descs property

There is no reason in rx_descs property because davinici_cpdma
driver splits pool of descriptors equally between tx and rx channels.
So, this patch series makes driver to use available number of
descriptors for rx channels.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0350cb48 6774b68b

Documentation/devicetree/bindings/net/cpsw.txt

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ Required properties: 
- cpdma_channels 	: Specifies number of channels in CPDMA

- ale_entries		: Specifies No of entries ALE can hold

- bd_ram_size		: Specifies internal descriptor RAM size

- rx_descs		: Specifies number of Rx descriptors

- mac_control		: Specifies Default MAC control register content

			  for the specific platform

- slaves		: Specifies number for slaves

arch/arm/boot/dts/am33xx.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -766,7 +766,6 @@ 
			ale_entries = <1024>;

			bd_ram_size = <0x2000>;

			no_bd_ram = <0>;

			rx_descs = <64>;

			mac_control = <0x20>;

			slaves = <2>;

			active_slave = <0>;

arch/arm/boot/dts/am4372.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -626,7 +626,6 @@ 
			ale_entries = <1024>;

			bd_ram_size = <0x2000>;

			no_bd_ram = <0>;

			rx_descs = <64>;

			mac_control = <0x20>;

			slaves = <2>;

			active_slave = <0>;

arch/arm/boot/dts/dm814x.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ 
			ale_entries = <1024>;

			bd_ram_size = <0x2000>;

			no_bd_ram = <0>;

			rx_descs = <64>;

			mac_control = <0x20>;

			slaves = <2>;

			active_slave = <0>;

arch/arm/boot/dts/dra7.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,6 @@ 
			ale_entries = <1024>;

			bd_ram_size = <0x2000>;

			no_bd_ram = <0>;

			rx_descs = <64>;

			mac_control = <0x20>;

			slaves = <2>;

			active_slave = <0>;