]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "net: cadence: macb: sama7g5_emac: Remove USARIO CLKEN flag"
authorRyan Wanner <Ryan.Wanner@microchip.com>
Tue, 19 Aug 2025 16:32:30 +0000 (09:32 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 21 Aug 2025 02:33:42 +0000 (19:33 -0700)
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")
Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
Link: https://patch.msgid.link/20250819163236.100680-1-Ryan.Wanner@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cadence/macb_main.c

index ce95fad8cedd7331d4818ba9f73fb6970249e85c..9693f0289435690bfed87186e1424272437b18fd 100644 (file)
@@ -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,