Cleanup downstream genet patches#7297
Merged
pelwell merged 5 commits intoraspberrypi:rpi-6.18.yfrom Apr 9, 2026
Merged
Conversation
…PHYs" This reverts commit bd61974.
Add brcm,powerdown-enable to the external PHY nodes on Pi 4B and CM4. This puts the BCM54210PE PHY into a low-power state when the link is down, reducing power consumption when no cable is connected. This is the same approach already used by Pi 5 and CM5. Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>
This reverts commit 712989f.
This reverts commit 09d1901.
This reverts commit dfad8d6.
nbuchwitz
force-pushed
the
devel/genet-cleanup
branch
from
47ae68b to
74e7edf
Compare
Collaborator
|
@pelwell I'm in favour of removing unneeded downstream code. Are you happy this is okay? |
Contributor
|
These look fine to me. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Spring cleaning part 2 - genet driver:
Reverted:
("net: bcmgenet: Add 'eee' module parameter")- thegenet.eee=Nbootarg is superseded byeee-broken-*DT properties (54a9cd7) and upstream phylib-managed EEE (908c344, net-next, backported in EEE patches #7270).("bcmgenet: Disable skip_umac_reset by default")and dfad8d6("net: bcmgenet: Workaround #2 for Pi4 Ethernet fail")- the skip_umac_reset workaround and its default toggle are both superseded by upstream 88f6c8b ("net: bcmgenet: keep MAC in reset until PHY is up", v6.0).("net: genet: enable link energy detect powerdown for external PHYs")- replaced by addingbrcm,powerdown-enableto the Pi 4B and CM4 PHY nodes in device tree, matching what Pi 5 and CM5 already do.