From 445cf02cada4b32f95c2bbce3fdaf184ef3ff3ce Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 16 Sep 2020 21:41:19 -0300 Subject: [PATCH] ARM: imx3: Retrieve the AVIC base address from devicetree Now that imx31 and imx35 has been converted to a devicetree-only platform, retrieve the AVIC base address from devicetree. Signed-off-by: Fabio Estevam Acked-by: Arnd Bergmann Signed-off-by: Shawn Guo --- arch/arm/mach-imx/mm-imx3.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index b7c5e15..5056438 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c @@ -112,7 +112,14 @@ void __init imx31_init_early(void) void __init mx31_init_irq(void) { - mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR)); + void __iomem *avic_base; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx31-avic"); + avic_base = of_iomap(np, 0); + BUG_ON(!avic_base); + + mxc_init_irq(avic_base); } #endif /* ifdef CONFIG_SOC_IMX31 */ @@ -154,6 +161,13 @@ void __init imx35_init_early(void) void __init mx35_init_irq(void) { - mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR)); + void __iomem *avic_base; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx35-avic"); + avic_base = of_iomap(np, 0); + BUG_ON(!avic_base); + + mxc_init_irq(avic_base); } #endif /* ifdef CONFIG_SOC_IMX35 */ -- 2.7.4