From 3c4a43fc6f2ea8bfb1334a2f4988bbacd9eda821 Mon Sep 17 00:00:00 2001 From: Chris Guikema Date: Thu, 7 Sep 2023 16:17:52 -0400 Subject: [PATCH] platsupport, zynqmp: select bus off configuration The kernel can support using a newer petalinux version, which updates the main bus to "axi" instead of "amba". The kernel presents a config variable, which we check against to define the proper TTC paths. Signed-off-by: Chris Guikema --- libplatsupport/mach_include/zynq/platsupport/mach/timer.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libplatsupport/mach_include/zynq/platsupport/mach/timer.h b/libplatsupport/mach_include/zynq/platsupport/mach/timer.h index 04ee02761..3812e8b39 100644 --- a/libplatsupport/mach_include/zynq/platsupport/mach/timer.h +++ b/libplatsupport/mach_include/zynq/platsupport/mach/timer.h @@ -23,10 +23,17 @@ #define IRQS_PER_TTC 3 #ifdef CONFIG_PLAT_ZYNQMP +#ifdef CONFIG_ZYNQMP_PETALINUX_AXI +#define TTC0_PATH "/axi/timer@ff110000" +#define TTC1_PATH "/axi/timer@ff120000" +#define TTC2_PATH "/axi/timer@ff130000" +#define TTC3_PATH "/axi/timer@ff140000" +#else #define TTC0_PATH "/amba/timer@ff110000" #define TTC1_PATH "/amba/timer@ff120000" #define TTC2_PATH "/amba/timer@ff130000" #define TTC3_PATH "/amba/timer@ff140000" +#endif /* CONFIG_ZYNQMP_PETALINUX_AXI */ #else /* zynq7000 */ #define TTC0_PATH "/amba/timer@f8001000"