You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'ftgmac100-rework-batch4-misc'
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>
This commit is contained in:
@@ -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";
|
||||
};
|
||||
|
||||
|
||||
@@ -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";
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user