From: Christian DREHER <christian.dreher@nanoxplore.com>
Date: Tue, 28 Apr 2026 18:04:05 +0000 (+0200)
Subject: net: macb: include arch/clk.h only when necessary
X-Git-Tag: v2026.07-rc2~15^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e23095298d12e086dd3d5d35972eb3e588d190d;p=thirdparty%2Fu-boot.git

net: macb: include arch/clk.h only when necessary

It does not exist in my setup (an on-going arm64 SoC), and removing
it does not cause any missing declaration, but some code called when
CONFIG_CLK is missing calls get_macb_pclk_rate, which is only defined
in arch/arm/mach-at91/include/mach/clk.h

Signed-off-by: Christian DREHER <christian.dreher@nanoxplore.com>
---

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index cbf5f605518..719aef39a3f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -38,9 +38,13 @@
 #include <linux/mii.h>
 #include <asm/io.h>
 #include <linux/dma-mapping.h>
-#include <asm/arch/clk.h>
 #include <linux/errno.h>
 
+/* Without CLK, we rely on the arch definition */
+#if !defined(CONFIG_CLK)
+#include <asm/arch/clk.h>
+#endif
+
 #include "macb.h"
 
 DECLARE_GLOBAL_DATA_PTR;