From 5ac617c817d7f682a7b7ee2f44b56e61e07f5f4d Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Tue, 11 Feb 2020 16:34:47 +0900 Subject: [PATCH] soc: arm: xilinx_zynqmp: Use the refactored AArch32 interrupt system This commit updates the `xilinx_zynqmp` platform to use the refactored AArch32 interrupt system. Signed-off-by: Stephanos Ioannidis --- soc/arm/xilinx_zynqmp/Kconfig.defconfig | 9 --------- soc/arm/xilinx_zynqmp/Kconfig.soc | 2 -- soc/arm/xilinx_zynqmp/dts_fixup.h | 10 +--------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/soc/arm/xilinx_zynqmp/Kconfig.defconfig b/soc/arm/xilinx_zynqmp/Kconfig.defconfig index 75c0ff5c879..25b189edc3d 100644 --- a/soc/arm/xilinx_zynqmp/Kconfig.defconfig +++ b/soc/arm/xilinx_zynqmp/Kconfig.defconfig @@ -14,15 +14,6 @@ config NUM_IRQS # - include the UART interrupts default 220 -config 2ND_LVL_ISR_TBL_OFFSET - default 1 - -config MAX_IRQ_PER_AGGREGATOR - default 219 - -config NUM_2ND_LEVEL_AGGREGATORS - default 1 - config SYS_CLOCK_HW_CYCLES_PER_SEC default 12000000 diff --git a/soc/arm/xilinx_zynqmp/Kconfig.soc b/soc/arm/xilinx_zynqmp/Kconfig.soc index e3a0597facf..58c4eee9f15 100644 --- a/soc/arm/xilinx_zynqmp/Kconfig.soc +++ b/soc/arm/xilinx_zynqmp/Kconfig.soc @@ -8,6 +8,4 @@ config SOC_XILINX_ZYNQMP_RPU select CPU_CORTEX_R5 select SOC_XILINX_ZYNQMP select GIC_V1 - select MULTI_LEVEL_INTERRUPTS - select 2ND_LEVEL_INTERRUPTS select PLATFORM_SPECIFIC_INIT diff --git a/soc/arm/xilinx_zynqmp/dts_fixup.h b/soc/arm/xilinx_zynqmp/dts_fixup.h index 70b231a114d..e8def7f63d6 100644 --- a/soc/arm/xilinx_zynqmp/dts_fixup.h +++ b/soc/arm/xilinx_zynqmp/dts_fixup.h @@ -5,12 +5,4 @@ * */ -#undef DT_INST_0_XLNX_XUARTPS_IRQ_0 -#define DT_INST_0_XLNX_XUARTPS_IRQ_0 ((DT_INST_0_XLNX_XUARTPS_IRQ_IRQ_0 + 1) << 8) - -#undef DT_INST_0_CDNS_TTC_IRQ_0 -#define DT_INST_0_CDNS_TTC_IRQ_0 ((DT_INST_0_CDNS_TTC_IRQ_IRQ_0 + 1) << 8) -#undef DT_INST_0_CDNS_TTC_IRQ_1 -#define DT_INST_0_CDNS_TTC_IRQ_1 ((DT_INST_0_CDNS_TTC_IRQ_IRQ_1 + 1) << 8) -#undef DT_INST_0_CDNS_TTC_IRQ_2 -#define DT_INST_0_CDNS_TTC_IRQ_2 ((DT_INST_0_CDNS_TTC_IRQ_IRQ_2 + 1) << 8) +/* Nothing for now */