Skip to content

Commit

Permalink
Merge branch 'ftgmac100-rework-batch4-misc'
Browse files Browse the repository at this point in the history
Benjamin Herrenschmidt says:

====================
ftgmac100: Rework batch 4 - Misc

This is v2 of the fourth batch of updates to the ftgmac100 driver.

This is a bunch of misc cleanups and fixes, such as properly
disabling HW checksum generation on AST2400 where it's known
to be broken and some chip init updates.

This also adds the ability to turn HW checksum on/off and
configure the ring sizes via ethtool.

v2 Fixes patch 1/10 (NETIF_F_HW_CSUM conversion)

The next (and last) batch will add a few more "features" such
as netpoll, multicast/promist, vlan offload...
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Apr 12, 2017
2 parents f221dcd + bd3e4fd commit 2a446c5
Show file tree
Hide file tree
Showing 3 changed files with 247 additions and 123 deletions.
6 changes: 2 additions & 4 deletions arch/arm/boot/dts/aspeed-g4.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,16 @@
};

mac0: ethernet@1e660000 {
compatible = "faraday,ftgmac100";
compatible = "aspeed,ast2400-mac", "faraday,ftgmac100";
reg = <0x1e660000 0x180>;
interrupts = <2>;
no-hw-checksum;
status = "disabled";
};

mac1: ethernet@1e680000 {
compatible = "faraday,ftgmac100";
compatible = "aspeed,ast2400-mac", "faraday,ftgmac100";
reg = <0x1e680000 0x180>;
interrupts = <3>;
no-hw-checksum;
status = "disabled";
};

Expand Down
6 changes: 2 additions & 4 deletions arch/arm/boot/dts/aspeed-g5.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,16 @@
};

mac0: ethernet@1e660000 {
compatible = "faraday,ftgmac100";
compatible = "aspeed,ast2500-mac", "faraday,ftgmac100";
reg = <0x1e660000 0x180>;
interrupts = <2>;
no-hw-checksum;
status = "disabled";
};

mac1: ethernet@1e680000 {
compatible = "faraday,ftgmac100";
compatible = "aspeed,ast2500-mac", "faraday,ftgmac100";
reg = <0x1e680000 0x180>;
interrupts = <3>;
no-hw-checksum;
status = "disabled";
};

Expand Down
Loading

0 comments on commit 2a446c5

Please sign in to comment.