Skip to contentSkip to conversation

Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag"

PATCH Applied [email protected] 2 participants 2 messages Aug 19, 2025 – Aug 21, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag"

From: Ryan Wanner <[email protected]>

This reverts commit db400061b5e7cc55f9b4dd15443e9838964119ea.

This commit can cause a Devicetree ABI break for older DTS files that rely this flag for RMII configuration. Adding this back in ensures that the older DTBs will not break.

Fixes db400061b5e7 ("net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag")
---
 drivers/net/ethernet/cadence/macb_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +2 -1
index ce95fad8cedd..9693f0289435 100644
@@ -5113,7 +5113,8 @@ static const struct macb_config sama7g5_gem_config = {
 
 static const struct macb_config sama7g5_emac_config = {
 	.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII |
-		MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP,
+		MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII |
+		MACB_CAPS_GEM_HAS_PTP,
 	.dma_burst_length = 16,
 	.clk_init = macb_clk_init,
 	.init = macb_init,
Signature · 1 line
2.43.0
#1 lore raw
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Tue, 19 Aug 2025 09:32:30 -0700 you wrote:

From: Ryan Wanner <[email protected]>

This reverts commit db400061b5e7cc55f9b4dd15443e9838964119ea.

This commit can cause a Devicetree ABI break for older DTS files that rely this flag for RMII configuration. Adding this back in ensures that the older DTBs will not break.

[...]

Here is the summary with links:
- Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag"

    https://git.kernel.org/netdev/net/c/c42be534547d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html