Merge tag 'dm-pull-8jan20' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / arch / arm / mach-socfpga / misc.c

diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 1ef02a13bfb74ae0cd71f8e682e6716a74ee8d58..db71105af34fd6bab4bc6ec00f6343b183277a18 100644 (file)
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -23,6 +23,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+phys_addr_t socfpga_clkmgr_base __section(".data");
 phys_addr_t socfpga_rstmgr_base __section(".data");
 phys_addr_t socfpga_sysmgr_base __section(".data");
 
@@ -243,6 +244,15 @@ void socfpga_get_managers_addr(void)
        ret = socfpga_get_base_addr("altr,sys-mgr", &socfpga_sysmgr_base);
        if (ret)
                hang();
+
+#ifdef CONFIG_TARGET_SOCFPGA_AGILEX
+       ret = socfpga_get_base_addr("intel,agilex-clkmgr",
+                                   &socfpga_clkmgr_base);
+#else
+       ret = socfpga_get_base_addr("altr,clk-mgr", &socfpga_clkmgr_base);
+#endif
+       if (ret)
+               hang();
 }
 
 phys_addr_t socfpga_get_rstmgr_addr(void)
@@ -254,3 +264,8 @@ phys_addr_t socfpga_get_sysmgr_addr(void)
 {
        return socfpga_sysmgr_base;
 }
+
+phys_addr_t socfpga_get_clkmgr_addr(void)
+{
+       return socfpga_clkmgr_base;
+}