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 05/37] ARM: davinci: remove davinci_intc_type Date: Tue, 12 Feb 2019 11:38:03 +0100 Message-ID: <20190212103835.7768-6-brgl@bgdev.pl> (raw) In-Reply-To: <20190212103835.7768-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> We now use the generic ARM irq handler on davinci. There are no more users that check davinci_intc_type. Remove the variable and all its references. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Reviewed-by: David Lechner <david@lechnology.com> --- arch/arm/mach-davinci/common.c | 1 - arch/arm/mach-davinci/cp_intc.c | 1 - arch/arm/mach-davinci/da830.c | 1 - arch/arm/mach-davinci/da850.c | 1 - arch/arm/mach-davinci/dm355.c | 1 - arch/arm/mach-davinci/dm365.c | 1 - arch/arm/mach-davinci/dm644x.c | 1 - arch/arm/mach-davinci/dm646x.c | 1 - arch/arm/mach-davinci/include/mach/common.h | 2 -- arch/arm/mach-davinci/include/mach/irqs.h | 3 --- arch/arm/mach-davinci/irq.c | 1 - 11 files changed, 14 deletions(-) diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index e1d0f0d841ff..a87e158a709b 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -24,7 +24,6 @@ struct davinci_soc_info davinci_soc_info; EXPORT_SYMBOL(davinci_soc_info); void __iomem *davinci_intc_base; -int davinci_intc_type; void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context) { diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 4a372add8cf9..19874f5ef542 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -146,7 +146,6 @@ int __init cp_intc_of_init(struct device_node *node, struct device_node *parent) unsigned num_reg = BITS_TO_LONGS(num_irq); int i, irq_base; - davinci_intc_type = DAVINCI_INTC_TYPE_CP_INTC; if (node) { davinci_intc_base = of_iomap(node, 0); if (of_property_read_u32(node, "ti,intc-size", &num_irq)) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 2cc9fe4c3a91..9e18b245266b 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -807,7 +807,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { .pinmux_pins = da830_pins, .pinmux_pins_num = ARRAY_SIZE(da830_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_CP_INTC, .intc_irq_prios = da830_default_priorities, .intc_irq_num = DA830_N_CP_INTC_IRQ, .timer_info = &da830_timer_info, diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e7b78df2bfef..e823b89e2b7a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -739,7 +739,6 @@ static const struct davinci_soc_info davinci_soc_info_da850 = { .pinmux_pins = da850_pins, .pinmux_pins_num = ARRAY_SIZE(da850_pins), .intc_base = DA8XX_CP_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_CP_INTC, .intc_irq_prios = da850_default_priorities, .intc_irq_num = DA850_N_CP_INTC_IRQ, .timer_info = &da850_timer_info, diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 4c6e0bef4509..03ce5df28d87 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -705,7 +705,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = { .pinmux_pins = dm355_pins, .pinmux_pins_num = ARRAY_SIZE(dm355_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm355_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm355_timer_info, diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 01fb2b0c82de..3e034f0478d2 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -722,7 +722,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = { .pinmux_pins = dm365_pins, .pinmux_pins_num = ARRAY_SIZE(dm365_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm365_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm365_timer_info, diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 38f92b7d413e..66bab4782c62 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -646,7 +646,6 @@ static const struct davinci_soc_info davinci_soc_info_dm644x = { .pinmux_pins = dm644x_pins, .pinmux_pins_num = ARRAY_SIZE(dm644x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm644x_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm644x_timer_info, diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 7dc54b2a610f..45efa715a2c1 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -586,7 +586,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { .pinmux_pins = dm646x_pins, .pinmux_pins_num = ARRAY_SIZE(dm646x_pins), .intc_base = DAVINCI_ARM_INTC_BASE, - .intc_type = DAVINCI_INTC_TYPE_AINTC, .intc_irq_prios = dm646x_default_priorities, .intc_irq_num = DAVINCI_N_AINTC_IRQ, .timer_info = &dm646x_timer_info, diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index 944afd57ee38..34e48de92dcc 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h @@ -21,7 +21,6 @@ void davinci_timer_init(struct clk *clk); extern void davinci_irq_init(void); extern void __iomem *davinci_intc_base; -extern int davinci_intc_type; struct davinci_timer_instance { u32 base; @@ -58,7 +57,6 @@ struct davinci_soc_info { const struct mux_config *pinmux_pins; unsigned long pinmux_pins_num; u32 intc_base; - int intc_type; u8 *intc_irq_prios; unsigned long intc_irq_num; struct davinci_timer_info *timer_info; diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index edb2ca62321a..03c446635301 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h @@ -30,9 +30,6 @@ /* Base address */ #define DAVINCI_ARM_INTC_BASE 0x01C48000 -#define DAVINCI_INTC_TYPE_AINTC 0 -#define DAVINCI_INTC_TYPE_CP_INTC 1 - /* Interrupt lines */ #define IRQ_VDINT0 0 #define IRQ_VDINT1 1 diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 363ca6d76cb0..2e3426ebfd97 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -99,7 +99,6 @@ void __init davinci_irq_init(void) const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios; int ret, irq_base; - davinci_intc_type = DAVINCI_INTC_TYPE_AINTC; davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_4K); if (WARN_ON(!davinci_intc_base)) return; -- 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 index 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 ` Bartosz Golaszewski [this message] 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 ` [PATCH v3 17/37] ARM: davinci: aintc: use the new config structure Bartosz Golaszewski 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-6-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 \ /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
Linux-ARM-Kernel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \ linux-arm-kernel@lists.infradead.org public-inbox-index linux-arm-kernel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git