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: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 06/37] ARM: davinci: pull davinci_intc_base into the respective intc drivers
Date: Thu, 14 Feb 2019 15:52:00 +0100 [thread overview]
Message-ID: <20190214145231.8750-7-brgl@bgdev.pl> (raw)
In-Reply-To: <20190214145231.8750-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
davinci_intc_base is defined globally in common.c. Define separate
local variables for the aintc and cp-intc drivers and remove the
global one.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: David Lechner <david@lechnology.com>
---
arch/arm/mach-davinci/common.c | 2 --
arch/arm/mach-davinci/cp_intc.c | 2 ++
arch/arm/mach-davinci/include/mach/common.h | 1 -
arch/arm/mach-davinci/irq.c | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c
index a87e158a709b..2850ae02aaa4 100644
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -23,8 +23,6 @@
struct davinci_soc_info davinci_soc_info;
EXPORT_SYMBOL(davinci_soc_info);
-void __iomem *davinci_intc_base;
-
void davinci_get_mac_addr(struct nvmem_device *nvmem, void *context)
{
char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;
diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 19874f5ef542..4e293cde20fb 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -26,6 +26,8 @@
#define DAVINCI_CP_INTC_PRI_INDX_MASK GENMASK(9, 0)
#define DAVINCI_CP_INTC_GPIR_NONE BIT(31)
+static void __iomem *davinci_intc_base;
+
static inline unsigned int cp_intc_read(unsigned offset)
{
return __raw_readl(davinci_intc_base + offset);
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 34e48de92dcc..3d45b73b9a64 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -20,7 +20,6 @@
void davinci_timer_init(struct clk *clk);
extern void davinci_irq_init(void);
-extern void __iomem *davinci_intc_base;
struct davinci_timer_instance {
u32 base;
diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c
index 2e3426ebfd97..b27b90dc269c 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@ -43,6 +43,7 @@
#define IRQ_INTPRI0_REG_OFFSET 0x0030
#define IRQ_INTPRI7_REG_OFFSET 0x004C
+static void __iomem *davinci_intc_base;
static struct irq_domain *davinci_irq_domain;
static inline void davinci_irq_writel(unsigned long value, int offset)
--
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-14 14:53 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 ` Bartosz Golaszewski [this message]
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 ` [PATCH v4 08/37] ARM: davinci: select SPARSE_IRQ Bartosz Golaszewski
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-7-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).