From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
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: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v4 08/37] ARM: davinci: select SPARSE_IRQ
Date: Thu, 14 Feb 2019 15:52:02 +0100 [thread overview]
Message-ID: <20190214145231.8750-9-brgl@bgdev.pl> (raw)
In-Reply-To: <20190214145231.8750-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Everything is in place now for SPARSE_IRQ. Select it and set
DAVINCI_INTC_START to NR_IRQS.
We now need to include mach/irqs.h in a couple places as it is no
longer indirectly included after selecting SPARSE_IRQ.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
---
arch/arm/Kconfig | 1 +
arch/arm/mach-davinci/board-da830-evm.c | 1 +
arch/arm/mach-davinci/board-da850-evm.c | 1 +
arch/arm/mach-davinci/board-dm644x-evm.c | 1 +
arch/arm/mach-davinci/devices-da8xx.c | 1 +
arch/arm/mach-davinci/include/mach/common.h | 4 +++-
arch/arm/mach-davinci/include/mach/irqs.h | 1 -
arch/arm/mach-davinci/irq.c | 1 +
8 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f7770fdcad68..1037f49e050f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -595,6 +595,7 @@ config ARCH_DAVINCI
select PM_GENERIC_DOMAINS if PM
select PM_GENERIC_DOMAINS_OF if PM && OF
select RESET_CONTROLLER
+ select SPARSE_IRQ
select USE_OF
select ZONE_DMA
help
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index c4da635ee4ce..41f5a51fee9a 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -36,6 +36,7 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include "cp_intc.h"
#include <mach/mux.h>
#include <mach/da8xx.h>
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 44bca048dfd0..317f48560534 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -46,6 +46,7 @@
#include "cp_intc.h"
#include <mach/da8xx.h>
#include <mach/mux.h>
+#include <mach/irqs.h>
#include "sram.h"
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index b80c4ee76217..16ffed2525e6 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -36,6 +36,7 @@
#include <asm/mach/arch.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/serial.h>
#include <mach/mux.h>
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 298165095d31..3104a3eb2ddf 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -25,6 +25,7 @@
#include <mach/cputype.h>
#include <mach/da8xx.h>
#include <mach/time.h>
+#include <mach/irqs.h>
#include "asp.h"
#include "cpuidle.h"
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index d840023eaaac..1ceed0345988 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -17,7 +17,9 @@
#include <linux/types.h>
#include <linux/reboot.h>
-#define DAVINCI_INTC_START 0
+#include <asm/irq.h>
+
+#define DAVINCI_INTC_START NR_IRQS
#define DAVINCI_INTC_IRQ(_irqnum) (DAVINCI_INTC_START + (_irqnum))
void davinci_timer_init(struct clk *clk);
diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h
index 03c446635301..8f9fc7a56ce8 100644
--- a/arch/arm/mach-davinci/include/mach/irqs.h
+++ b/arch/arm/mach-davinci/include/mach/irqs.h
@@ -401,6 +401,5 @@
/* da850 currently has the most gpio pins (144) */
#define DAVINCI_N_GPIO 144
/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */
-#define NR_IRQS (DA850_N_CP_INTC_IRQ + DAVINCI_N_GPIO)
#endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c
index 80bf99c8fa55..34b0eec4de4e 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@ -28,6 +28,7 @@
#include <mach/hardware.h>
#include <mach/cputype.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include <asm/mach/irq.h>
#include <asm/exception.h>
--
2.20.1
next prev parent reply other threads:[~2019-02-14 14:52 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 14:51 [PATCH v4 00/37] ARM: davinci: modernize the irq support Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 01/37] input: davinci_keyscan: remove unnecessary includes Bartosz Golaszewski
2019-02-15 7:37 ` Dmitry Torokhov
2019-02-14 14:51 ` [PATCH v4 02/37] ARM: davinci: remove intc_host_map from davinci_soc_info struct Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 03/37] ARM: davinci: aintc: use irq domain Bartosz Golaszewski
2019-02-17 9:24 ` David Lechner
2019-02-14 14:51 ` [PATCH v4 04/37] ARM: davinci: select GENERIC_IRQ_MULTI_HANDLER Bartosz Golaszewski
2019-02-14 14:51 ` [PATCH v4 05/37] ARM: davinci: remove davinci_intc_type Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 06/37] ARM: davinci: pull davinci_intc_base into the respective intc drivers Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 07/37] ARM: davinci: wrap HW interrupt numbers with a macro Bartosz Golaszewski
2019-02-17 9:29 ` David Lechner
2019-02-14 14:52 ` Bartosz Golaszewski [this message]
2019-02-14 14:52 ` [PATCH v4 09/37] ARM: davinci: make irqs.h a local header Bartosz Golaszewski
2019-02-17 9:38 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 10/37] ARM: davinci: aintc: drop GPL license boilerplate Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 11/37] ARM: davinci: aintc: wrap davinci_irq_init() with a helper Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 12/37] ARM: davinci: aintc: use a common prefix for symbols in the driver Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 13/37] ARM: davinci: aintc: drop the 00 prefix from register offsets Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 14/37] ARM: davinci: aintc: use readl/writel_relaxed() Bartosz Golaszewski
2019-02-17 9:39 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 15/37] irqchip: davinci-aintc: add a new config structure Bartosz Golaszewski
2019-02-17 9:41 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 16/37] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Bartosz Golaszewski
2019-02-17 9:46 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 17/37] ARM: davinci: aintc: use the new config structure Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 18/37] ARM: davinci: aintc: unify error handling Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 19/37] ARM: davinci: aintc: request memory region before remapping it Bartosz Golaszewski
2019-02-17 9:50 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 20/37] ARM: davinci: aintc: remove the timer-specific irq_set_handler() Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 21/37] ARM: davinci: aintc: remove unnecessary includes Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 22/37] irqchip: davinci-aintc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-02-17 9:51 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 23/37] ARM: davinci: cp-intc: remove cp_intc.h Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 24/37] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 25/37] irqchip: davinci-cp-intc: add a new config structure Bartosz Golaszewski
2019-02-17 9:53 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 26/37] ARM: davinci: cp-intc: add the new config structures for da8xx SoCs Bartosz Golaszewski
2019-02-17 9:53 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 27/37] ARM: davinci: cp-intc: use a common prefix for all symbols Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 28/37] ARM: davinci: cp-intc: convert all hex numbers to lowercase Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 29/37] ARM: davinci: cp-intc: use the new-style config structure Bartosz Golaszewski
2019-02-17 9:56 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 30/37] ARM: davinci: cp-intc: request the memory region before remapping it Bartosz Golaszewski
2019-02-17 9:56 ` David Lechner
2019-02-14 14:52 ` [PATCH v4 31/37] ARM: davinci: cp-intc: improve coding style Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 32/37] ARM: davinci: cp-intc: unify error handling Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 33/37] ARM: davinci: cp-intc: use readl/writel_relaxed() Bartosz Golaszewski
2019-02-17 10:01 ` David Lechner
2019-02-18 8:12 ` Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 34/37] ARM: davinci: cp-intc: drop GPL license boilerplate Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 35/37] ARM: davinci: cp-intc: remove redundant comments Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 36/37] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-02-14 14:52 ` [PATCH v4 37/37] ARM: davinci: remove intc related fields from davinci_soc_info Bartosz Golaszewski
2019-02-17 10:02 ` David Lechner
2019-02-15 15:14 ` [PATCH v4 00/37] ARM: davinci: modernize the irq support Sekhar Nori
2019-02-18 14:19 ` Marc Zyngier
2019-02-19 15:37 ` Sekhar Nori
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=20190214145231.8750-9-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.com \
--cc=david@lechnology.com \
--cc=dmitry.torokhov@gmail.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).