From nobody Mon Dec 15 21:47:49 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49CE0233D88; Wed, 7 May 2025 07:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604698; cv=none; b=MklAYmhmpoWlbxVUyRyJgn0zQiM+xb4H60sivrOlIFUge/0BFxSHLFweMXxoPtPFr86T5Eey85PL1DHJoFTNkR1Lppc14Lp5xYYOX+80GDAmxhl/leOgfTD96a5l8wJo0tSdNItfZEpnWGX6rrJrdjB9ZyN4wMf+UbRoEt1Nnxw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746604698; c=relaxed/simple; bh=+9En8sGZLFpIwdbGVW3unaML1KDsyf708O2Jm1/L+oc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RJkQ17NTLS0KfaZ8cnseBIyULOlM6P9L9VZ6PxoU6BlMxD1j9odO0u8rD72d09cmr4F2sPgQiGHWftM9AN+Jp54Hg4Ne/9ANv5vhsEgyN/yaL4NRpfEvlAY3rUyrYqj+Vq23cfi27w73JRmQHy1T0ultjgRxJFLIRwETq4ch3Yk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OygTbYWB; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=cgXo8+DO; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OygTbYWB"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cgXo8+DO" Date: Wed, 07 May 2025 07:58:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1746604694; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5j9uqjHih0ScVJc/1uYv7gSvx61yyyD5YI+oshp/JZk=; b=OygTbYWBODh03ZwG1HUtvug2menIbOaLgCvflUl5ybVHpRZkwR2y+Jqd5NP0cngM0Ga4fy Khiiqt1xgZGdRHDQ0KWmxDviV1qy0AHf8KLUdE5HPpC2f/3TYOEdKUNQ04HnrBBKL8KQ+j 1p/m+eHZGq6WbKxoiOdqU4fA3PZ56mPvQQWk54iHMpTHbsgq9T8rLIX+Sq4ZwuwKJJl5sU Gq+Z8Mgx235Fb7nVGhabQY8nsQzE94iOnoGrzKX3R8EwmrqME88W4zz7YaJHwiCy5kFrN+ qg2o1BSL76ULsy6ECFpyeLPfrZA8rNeyw1gHXdhNDVfzrNHjcMryfAcYN9jZwA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1746604694; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5j9uqjHih0ScVJc/1uYv7gSvx61yyyD5YI+oshp/JZk=; b=cgXo8+DOrblXLg2/u9C8vL94CxXHgKVYEzoR115cRR47dX5gmJ7w5h0kynNuOnn9Xw5nVK rAavzw/IKo2xWpCg== From: "tip-bot2 for Jiri Slaby (SUSE)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/cleanups] ARM: Switch to irq_domain_create_*() Cc: "Jiri Slaby (SUSE)" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250319092951.37667-15-jirislaby@kernel.org> References: <20250319092951.37667-15-jirislaby@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174660469358.406.2335165421414855959.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/cleanups branch of tip: Commit-ID: e848923ad13b238990a7b253d28934db3d6f1ab0 Gitweb: https://git.kernel.org/tip/e848923ad13b238990a7b253d28934db3= d6f1ab0 Author: Jiri Slaby (SUSE) AuthorDate: Wed, 19 Mar 2025 10:29:07 +01:00 Committer: Thomas Gleixner CommitterDate: Wed, 07 May 2025 09:53:22 +02:00 ARM: Switch to irq_domain_create_*() irq_domain_add_*() interfaces are going away as being obsolete now. Switch to the preferred irq_domain_create_*() ones. Those differ in the node parameter: They take more generic struct fwnode_handle instead of struct device_node. Therefore, of_fwnode_handle() is added around the original parameter. Note some of the users can likely use dev->fwnode directly instead of indirect of_fwnode_handle(dev->of_node). But dev->fwnode is not guaranteed to be set for all, so this has to be investigated on case to case basis (by people who can actually test with the HW). [ tglx: Fix up subject prefix ] Signed-off-by: Jiri Slaby (SUSE) Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20250319092951.37667-15-jirislaby@kernel.= org --- arch/arm/common/sa1111.c | 6 +++--- arch/arm/mach-exynos/suspend.c | 5 ++--- arch/arm/mach-imx/avic.c | 4 ++-- arch/arm/mach-imx/gpc.c | 5 ++--- arch/arm/mach-imx/tzic.c | 4 ++-- arch/arm/mach-omap1/irq.c | 3 +-- arch/arm/mach-omap2/omap-wakeupgen.c | 5 ++--- arch/arm/mach-pxa/irq.c | 5 ++--- arch/arm/plat-orion/gpio.c | 12 ++++++------ 9 files changed, 22 insertions(+), 27 deletions(-) diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 9846f30..02eda44 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -416,9 +416,9 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsi= gned irq_base) writel_relaxed(~0, irqbase + SA1111_INTSTATCLR0); writel_relaxed(~0, irqbase + SA1111_INTSTATCLR1); =20 - sachip->irqdomain =3D irq_domain_add_linear(NULL, SA1111_IRQ_NR, - &sa1111_irqdomain_ops, - sachip); + sachip->irqdomain =3D irq_domain_create_linear(NULL, SA1111_IRQ_NR, + &sa1111_irqdomain_ops, + sachip); if (!sachip->irqdomain) { irq_free_descs(sachip->irq_base, SA1111_IRQ_NR); return -ENOMEM; diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index cac4e82..150a1e5 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -209,9 +209,8 @@ static int __init exynos_pmu_irq_init(struct device_nod= e *node, return -ENOMEM; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, 0, - node, &exynos_pmu_domain_ops, - NULL); + domain =3D irq_domain_create_hierarchy(parent_domain, 0, 0, of_fwnode_han= dle(node), + &exynos_pmu_domain_ops, NULL); if (!domain) { iounmap(pmu_base_addr); pmu_base_addr =3D NULL; diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c index cf6546d..3067c06 100644 --- a/arch/arm/mach-imx/avic.c +++ b/arch/arm/mach-imx/avic.c @@ -201,8 +201,8 @@ static void __init mxc_init_irq(void __iomem *irqbase) WARN_ON(irq_base < 0); =20 np =3D of_find_compatible_node(NULL, NULL, "fsl,avic"); - domain =3D irq_domain_add_legacy(np, AVIC_NUM_IRQS, irq_base, 0, - &irq_domain_simple_ops, NULL); + domain =3D irq_domain_create_legacy(of_fwnode_handle(np), AVIC_NUM_IRQS, = irq_base, 0, + &irq_domain_simple_ops, NULL); WARN_ON(!domain); =20 for (i =3D 0; i < AVIC_NUM_IRQS / 32; i++, irq_base +=3D 32) diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 5909088..2e63356 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -245,9 +245,8 @@ static int __init imx_gpc_init(struct device_node *node, if (WARN_ON(!gpc_base)) return -ENOMEM; =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS, - node, &imx_gpc_domain_ops, - NULL); + domain =3D irq_domain_create_hierarchy(parent_domain, 0, GPC_MAX_IRQS, of= _fwnode_handle(node), + &imx_gpc_domain_ops, NULL); if (!domain) { iounmap(gpc_base); return -ENOMEM; diff --git a/arch/arm/mach-imx/tzic.c b/arch/arm/mach-imx/tzic.c index 8b3d98d..50a5668 100644 --- a/arch/arm/mach-imx/tzic.c +++ b/arch/arm/mach-imx/tzic.c @@ -175,8 +175,8 @@ static int __init tzic_init_dt(struct device_node *np, = struct device_node *p) irq_base =3D irq_alloc_descs(-1, 0, TZIC_NUM_IRQS, numa_node_id()); WARN_ON(irq_base < 0); =20 - domain =3D irq_domain_add_legacy(np, TZIC_NUM_IRQS, irq_base, 0, - &irq_domain_simple_ops, NULL); + domain =3D irq_domain_create_legacy(of_fwnode_handle(np), TZIC_NUM_IRQS, = irq_base, 0, + &irq_domain_simple_ops, NULL); WARN_ON(!domain); =20 for (i =3D 0; i < 4; i++, irq_base +=3D 32) diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 9b587ec..bb1bc06 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c @@ -220,8 +220,7 @@ void __init omap1_init_irq(void) omap_l2_irq =3D irq_base; omap_l2_irq -=3D NR_IRQS_LEGACY; =20 - domain =3D irq_domain_add_legacy(NULL, nr_irqs, irq_base, 0, - &irq_domain_simple_ops, NULL); + domain =3D irq_domain_create_legacy(NULL, nr_irqs, irq_base, 0, &irq_doma= in_simple_ops, NULL); =20 pr_info("Total of %lu interrupts in %i interrupt banks\n", nr_irqs, irq_bank_count); diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/oma= p-wakeupgen.c index 6f0d612..a66b1dc 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -585,9 +585,8 @@ static int __init wakeupgen_init(struct device_node *no= de, wakeupgen_ops =3D &am43xx_wakeupgen_ops; } =20 - domain =3D irq_domain_add_hierarchy(parent_domain, 0, max_irqs, - node, &wakeupgen_domain_ops, - NULL); + domain =3D irq_domain_create_hierarchy(parent_domain, 0, max_irqs, of_fwn= ode_handle(node), + &wakeupgen_domain_ops, NULL); if (!domain) { iounmap(wakeupgen_base); return -ENOMEM; diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index d9cadd9..5bfce8a 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -147,9 +147,8 @@ pxa_init_irq_common(struct device_node *node, int irq_n= r, int n; =20 pxa_internal_irq_nr =3D irq_nr; - pxa_irq_domain =3D irq_domain_add_legacy(node, irq_nr, - PXA_IRQ(0), 0, - &pxa_irq_ops, NULL); + pxa_irq_domain =3D irq_domain_create_legacy(of_fwnode_handle(node), irq_n= r, PXA_IRQ(0), 0, + &pxa_irq_ops, NULL); if (!pxa_irq_domain) panic("Unable to add PXA IRQ domain\n"); irq_set_default_domain(pxa_irq_domain); diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 595e9cb..a15f474 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -602,12 +602,12 @@ void __init orion_gpio_init(int gpio_base, int ngpio, IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); =20 /* Setup irq domain on top of the generic chip. */ - ochip->domain =3D irq_domain_add_legacy(NULL, - ochip->chip.ngpio, - ochip->secondary_irq_base, - ochip->secondary_irq_base, - &irq_domain_simple_ops, - ochip); + ochip->domain =3D irq_domain_create_legacy(NULL, + ochip->chip.ngpio, + ochip->secondary_irq_base, + ochip->secondary_irq_base, + &irq_domain_simple_ops, + ochip); if (!ochip->domain) panic("%s: couldn't allocate irq domain (DT).\n", ochip->chip.label);