From e60678dcb6513a6d0c965b2185f7ceb357e46a4b Mon Sep 17 00:00:00 2001 From: Immo Birnbaum Date: Tue, 10 Sep 2024 23:12:32 +0200 Subject: [PATCH] soc: xlnx: zynq7000: remove PS GPIO controller's static memory mapping Remove the PS GPIO controller's static MMU region entry from the mmu_regions table for both the XC7Zxxx and XC7ZxxxS variants of the Zynq 7000. The PS GPIO controller's device driver has been switched over to using a named DEVICE_MMIO mapping. Signed-off-by: Immo Birnbaum --- soc/xlnx/zynq7000/xc7zxxx/soc.c | 8 -------- soc/xlnx/zynq7000/xc7zxxxs/soc.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/soc/xlnx/zynq7000/xc7zxxx/soc.c b/soc/xlnx/zynq7000/xc7zxxx/soc.c index 37d30b02426a3f..379f60ed2eb391 100644 --- a/soc/xlnx/zynq7000/xc7zxxx/soc.c +++ b/soc/xlnx/zynq7000/xc7zxxx/soc.c @@ -52,14 +52,6 @@ static const struct arm_mmu_region mmu_regions[] = { MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W), #endif -/* GPIO controller */ -#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay) - MMU_REGION_FLAT_ENTRY("psgpio", - DT_REG_ADDR(DT_NODELABEL(psgpio)), - DT_REG_SIZE(DT_NODELABEL(psgpio)), - MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W), -#endif - DT_FOREACH_STATUS_OKAY(xlnx_xps_gpio_1_00_a, AXI_GPIO_MMU_ENTRY) }; diff --git a/soc/xlnx/zynq7000/xc7zxxxs/soc.c b/soc/xlnx/zynq7000/xc7zxxxs/soc.c index a46d9a217843b8..f9bc444c19a798 100644 --- a/soc/xlnx/zynq7000/xc7zxxxs/soc.c +++ b/soc/xlnx/zynq7000/xc7zxxxs/soc.c @@ -52,14 +52,6 @@ static const struct arm_mmu_region mmu_regions[] = { MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W), #endif -/* GPIO controller */ -#if DT_NODE_HAS_STATUS(DT_NODELABEL(psgpio), okay) - MMU_REGION_FLAT_ENTRY("psgpio", - DT_REG_ADDR(DT_NODELABEL(psgpio)), - DT_REG_SIZE(DT_NODELABEL(psgpio)), - MT_DEVICE | MATTR_SHARED | MPERM_R | MPERM_W), -#endif - DT_FOREACH_STATUS_OKAY(xlnx_xps_gpio_1_00_a, AXI_GPIO_MMU_ENTRY) };