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>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 04/35] ARM: davinci: pull davinci_intc_base into the respective intc drivers
Date: Thu, 31 Jan 2019 14:38:57 +0100 [thread overview]
Message-ID: <20190131133928.17985-5-brgl@bgdev.pl> (raw)
In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This variable 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>
---
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 | 2 ++
4 files changed, 4 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 fef39d5988d9..384b72fbefca 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -23,6 +23,8 @@
#include <mach/common.h>
#include "cp_intc.h"
+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 3658235c8ee7..e539bc65d4ef 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@ -42,6 +42,8 @@
#define IRQ_INTPRI0_REG_OFFSET 0x0030
#define IRQ_INTPRI7_REG_OFFSET 0x004C
+static void __iomem *davinci_intc_base;
+
static inline void davinci_irq_writel(unsigned long value, int offset)
{
__raw_writel(value, davinci_intc_base + offset);
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
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>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/35] ARM: davinci: pull davinci_intc_base into the respective intc drivers
Date: Thu, 31 Jan 2019 14:38:57 +0100 [thread overview]
Message-ID: <20190131133928.17985-5-brgl@bgdev.pl> (raw)
In-Reply-To: <20190131133928.17985-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This variable 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>
---
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 | 2 ++
4 files changed, 4 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 fef39d5988d9..384b72fbefca 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -23,6 +23,8 @@
#include <mach/common.h>
#include "cp_intc.h"
+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 3658235c8ee7..e539bc65d4ef 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@ -42,6 +42,8 @@
#define IRQ_INTPRI0_REG_OFFSET 0x0030
#define IRQ_INTPRI7_REG_OFFSET 0x004C
+static void __iomem *davinci_intc_base;
+
static inline void davinci_irq_writel(unsigned long value, int offset)
{
__raw_writel(value, davinci_intc_base + 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-01-31 13:42 UTC|newest]
Thread overview: 195+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 13:38 [PATCH 00/35] ARM: davinci: modernize the irq support Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-01-31 13:38 ` [PATCH 01/35] ARM: davinci: remove intc_host_map from davinci_soc_info struct Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-02-04 21:50 ` David Lechner
2019-02-04 21:50 ` David Lechner
2019-02-06 8:32 ` Sekhar Nori
2019-02-06 8:32 ` Sekhar Nori
2019-01-31 13:38 ` [PATCH 02/35] ARM: davinci: select GENERIC_IRQ_MULTI_HANDLER Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-02-04 22:02 ` David Lechner
2019-02-04 22:02 ` David Lechner
2019-02-06 12:39 ` Sekhar Nori
2019-02-06 12:39 ` Sekhar Nori
2019-02-07 15:49 ` Bartosz Golaszewski
2019-02-07 15:49 ` Bartosz Golaszewski
2019-02-08 8:59 ` Sekhar Nori
2019-02-08 8:59 ` Sekhar Nori
2019-01-31 13:38 ` [PATCH 03/35] ARM: davinci: remove davinci_intc_type Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-02-04 22:04 ` David Lechner
2019-02-04 22:04 ` David Lechner
2019-01-31 13:38 ` Bartosz Golaszewski [this message]
2019-01-31 13:38 ` [PATCH 04/35] ARM: davinci: pull davinci_intc_base into the respective intc drivers Bartosz Golaszewski
2019-02-04 22:06 ` David Lechner
2019-02-04 22:06 ` David Lechner
2019-01-31 13:38 ` [PATCH 05/35] ARM: davinci: drop irq defines from default_priorites Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-02-04 22:21 ` David Lechner
2019-02-04 22:21 ` David Lechner
2019-02-06 13:03 ` Sekhar Nori
2019-02-06 13:03 ` Sekhar Nori
2019-02-06 13:32 ` Bartosz Golaszewski
2019-02-06 13:32 ` Bartosz Golaszewski
2019-02-06 14:50 ` Sekhar Nori
2019-02-06 14:50 ` Sekhar Nori
2019-02-05 0:20 ` David Lechner
2019-02-05 0:20 ` David Lechner
2019-02-05 16:16 ` Bartosz Golaszewski
2019-02-05 16:16 ` Bartosz Golaszewski
2019-01-31 13:38 ` [PATCH 06/35] ARM: davinci: wrap interrupt definitions with a macro for SPARSE_IRQ Bartosz Golaszewski
2019-01-31 13:38 ` Bartosz Golaszewski
2019-02-04 22:32 ` David Lechner
2019-02-04 22:32 ` David Lechner
2019-02-05 16:17 ` Bartosz Golaszewski
2019-02-05 16:17 ` Bartosz Golaszewski
2019-01-31 13:39 ` [PATCH 07/35] ARM: davinci: aintc: use irq domain Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 22:42 ` David Lechner
2019-02-04 22:42 ` David Lechner
2019-02-05 16:29 ` Bartosz Golaszewski
2019-02-05 16:29 ` Bartosz Golaszewski
2019-02-06 15:08 ` Sekhar Nori
2019-02-06 15:08 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 08/35] ARM: davinci: select SPARSE_IRQ Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 22:46 ` David Lechner
2019-02-04 22:46 ` David Lechner
2019-01-31 13:39 ` [PATCH 09/35] ARM: davinci: aintc: drop GPL license boilerplate Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-01-31 13:39 ` [PATCH 10/35] ARM: davinci: aintc: wrap davinci_irq_init() with a helper Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 22:51 ` David Lechner
2019-02-04 22:51 ` David Lechner
2019-01-31 13:39 ` [PATCH 11/35] ARM: davinci: aintc: use a common prefix for symbols in the driver Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 22:54 ` David Lechner
2019-02-04 22:54 ` David Lechner
2019-01-31 13:39 ` [PATCH 12/35] ARM: davinci: aintc: drop the 00 prefix from register offsets Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 22:56 ` David Lechner
2019-02-04 22:56 ` David Lechner
2019-01-31 13:39 ` [PATCH 13/35] ARM: davinci: aintc: add a new config structure Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:02 ` David Lechner
2019-02-04 23:02 ` David Lechner
2019-02-07 13:33 ` Sekhar Nori
2019-02-07 13:33 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 14/35] ARM: davinci: aintc: use the new irqchip config structure in dm* SoCs Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:09 ` David Lechner
2019-02-04 23:09 ` David Lechner
2019-01-31 13:39 ` [PATCH 15/35] ARM: davinci: aintc: use the new config structure Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:29 ` David Lechner
2019-02-04 23:29 ` David Lechner
2019-01-31 13:39 ` [PATCH 16/35] ARM: davinci: aintc: move timer-specific irq_set_handler() out of irq.c Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:36 ` David Lechner
2019-02-04 23:36 ` David Lechner
2019-02-07 12:21 ` Sekhar Nori
2019-02-07 12:21 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 17/35] ARM: davinci: aintc: remove unnecessary includes Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:37 ` David Lechner
2019-02-04 23:37 ` David Lechner
2019-01-31 13:39 ` [PATCH 18/35] irqchip: davinci-aintc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:43 ` David Lechner
2019-02-04 23:43 ` David Lechner
2019-02-08 16:03 ` Bartosz Golaszewski
2019-02-08 16:03 ` Bartosz Golaszewski
2019-01-31 13:39 ` [PATCH 19/35] ARM: davinci: cp-intc: remove cp_intc.h Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:48 ` David Lechner
2019-02-04 23:48 ` David Lechner
2019-01-31 13:39 ` [PATCH 20/35] ARM: davinci: cp-intc: add a wrapper around cp_intc_init() Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:50 ` David Lechner
2019-02-04 23:50 ` David Lechner
2019-01-31 13:39 ` [PATCH 21/35] ARM: davinci: cp-intc: add a new config structure Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:54 ` David Lechner
2019-02-04 23:54 ` David Lechner
2019-01-31 13:39 ` [PATCH 22/35] ARM: davinci: cp-intc: add the new config structures for da8xx SoCs Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-04 23:58 ` David Lechner
2019-02-04 23:58 ` David Lechner
2019-02-07 13:35 ` Sekhar Nori
2019-02-07 13:35 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 23/35] ARM: davinci: cp-intc: use a common prefix for all symbols Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:01 ` David Lechner
2019-02-05 0:01 ` David Lechner
2019-02-07 13:43 ` Sekhar Nori
2019-02-07 13:43 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 24/35] ARM: davinci: cp-intc: convert all hex numbers to lowercase Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:04 ` David Lechner
2019-02-05 0:04 ` David Lechner
2019-01-31 13:39 ` [PATCH 25/35] ARM: davinci: cp-intc: use the new-style config structure Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:29 ` David Lechner
2019-02-05 0:29 ` David Lechner
2019-02-08 16:27 ` Bartosz Golaszewski
2019-02-08 16:27 ` Bartosz Golaszewski
2019-02-07 13:59 ` Sekhar Nori
2019-02-07 13:59 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 26/35] ARM: davinci: cp-intc: improve coding style Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:35 ` David Lechner
2019-02-05 0:35 ` David Lechner
2019-01-31 13:39 ` [PATCH 27/35] ARM: davinci: cp-intc: unify error handling Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:37 ` David Lechner
2019-02-05 0:37 ` David Lechner
2019-01-31 13:39 ` [PATCH 28/35] ARM: davinci: cp-intc: remove unneeded include Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:39 ` David Lechner
2019-02-05 0:39 ` David Lechner
2019-01-31 13:39 ` [PATCH 29/35] ARM: davinci: cp-intc: drop GPL license boilerplate Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:41 ` David Lechner
2019-02-05 0:41 ` David Lechner
2019-01-31 13:39 ` [PATCH 30/35] ARM: davinci: cp-intc: remove redundant comments Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:42 ` David Lechner
2019-02-05 0:42 ` David Lechner
2019-01-31 13:39 ` [PATCH 31/35] irqchip: davinci-cp-intc: move the driver to drivers/irqchip Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:44 ` David Lechner
2019-02-05 0:44 ` David Lechner
2019-01-31 13:39 ` [PATCH 32/35] ARM: davinci: remove intc related fields from davinci_soc_info Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:48 ` David Lechner
2019-02-05 0:48 ` David Lechner
2019-02-07 14:04 ` Sekhar Nori
2019-02-07 14:04 ` Sekhar Nori
2019-02-08 16:41 ` Bartosz Golaszewski
2019-02-08 16:41 ` Bartosz Golaszewski
2019-01-31 13:39 ` [PATCH 33/35] ARM: davinci: prepare to remove mach/irqs.h Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 0:59 ` David Lechner
2019-02-07 14:07 ` Sekhar Nori
2019-02-07 14:07 ` Sekhar Nori
2019-01-31 13:39 ` [PATCH 34/35] ARM: davinci: stop using defines from mach/irqs.h Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 1:05 ` David Lechner
2019-02-05 1:05 ` David Lechner
2019-01-31 13:39 ` [PATCH 35/35] ARM: davinci: remove mach/irqs.h Bartosz Golaszewski
2019-01-31 13:39 ` Bartosz Golaszewski
2019-02-05 1:06 ` David Lechner
2019-02-05 1:06 ` David Lechner
2019-02-04 21:49 ` [PATCH 00/35] ARM: davinci: modernize the irq support David Lechner
2019-02-04 21:49 ` David Lechner
2019-02-05 16:11 ` Bartosz Golaszewski
2019-02-05 16:11 ` Bartosz Golaszewski
2019-02-08 11:43 ` Sekhar Nori
2019-02-08 11:43 ` Sekhar Nori
2019-02-08 12:27 ` Bartosz Golaszewski
2019-02-08 12:27 ` Bartosz Golaszewski
2019-02-08 12:29 ` Sekhar Nori
2019-02-08 12:29 ` Sekhar Nori
2019-02-07 15:24 ` Sekhar Nori
2019-02-07 15:24 ` 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=20190131133928.17985-5-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bgolaszewski@baylibre.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 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.