From: Marc Zyngier <marc.zyngier@arm.com> To: Stephen Warren <swarren@wwwdotorg.org>, Thierry Reding <thierry.reding@gmail.com>, Alexandre Courbot <gnurou@gmail.com>, Benoit Cousson <bcousson@baylibre.com>, Tony Lindgren <tony@atomide.com>, Nishanth Menon <nm@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Shawn Guo <shawn.guo@linaro.org>, Sascha Hauer <kernel@pengutronix.de>, Kukjin Kim <kgene.kim@samsung.com>, Pankaj Dubey <pankaj.dubey@samsung.com>, Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Michal Simek <michal.simek@xilinx.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Jason Cooper <jason@lakedaemon.net>, Thomas Gleixner <tglx@linutronix.de> Cc: Thierry Reding <treding@nvidia.com>, Stefan Agner <stefan@agner.ch>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH v4 03/21] ARM: tegra: skip gic_arch_extn setup if DT has a LIC node Date: Mon, 19 Jan 2015 09:43:57 +0000 [thread overview] Message-ID: <1421660655-21394-4-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1421660655-21394-1-git-send-email-marc.zyngier@arm.com> If we detect that our DT has a LIC node, don't setup gic_arch_extn, and skip tegra_legacy_irq_syscore_init as well. This is only a temporary measure until that code is removed for good. Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/mach-tegra/irq.c | 12 ++++++++++++ arch/arm/mach-tegra/tegra.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 7f87a50..1593c4c 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -255,11 +255,22 @@ static void tegra114_gic_cpu_pm_registration(void) static void tegra114_gic_cpu_pm_registration(void) { } #endif +static const struct of_device_id tegra_ictlr_match[] __initconst = { + { .compatible = "nvidia,tegra20-ictlr" }, + { .compatible = "nvidia,tegra30-ictlr" }, + { } +}; + void __init tegra_init_irq(void) { int i; void __iomem *distbase; + if (of_find_matching_node(NULL, tegra_ictlr_match)) + goto skip_extn_setup; + + tegra_legacy_irq_syscore_init(); + distbase = IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE); num_ictlrs = readl_relaxed(distbase + GIC_DIST_CTR) & 0x1f; @@ -283,5 +294,6 @@ void __init tegra_init_irq(void) gic_arch_extn.irq_set_wake = tegra_set_wake; gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND; +skip_extn_setup: tegra114_gic_cpu_pm_registration(); } diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index ef016af..c33fba7 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -82,7 +82,6 @@ static void __init tegra_dt_init_irq(void) { tegra_init_irq(); irqchip_init(); - tegra_legacy_irq_syscore_init(); } static void __init tegra_dt_init(void) -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 03/21] ARM: tegra: skip gic_arch_extn setup if DT has a LIC node Date: Mon, 19 Jan 2015 09:43:57 +0000 [thread overview] Message-ID: <1421660655-21394-4-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1421660655-21394-1-git-send-email-marc.zyngier@arm.com> If we detect that our DT has a LIC node, don't setup gic_arch_extn, and skip tegra_legacy_irq_syscore_init as well. This is only a temporary measure until that code is removed for good. Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/mach-tegra/irq.c | 12 ++++++++++++ arch/arm/mach-tegra/tegra.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 7f87a50..1593c4c 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -255,11 +255,22 @@ static void tegra114_gic_cpu_pm_registration(void) static void tegra114_gic_cpu_pm_registration(void) { } #endif +static const struct of_device_id tegra_ictlr_match[] __initconst = { + { .compatible = "nvidia,tegra20-ictlr" }, + { .compatible = "nvidia,tegra30-ictlr" }, + { } +}; + void __init tegra_init_irq(void) { int i; void __iomem *distbase; + if (of_find_matching_node(NULL, tegra_ictlr_match)) + goto skip_extn_setup; + + tegra_legacy_irq_syscore_init(); + distbase = IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE); num_ictlrs = readl_relaxed(distbase + GIC_DIST_CTR) & 0x1f; @@ -283,5 +294,6 @@ void __init tegra_init_irq(void) gic_arch_extn.irq_set_wake = tegra_set_wake; gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND; +skip_extn_setup: tegra114_gic_cpu_pm_registration(); } diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index ef016af..c33fba7 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -82,7 +82,6 @@ static void __init tegra_dt_init_irq(void) { tegra_init_irq(); irqchip_init(); - tegra_legacy_irq_syscore_init(); } static void __init tegra_dt_init(void) -- 2.1.4
next prev parent reply other threads:[~2015-01-19 9:43 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-19 9:43 [PATCH v4 00/21] irqchip: gic: killing gic_arch_extn and co, slowly Marc Zyngier 2015-01-19 9:43 ` Marc Zyngier 2015-01-19 9:43 ` [PATCH v4 01/21] ARM: tegra: irq: nuke leftovers from non-DT support Marc Zyngier 2015-01-19 9:43 ` Marc Zyngier 2015-01-19 9:43 ` [PATCH v4 02/21] irqchip: tegra: add DT-based support for legacy interrupt controller Marc Zyngier 2015-01-19 9:43 ` Marc Zyngier 2015-01-20 7:51 ` Peter De Schrijver 2015-01-20 7:51 ` Peter De Schrijver 2015-01-19 9:43 ` Marc Zyngier [this message] 2015-01-19 9:43 ` [PATCH v4 03/21] ARM: tegra: skip gic_arch_extn setup if DT has a LIC node Marc Zyngier 2015-01-19 9:43 ` [PATCH v4 04/21] ARM: tegra: update DTs to expose legacy interrupt controller Marc Zyngier 2015-01-19 9:43 ` Marc Zyngier 2015-01-19 9:43 ` [PATCH v4 05/21] DT: tegra: add binding for the " Marc Zyngier 2015-01-19 9:43 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 06/21] ARM: tegra: remove old LIC support Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 07/21] genirq: Add irqchip_set_wake_parent Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 08/21] irqchip: crossbar: convert dra7 crossbar to stacked domains Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 09/21] DT: update ti,irq-crossbar binding Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 10/21] irqchip: GIC: get rid of routable domain Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 11/21] DT: arm,gic: kill arm,routable-irqs Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 12/21] DT: omap4/5: add binding for the wake-up generator Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-21 16:26 ` Tony Lindgren 2015-01-21 16:26 ` Tony Lindgren 2015-01-19 9:44 ` [PATCH v4 13/21] ARM: omap: convert wakeupgen to stacked domains Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-21 16:30 ` Tony Lindgren 2015-01-21 16:30 ` Tony Lindgren 2015-01-21 17:22 ` Marc Zyngier 2015-01-21 17:22 ` Marc Zyngier 2015-01-21 18:36 ` Tony Lindgren 2015-01-21 18:36 ` Tony Lindgren 2015-01-21 20:12 ` santosh shilimkar 2015-01-21 20:12 ` santosh shilimkar 2015-01-21 20:43 ` Tony Lindgren 2015-01-21 20:43 ` Tony Lindgren 2015-01-21 21:28 ` santosh shilimkar 2015-01-21 21:28 ` santosh shilimkar 2015-01-21 21:37 ` Tony Lindgren 2015-01-21 21:37 ` Tony Lindgren 2015-01-19 9:44 ` [PATCH v4 14/21] ARM: imx6: convert GPC " Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 10:47 ` Lucas Stach 2015-01-19 10:47 ` Lucas Stach 2015-01-19 11:12 ` Marc Zyngier 2015-01-19 11:12 ` Marc Zyngier 2015-01-20 11:19 ` Shawn Guo 2015-01-20 11:19 ` Shawn Guo 2015-01-19 9:44 ` [PATCH v4 15/21] ARM: exynos4/5: convert pmu wakeup " Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-20 7:42 ` Pankaj Dubey 2015-01-20 7:42 ` Pankaj Dubey 2015-01-20 9:43 ` Marc Zyngier 2015-01-20 9:43 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 16/21] DT: exynos: update PMU binding Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-20 7:47 ` Pankaj Dubey 2015-01-20 7:47 ` Pankaj Dubey 2015-01-19 9:44 ` [PATCH v4 17/21] irqchip: gic: add an entry point to set up irqchip flags Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 18/21] ARM: shmobile: remove use of gic_arch_extn.irq_set_wake Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 19/21] ARM: ux500: switch from gic_arch_extn to gic_set_irqchip_flags Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 20/21] ARM: zynq: " Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier 2015-01-19 9:44 ` [PATCH v4 21/21] irqchip: gic: Drop support for gic_arch_extn Marc Zyngier 2015-01-19 9:44 ` Marc Zyngier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1421660655-21394-4-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=bcousson@baylibre.com \ --cc=gnurou@gmail.com \ --cc=horms@verge.net.au \ --cc=jason@lakedaemon.net \ --cc=kernel@pengutronix.de \ --cc=kgene.kim@samsung.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=mark.rutland@arm.com \ --cc=michal.simek@xilinx.com \ --cc=nm@ti.com \ --cc=pankaj.dubey@samsung.com \ --cc=robh+dt@kernel.org \ --cc=shawn.guo@linaro.org \ --cc=ssantosh@kernel.org \ --cc=stefan@agner.ch \ --cc=swarren@wwwdotorg.org \ --cc=tglx@linutronix.de \ --cc=thierry.reding@gmail.com \ --cc=tony@atomide.com \ --cc=treding@nvidia.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.