From: Bartosz Golaszewski <brgl@bgdev.pl> To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Jason Cooper <jason@lakedaemon.net>, Marc Zyngier <marc.zyngier@arm.com>, David Lechner <david@lechnology.com> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 17/37] ARM: davinci: aintc: use the new config structure Date: Tue, 12 Feb 2019 11:38:15 +0100 [thread overview] Message-ID: <20190212103835.7768-18-brgl@bgdev.pl> (raw) In-Reply-To: <20190212103835.7768-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Modify the aintc driver to take all its configuration from the new config structure. Stop referencing davinci_soc_info in any way. Move the declaration for davinci_aintc_init() to irq-davinci-aintc.h and make it take the new config structure as parameter. Convert all users to the new version. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Reviewed-by: David Lechner <david@lechnology.com> --- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/include/mach/common.h | 2 -- arch/arm/mach-davinci/irq.c | 39 +++++++++++---------- include/linux/irqchip/irq-davinci-aintc.h | 2 ++ 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index ff79c1a17fae..c7cd765114af 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -805,7 +805,7 @@ static const struct davinci_aintc_config dm355_aintc_config = { void __init dm355_init_irq(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm355_aintc_config); } static int __init dm355_init_devices(void) diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 44dc3ca94dd3..bde3c3b94cc9 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -1064,7 +1064,7 @@ static const struct davinci_aintc_config dm365_aintc_config = { void __init dm365_init_irq(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm365_aintc_config); } static int __init dm365_init_devices(void) diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 0b0ecac36486..6d3498058283 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -741,7 +741,7 @@ static const struct davinci_aintc_config dm644x_aintc_config = { void __init dm644x_init_irq(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm644x_aintc_config); } void __init dm644x_init_devices(void) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 4e871d00e4e9..a0a8b336c1a4 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -702,7 +702,7 @@ static const struct davinci_aintc_config dm646x_aintc_config = { void __init dm646x_init_irq(void) { - davinci_aintc_init(); + davinci_aintc_init(&dm646x_aintc_config); } static int __init dm646x_init_devices(void) diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 8c9c011f96f6..14e0e1c40611 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -24,8 +24,6 @@ void davinci_timer_init(struct clk *clk); -extern void davinci_aintc_init(void); - struct davinci_timer_instance { u32 base; u32 bottom_irq; diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 509be44eda22..1b2eeddfabd1 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -8,6 +8,7 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/irq.h> +#include <linux/irqchip/irq-davinci-aintc.h> #include <linux/io.h> #include <linux/irqdomain.h> @@ -82,13 +83,14 @@ davinci_aintc_handle_irq(struct pt_regs *regs) } /* ARM Interrupt Controller Initialization */ -void __init davinci_aintc_init(void) +void __init davinci_aintc_init(const struct davinci_aintc_config *config) { - unsigned i, j; - const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; + unsigned int irq_off, reg_off, prio, shift; int ret, irq_base; + const u8 *prios; - davinci_aintc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); + davinci_aintc_base = ioremap(config->reg.start, + resource_size(&config->reg)); if (WARN_ON(!davinci_aintc_base)) return; @@ -114,23 +116,21 @@ void __init davinci_aintc_init(void) davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG0); davinci_aintc_writel(~0x0, DAVINCI_AINTC_IRQ_REG1); - for (i = DAVINCI_AINTC_IRQ_INTPRI0_REG; - i <= DAVINCI_AINTC_IRQ_INTPRI7_REG; i += 4) { - u32 pri; - - for (j = 0, pri = 0; j < 32; j += 4, davinci_def_priorities++) - pri |= (*davinci_def_priorities & 0x07) << j; - davinci_aintc_writel(pri, i); + prios = config->prios; + for (reg_off = DAVINCI_AINTC_IRQ_INTPRI0_REG; + reg_off <= DAVINCI_AINTC_IRQ_INTPRI7_REG; reg_off += 4) { + for (shift = 0, prio = 0; shift < 32; shift += 4, prios++) + prio |= (*prios & 0x07) << shift; + davinci_aintc_writel(prio, reg_off); } - irq_base = irq_alloc_descs(-1, 0, davinci_soc_info.intc_irq_num, 0); + irq_base = irq_alloc_descs(-1, 0, config->num_irqs, 0); if (WARN_ON(irq_base < 0)) return; davinci_aintc_irq_domain = irq_domain_add_legacy(NULL, - davinci_soc_info.intc_irq_num, - irq_base, 0, &irq_domain_simple_ops, - NULL); + config->num_irqs, irq_base, 0, + &irq_domain_simple_ops, NULL); if (WARN_ON(!davinci_aintc_irq_domain)) return; @@ -140,10 +140,11 @@ void __init davinci_aintc_init(void) if (WARN_ON(ret)) return; - for (i = 0, j = 0; i < davinci_soc_info.intc_irq_num; - i += 32, j += 0x04) - davinci_aintc_setup_gc(davinci_aintc_base + j, - irq_base + i, 32); + for (irq_off = 0, reg_off = 0; + irq_off < config->num_irqs; + irq_off += 32, reg_off += 0x04) + davinci_aintc_setup_gc(davinci_aintc_base + reg_off, + irq_base + irq_off, 32); irq_set_handler(DAVINCI_INTC_IRQ(IRQ_TINT1_TINT34), handle_level_irq); set_handle_irq(davinci_aintc_handle_irq); diff --git a/include/linux/irqchip/irq-davinci-aintc.h b/include/linux/irqchip/irq-davinci-aintc.h index 2b2ace3c1b22..ea4e087fac98 100644 --- a/include/linux/irqchip/irq-davinci-aintc.h +++ b/include/linux/irqchip/irq-davinci-aintc.h @@ -22,4 +22,6 @@ struct davinci_aintc_config { u8 *prios; }; +void davinci_aintc_init(const struct davinci_aintc_config *config); + #endif /* _LINUX_IRQ_DAVINCI_AINTC_ */ -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-12 10:43 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-12 10:37 [PATCH v3 00/37] ARM: davinci: modernize the irq support Bartosz Golaszewski 2019-02-12 10:37 ` [PATCH v3 01/37] input: davinci_keyscan: remove unnecessary includes Bartosz Golaszewski 2019-02-14 14:09 ` Sekhar Nori 2019-02-12 10:38 ` [PATCH v3 02/37] ARM: davinci: remove intc_host_map from davinci_soc_info struct Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 03/37] ARM: davinci: aintc: use irq domain Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 04/37] ARM: davinci: select GENERIC_IRQ_MULTI_HANDLER Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 05/37] ARM: davinci: remove davinci_intc_type Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 06/37] ARM: davinci: pull davinci_intc_base into the respective intc drivers Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 07/37] ARM: davinci: wrap HW interrupt numbers with a macro Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 08/37] ARM: davinci: select SPARSE_IRQ Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 09/37] ARM: davinci: make irqs.h a local header Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 10/37] ARM: davinci: aintc: drop GPL license boilerplate Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 11/37] ARM: davinci: aintc: wrap davinci_irq_init() with a helper Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 12/37] ARM: davinci: aintc: use a common prefix for symbols in the driver Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 13/37] ARM: davinci: aintc: drop the 00 prefix from register offsets Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 14/37] ARM: davinci: aintc: use readl/writel_relaxed() Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 15/37] irqchip: davinci-aintc: add a new config structure Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 16/37] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Bartosz Golaszewski 2019-02-12 10:38 ` Bartosz Golaszewski [this message] 2019-02-12 10:38 ` [PATCH v3 18/37] ARM: davinci: aintc: unify error handling Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 19/37] ARM: davinci: aintc: request memory region before remapping it Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 20/37] ARM: davinci: aintc: move timer-specific irq_set_handler() out of irq.c Bartosz Golaszewski 2019-02-14 10:57 ` Marc Zyngier 2019-02-14 12:44 ` Sekhar Nori 2019-02-14 12:56 ` Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 21/37] ARM: davinci: aintc: remove unnecessary includes Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 22/37] irqchip: davinci-aintc: move the driver to drivers/irqchip Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 23/37] ARM: davinci: cp-intc: remove cp_intc.h Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 24/37] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 25/37] irqchip: davinci-cp-intc: add a new config structure Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 26/37] ARM: davinci: cp-intc: add the new config structures for da8xx SoCs Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 27/37] ARM: davinci: cp-intc: use a common prefix for all symbols Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 28/37] ARM: davinci: cp-intc: convert all hex numbers to lowercase Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 29/37] ARM: davinci: cp-intc: use the new-style config structure Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 30/37] ARM: davinci: cp-intc: request the memory region before remapping it Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 31/37] ARM: davinci: cp-intc: improve coding style Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 32/37] ARM: davinci: cp-intc: unify error handling Bartosz Golaszewski 2019-02-14 11:11 ` Marc Zyngier 2019-02-12 10:38 ` [PATCH v3 33/37] ARM: davinci: cp-intc: use readl/writel_relaxed() Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 34/37] ARM: davinci: cp-intc: drop GPL license boilerplate Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 35/37] ARM: davinci: cp-intc: remove redundant comments Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 36/37] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Bartosz Golaszewski 2019-02-12 10:38 ` [PATCH v3 37/37] ARM: davinci: remove intc related fields from davinci_soc_info Bartosz Golaszewski
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=20190212103835.7768-18-brgl@bgdev.pl \ --to=brgl@bgdev.pl \ --cc=bgolaszewski@baylibre.com \ --cc=david@lechnology.com \ --cc=jason@lakedaemon.net \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=nsekhar@ti.com \ --cc=tglx@linutronix.de \ --subject='Re: [PATCH v3 17/37] ARM: davinci: aintc: use the new config structure' \ /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: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).